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

Merge "Call KeyguardViewMediator#hideWithAnimation on the main thread" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-08 17:51:02 +00:00
committed by Android (Google) Code Review
parent bf37dd716d 6d22064dcd
commit 0d0d1ae649
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1651,14 +1651,19 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
Trace.endSection();
}
/** Hide the keyguard and let {@code runner} handle the animation. */
/**
* Hide the keyguard and let {@code runner} handle the animation.
*
* This method should typically be called after {@link ViewMediatorCallback#keyguardDonePending}
* was called, when we are ready to hide the keyguard.
*/
public void hideWithAnimation(IRemoteAnimationRunner runner) {
if (!mShowing) {
if (!mKeyguardDonePending) {
return;
}
mKeyguardExitAnimationRunner = runner;
hideLocked();
mViewMediatorCallback.readyForKeyguardDone();
}
/**

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -2118,7 +2118,12 @@ public class StatusBar extends SystemUI implements DemoMode,
return;
}
mKeyguardViewMediator.hideWithAnimation(runner);
// We post to the main thread for 2 reasons:
// 1. KeyguardViewMediator is not thread-safe.
// 2. To ensure that ViewMediatorCallback#keyguardDonePending is called before
// ViewMediatorCallback#readyForKeyguardDone. The wrong order could occur when doing
// dismissKeyguardThenExecute { hideKeyguardWithAnimation(runner) }.
mMainThreadHandler.post(() -> mKeyguardViewMediator.hideWithAnimation(runner));
}
@Override