Merge "Merge "Merge "Update notification redacted state for profile." into qt-dev am: d6e996ca18 am: 1b215379d7" into qt-r1-dev-plus-aosp am: 73fdb9fdfa"

packages/SystemUI/src/com/android/systemui/statusbar/NotificationLockscreenUserManagerImpl.java

@@ -525,6 +525,7 @@ public class NotificationLockscreenUserManagerImpl implements
             setLockscreenPublicMode(isProfilePublic, userId);
             mUsersWithSeperateWorkChallenge.put(userId, needsSeparateChallenge);
         }
+        getEntryManager().updateNotifications();
     }
 
     @Override

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

@@ -3133,7 +3133,6 @@ public class StatusBar extends SystemUI implements DemoMode,
 
             // If the state didn't change, we may still need to update public mode
             mLockscreenUserManager.updatePublicMode();
-            mEntryManager.updateNotifications();
         }
         if (mStatusBarStateController.leaveOpenOnKeyguardHide()) {
             if (!mStatusBarStateController.isKeyguardRequested()) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java

@@ -111,6 +111,7 @@ public class StatusBarRemoteInputCallback implements Callback, Callbacks,
     }
 
     protected void onWorkChallengeChanged() {
+        mLockscreenUserManager.updatePublicMode();
         if (mPendingWorkRemoteInputView != null
                 && !mLockscreenUserManager.isAnyProfilePublicMode()) {
             // Expand notification panel and the notification row, then click on remote input view