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

am: 295dd7193e Change-Id: I1f41744ec2cc5d820e7381858d5974b17db8d893
2017-06-07 18:25:12 +00:00
parent 44bb9c7281 295dd7193e
commit 3158673eeb
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);
    }