diff options
| author | Craig Mautner <cmautner@google.com> | 2012-10-05 14:45:52 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2012-10-06 13:09:58 -0700 |
| commit | 5962b12bedc4a1d0354816c1cd6b06ba04f6d807 (patch) | |
| tree | b9918fad07cf0e0ff84d510b6e17b31cf48394f9 /services/java/com/android/server/wm/WindowStateAnimator.java | |
| parent | 88400d3a31139c40c4014faf86c243647087ef6c (diff) | |
| download | frameworks_base-5962b12bedc4a1d0354816c1cd6b06ba04f6d807.zip frameworks_base-5962b12bedc4a1d0354816c1cd6b06ba04f6d807.tar.gz frameworks_base-5962b12bedc4a1d0354816c1cd6b06ba04f6d807.tar.bz2 | |
Adds showWhenLocked attribute to Activities.
The new attribute allows an Activity such as the alarm to appear
on all users screens.
Bug: 7213805 fixed.
Change-Id: If7866b13d88c04af07debc69e0e875d0adc6050a
Diffstat (limited to 'services/java/com/android/server/wm/WindowStateAnimator.java')
| -rw-r--r-- | services/java/com/android/server/wm/WindowStateAnimator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowStateAnimator.java b/services/java/com/android/server/wm/WindowStateAnimator.java index 817a234..d63fb5a 100644 --- a/services/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/java/com/android/server/wm/WindowStateAnimator.java @@ -1334,7 +1334,7 @@ class WindowStateAnimator { // This must be called while inside a transaction. boolean performShowLocked() { - if (mWin.isOtherUsersAppWindow()) { + if (mWin.isHiddenFromUserLocked()) { Slog.w(TAG, "current user violation " + mService.mCurrentUserId + " trying to display " + this + ", type " + mWin.mAttrs.type + ", belonging to " + mWin.mOwnerUid); return false; |