Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e

am: 3158673eeb Change-Id: I2001475c549a1ecf1dec7e469bddc3a22ce86b57
2017-06-07 18:34:18 +00:00
parent 8411eaf266 3158673eeb
commit 65a5c680e2
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -6269,6 +6269,9 @@ public class StatusBar extends SystemUI implements DemoMode,
    }

    public boolean isLockscreenPublicMode(int userId) {
+        if (userId == UserHandle.USER_ALL) {
+            return mLockscreenPublicMode.get(mCurrentUserId, false);
+        }
        return mLockscreenPublicMode.get(userId, false);
    }