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

Merge changes from topic "presubmit-am-9863077b6245445fa6d0b447dd170c6f" into tm-mainline-prod

Browse Source 
* changes:
  [automerge] Remove unnecessary (and potentially problematic) call of notifyDefaultDisplayCallbacks. 2p: ac8355b60e
  Remove unnecessary (and potentially problematic) call of notifyDefaultDisplayCallbacks.
This commit is contained in:
Xiaowen Lei
2022-03-25 21:18:11 +00:00
committed by Android (Google) Code Review
parent e259dc6f9b a39c951efa
commit 25e2a5e4e8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -2009,7 +2009,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
case KEYGUARD_TIMEOUT:
synchronized (KeyguardViewMediator.this) {
doKeyguardLocked((Bundle) msg.obj);
notifyDefaultDisplayCallbacks(mShowing);
}
break;
case DISMISS:
@@ -2955,14 +2954,18 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
private void setShowingLocked(boolean showing, boolean forceCallbacks) {
final boolean aodShowing = mDozing && !mScreenOnCoordinator.getWakeAndUnlocking();
final boolean notifyDefaultDisplayCallbacks = showing != mShowing
final boolean notifyDefaultDisplayCallbacks = showing != mShowing || forceCallbacks;
final boolean updateActivityLockScreenState = showing != mShowing
|| aodShowing != mAodShowing || forceCallbacks;
mShowing = showing;
mAodShowing = aodShowing;
if (notifyDefaultDisplayCallbacks) {
notifyDefaultDisplayCallbacks(showing);
}
if (updateActivityLockScreenState) {
updateActivityLockScreenState(showing, aodShowing);
}
}
private void notifyDefaultDisplayCallbacks(boolean showing) {