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

Merge "Give Keyguard 2 seconds to finish before SLEEP" into udc-dev am: 26f3260447 am: 9d215d9a07

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23122027

Change-Id: Ie53eb90c9fd45d8e335dc7988857158b933882a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Robin Lee
2023-05-23 03:28:37 +00:00
committed by Automerger Merge Worker
parent 758b97eaee 9d215d9a07
commit 6bfda8b8c1
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
View File

@@ -191,6 +191,12 @@ public class Transitions implements RemoteCallable<Transitions>,
*/
private static final int SYNC_ALLOWANCE_MS = 120;
/**
* Keyguard gets a more generous timeout to finish its animations, because we are always holding
* a sleep token during occlude/unocclude transitions and we want them to finish playing cleanly
*/
private static final int SYNC_ALLOWANCE_KEYGUARD_MS = 2000;
/** For testing only. Disables the force-finish timeout on sync. */
private boolean mDisableForceSync = false;
@@ -673,7 +679,7 @@ public class Transitions implements RemoteCallable<Transitions>,
// Sleep starts a process of forcing all prior transitions to finish immediately
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS,
"Start finish-for-sync track %d", i);
finishForSync(i, null /* forceFinish */);
finishForSync(active, i, null /* forceFinish */);
}
if (hadPreceding) {
return false;
@@ -1021,6 +1027,9 @@ public class Transitions implements RemoteCallable<Transitions>,
for (int i = 0; i < mPendingTransitions.size(); ++i) {
if (mPendingTransitions.get(i).mToken == token) return true;
}
for (int i = 0; i < mReadyDuringSync.size(); ++i) {
if (mReadyDuringSync.get(i).mToken == token) return true;
}
for (int t = 0; t < mTracks.size(); ++t) {
final Track tr = mTracks.get(t);
for (int i = 0; i < tr.mReadyTransitions.size(); ++i) {
@@ -1107,10 +1116,17 @@ public class Transitions implements RemoteCallable<Transitions>,
*
* This is then repeated until there are no more pending sleep transitions.
*
* @param reason The SLEEP transition that triggered this round of finishes. We will continue
* looping round finishing transitions as long as this is still waiting.
* @param forceFinish When non-null, this is the transition that we last sent the SLEEP merge
* signal to -- so it will be force-finished if it's still running.
*/
private void finishForSync(int trackIdx, @Nullable ActiveTransition forceFinish) {
private void finishForSync(ActiveTransition reason,
int trackIdx, @Nullable ActiveTransition forceFinish) {
if (!isTransitionKnown(reason.mToken)) {
Log.d(TAG, "finishForSleep: already played sync transition " + reason);
return;
}
final Track track = mTracks.get(trackIdx);
if (forceFinish != null) {
final Track trk = mTracks.get(forceFinish.getTrack());
@@ -1154,8 +1170,11 @@ public class Transitions implements RemoteCallable<Transitions>,
if (track.mActiveTransition == playing) {
if (!mDisableForceSync) {
// Give it a short amount of time to process it before forcing.
mMainExecutor.executeDelayed(() -> finishForSync(trackIdx, playing),
SYNC_ALLOWANCE_MS);
final int tolerance = KeyguardTransitionHandler.handles(playing.mInfo)
? SYNC_ALLOWANCE_KEYGUARD_MS
: SYNC_ALLOWANCE_MS;
mMainExecutor.executeDelayed(
() -> finishForSync(reason, trackIdx, playing), tolerance);
}
break;
}