diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-09-20 00:23:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-20 00:23:32 +0000 |
| commit | ffdeee01ed16038c1cdf2c688e9340530eff5f88 (patch) | |
| tree | de0a0d5e9284336981e4743db2510e1f3461f709 /core/java/android | |
| parent | 2869e5752272a6f0afeb7f2d493a799e247f2032 (diff) | |
| parent | 85cac19a66ecb75d5ba5c8cc7c381fb9c71cb071 (diff) | |
Merge "Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev am: 9282193c84" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/IActivityManager.aidl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index 897e42bc2b22..18117481b0ea 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -308,7 +308,15 @@ interface IActivityManager { boolean shouldUpRecreateTask(in IBinder token, in String destAffinity); boolean navigateUpTo(in IBinder token, in Intent target, int resultCode, in Intent resultData); - void setLockScreenShown(boolean showing); + /** + * Informs ActivityManagerService that the keyguard is showing. + * + * @param showing True if the keyguard is showing, false otherwise. + * @param secondaryDisplayShowing The displayId of the secondary display on which the keyguard + * is showing, or INVALID_DISPLAY if there is no such display. Only meaningful if + * showing is true. + */ + void setLockScreenShown(boolean showing, int secondaryDisplayShowing); boolean finishActivityAffinity(in IBinder token); // This is not public because you need to be very careful in how you // manage your activity to make sure it is always the uid you expect. |