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

Merge "Fix re-entrant issue in Keyguard / Mixed handler" into udc-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-14 08:17:35 +00:00
committed by Android (Google) Code Review
parent bdeb7548f5 0f533e914b
commit b4b4f2042d
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java
View File

@@ -156,6 +156,8 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler
"start keyguard %s transition, info = %s", description, info); "start keyguard %s transition, info = %s", description, info);
try { try {
mStartedTransitions.put(transition,
new StartedTransition(info, finishTransaction, remoteHandler));
remoteHandler.startAnimation(transition, info, startTransaction, remoteHandler.startAnimation(transition, info, startTransaction,
new IRemoteTransitionFinishedCallback.Stub() { new IRemoteTransitionFinishedCallback.Stub() {
@Override @Override
@@ -164,14 +166,13 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler
if (sct != null) { if (sct != null) {
finishTransaction.merge(sct); finishTransaction.merge(sct);
} }
mMainExecutor.execute(() -> { // Post our finish callback to let startAnimation finish first.
mMainExecutor.executeDelayed(() -> {
mStartedTransitions.remove(transition); mStartedTransitions.remove(transition);
finishCallback.onTransitionFinished(wct, null); finishCallback.onTransitionFinished(wct, null);
}); }, 0);
} }
}); });
mStartedTransitions.put(transition,
new StartedTransition(info, finishTransaction, remoteHandler));
} catch (RemoteException e) { } catch (RemoteException e) {
Log.wtf(TAG, "RemoteException thrown from local IRemoteTransition", e); Log.wtf(TAG, "RemoteException thrown from local IRemoteTransition", e);
return false; return false;

3
libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java
View File

@@ -589,11 +589,12 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler,
finishCallback.onTransitionFinished(wct, wctCB); finishCallback.onTransitionFinished(wct, wctCB);
} }
}; };
mixed.mInFlightSubAnimations++;
if (!mKeyguardHandler.startAnimation( if (!mKeyguardHandler.startAnimation(
mixed.mTransition, info, startTransaction, finishTransaction, finishCB)) { mixed.mTransition, info, startTransaction, finishTransaction, finishCB)) {
mixed.mInFlightSubAnimations--;
return false; return false;
} }
mixed.mInFlightSubAnimations++;
// Sync pip state. // Sync pip state.
if (mPipHandler != null) { if (mPipHandler != null) {
// We don't know when to apply `startTransaction` so use a separate transaction here. // We don't know when to apply `startTransaction` so use a separate transaction here.