Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev

am: 295dd7193e Change-Id: I8b80da001d23932c48e9721ee1f23850cf4dcb31
2017-06-07 18:22:09 +00:00
parent df8c918129 295dd7193e
commit 0151c6886f
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
@@ -6121,6 +6121,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);
    }