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

Explicitly re-show the keyguard if we were hiding.

Browse Source 
Test: mash the SFPS w/ press to unlock, helps to disable AOD
Bug: 266668894
Change-Id: Ie72872b91e97b3456a5cf20db92bc79b1b467676
This commit is contained in:
Josh Tsuji
2023-03-02 18:37:06 -05:00
parent 961c53cb70
commit e4bfb8aa6a
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1920,20 +1920,24 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
// If the keyguard is already showing, see if we don't need to bother re-showing it. Check
// flags in both files to account for the hiding animation which results in a delay and
// discrepancy between flags.
// discrepancy between flags. If we're in the middle of hiding, do not short circuit so that
// we explicitly re-set state.
if (mShowing && mKeyguardStateController.isShowing()) {
if (mPM.isInteractive()) {
if (mPM.isInteractive() && !mHiding) {
// It's already showing, and we're not trying to show it while the screen is off.
// We can simply reset all of the views.
if (DEBUG) Log.d(TAG, "doKeyguard: not showing because it is already showing");
if (DEBUG) Log.d(TAG, "doKeyguard: not showing (instead, resetting) because it is "
+ "already showing, we're interactive, and we were not previously hiding. "
+ "It should be safe to short-circuit here.");
resetStateLocked();
return;
} else {
// We are trying to show the keyguard while the screen is off - this results from
// race conditions involving locking while unlocking. Don't short-circuit here and
// ensure the keyguard is fully re-shown.
// We are trying to show the keyguard while the screen is off or while we were in
// the middle of hiding - this results from race conditions involving locking while
// unlocking. Don't short-circuit here and ensure the keyguard is fully re-shown.
Log.e(TAG,
"doKeyguard: already showing, but re-showing since we're not interactive");
"doKeyguard: already showing, but re-showing because we're interactive or "
+ "were in the middle of hiding.");
}
}
@@ -2427,11 +2431,19 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
if (DEBUG) Log.d(TAG, "handleShow");
}
mHiding = false;
mKeyguardExitAnimationRunner = null;
mWakeAndUnlocking = false;
setPendingLock(false);
setShowingLocked(true);
// Force if we we're showing in the middle of hiding, to ensure we end up in the correct
// state.
setShowingLocked(true, mHiding /* force */);
if (mHiding) {
Log.d(TAG, "Forcing setShowingLocked because mHiding=true, which means we're "
+ "showing in the middle of hiding.");
}
mHiding = false;
mKeyguardViewControllerLazy.get().show(options);
resetKeyguardDonePendingLocked();
mHideAnimationRun = false;