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

Merge "Remove unnecessary (and potentially problematic) call of notifyDefaultDisplayCallbacks." into tm-dev

Browse Source
This commit is contained in:
Xiaowen Lei
2022-03-25 21:18:11 +00:00
committed by Android (Google) Code Review
parent 912ef9c967 ac8355b60e
commit aecf90be14
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: case KEYGUARD_TIMEOUT:
synchronized (KeyguardViewMediator.this) { synchronized (KeyguardViewMediator.this) {
doKeyguardLocked((Bundle) msg.obj); doKeyguardLocked((Bundle) msg.obj);
notifyDefaultDisplayCallbacks(mShowing);
} }
break; break;
case DISMISS: case DISMISS:
@@ -2955,14 +2954,18 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable,
private void setShowingLocked(boolean showing, boolean forceCallbacks) { private void setShowingLocked(boolean showing, boolean forceCallbacks) {
final boolean aodShowing = mDozing && !mScreenOnCoordinator.getWakeAndUnlocking(); 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; || aodShowing != mAodShowing || forceCallbacks;
mShowing = showing; mShowing = showing;
mAodShowing = aodShowing; mAodShowing = aodShowing;
if (notifyDefaultDisplayCallbacks) { if (notifyDefaultDisplayCallbacks) {
notifyDefaultDisplayCallbacks(showing); notifyDefaultDisplayCallbacks(showing);
}
if (updateActivityLockScreenState) {
updateActivityLockScreenState(showing, aodShowing); updateActivityLockScreenState(showing, aodShowing);
} }
} }
private void notifyDefaultDisplayCallbacks(boolean showing) { private void notifyDefaultDisplayCallbacks(boolean showing) {