Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't update persistent msgs when dozing"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-17 22:27:01 +00:00
committed by Android (Google) Code Review
parent 3e125abea2 c468d85edb
commit 69c9f3be13
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -327,7 +327,9 @@ public class KeyguardIndicationController {
private void updateOrganizedOwnedDevice() {
// avoid calling this method since it has an IPC
mOrganizationOwnedDevice = whitelistIpcs(this::isOrganizationOwnedDevice);
updatePersistentIndications(false, KeyguardUpdateMonitor.getCurrentUser());
if (!mDozing) {
updateDisclosure();
}
}
private void updateDisclosure() {
@@ -1185,7 +1187,7 @@ public class KeyguardIndicationController {
mTopIndicationView.clearMessages();
mRotateTextViewController.clearMessages();
} else {
updatePersistentIndications(false, KeyguardUpdateMonitor.getCurrentUser());
updateIndication(false);
}
}
};

5
packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java
View File

@@ -779,8 +779,11 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase {
public void testOnKeyguardShowingChanged_showing_updatesPersistentMessages() {
createController();
// GIVEN keyguard is showing
// GIVEN keyguard is showing and not dozing
when(mKeyguardStateController.isShowing()).thenReturn(true);
mController.setVisible(true);
mExecutor.runAllReady();
reset(mRotateTextViewController);
// WHEN keyguard showing changed called
mKeyguardStateControllerCallback.onKeyguardShowingChanged();