Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e am: 0151c6886f" into oc-dr1-dev-plus-aosp

2017-06-07 18:33:57 +00:00
parent 8411eaf266 53d851191b
commit 0b28195727
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);
    }