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

This commit is contained in:
Android Build Merger (Role)
2019-05-21 19:03:27 +00:00
committed by Android (Google) Code Review
3 changed files with 2 additions and 1 deletions

View File

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

View File

@@ -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 // If the state didn't change, we may still need to update public mode
mLockscreenUserManager.updatePublicMode(); mLockscreenUserManager.updatePublicMode();
mEntryManager.updateNotifications();
} }
if (mStatusBarStateController.leaveOpenOnKeyguardHide()) { if (mStatusBarStateController.leaveOpenOnKeyguardHide()) {
if (!mStatusBarStateController.isKeyguardRequested()) { if (!mStatusBarStateController.isKeyguardRequested()) {

View File

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