SysUI: Fix hiding sensitive notification behavior

This should resolve the issue where sensitive notifications continue
to hide sensitive information even when unlocked.

Per app hiding of sensitive notificiations should continue to work
as well as hiding sensitive information when locked and that setting
is enabled.

Change-Id: Ib19f0709941714df6c337a7b11523d71b37c5ca2
TICKET: CYNGNOS-2176

1 files changed, 2 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 816c771..a64f6d8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -4538,7 +4538,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         if (mStackScroller == null) return;
         boolean onKeyguard = mState == StatusBarState.KEYGUARD;
         mStackScroller.setHideSensitive(isLockscreenPublicMode()
-                || !userAllowsPrivateNotificationsInPublic(mCurrentUserId), goingToFullShade);
+                || (!userAllowsPrivateNotificationsInPublic(mCurrentUserId) && onKeyguard),
+                goingToFullShade);
         mStackScroller.setDimmed(onKeyguard, false /* animate */);
         mStackScroller.setExpandingEnabled(!onKeyguard);
         ActivatableNotificationView activatedChild = mStackScroller.getActivatedChild();