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

Merge "Pass transition token to finish() for Keyguard" into udc-dev

Browse Source
This commit is contained in:
Robin Lee
2023-06-16 12:38:12 +00:00
committed by Android (Google) Code Review
parent 68f0b17802 7e7f8245c0
commit 920307da3a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
View File

@@ -80,6 +80,8 @@ import com.android.wm.shell.util.CounterRotator;
import com.android.wm.shell.util.TransitionUtil; import com.android.wm.shell.util.TransitionUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map;
import java.util.WeakHashMap;
import javax.inject.Inject; import javax.inject.Inject;
@@ -192,7 +194,8 @@ public class KeyguardService extends Service {
private final CounterRotator mCounterRotator = new CounterRotator(); private final CounterRotator mCounterRotator = new CounterRotator();
@GuardedBy("mLeashMap") @GuardedBy("mLeashMap")
private IRemoteTransitionFinishedCallback mFinishCallback = null; private final Map<IBinder, IRemoteTransitionFinishedCallback> mFinishCallbacks =
new WeakHashMap<>();
@Override @Override
public void startAnimation(IBinder transition, TransitionInfo info, public void startAnimation(IBinder transition, TransitionInfo info,
@@ -206,7 +209,7 @@ public class KeyguardService extends Service {
synchronized (mLeashMap) { synchronized (mLeashMap) {
apps = wrap(info, false /* wallpapers */, t, mLeashMap, mCounterRotator); apps = wrap(info, false /* wallpapers */, t, mLeashMap, mCounterRotator);
wallpapers = wrap(info, true /* wallpapers */, t, mLeashMap, mCounterRotator); wallpapers = wrap(info, true /* wallpapers */, t, mLeashMap, mCounterRotator);
mFinishCallback = finishCallback; mFinishCallbacks.put(transition, finishCallback);
} }
// Set alpha back to 1 for the independent changes because we will be animating // Set alpha back to 1 for the independent changes because we will be animating
@@ -229,7 +232,7 @@ public class KeyguardService extends Service {
@Override @Override
public void onAnimationFinished() throws RemoteException { public void onAnimationFinished() throws RemoteException {
Slog.d(TAG, "Finish IRemoteAnimationRunner."); Slog.d(TAG, "Finish IRemoteAnimationRunner.");
finish(); finish(transition);
} }
}); });
} }
@@ -246,7 +249,7 @@ public class KeyguardService extends Service {
try { try {
runner.onAnimationCancelled(); runner.onAnimationCancelled();
finish(); finish(currentTransition);
} catch (RemoteException e) { } catch (RemoteException e) {
// nothing, we'll just let it finish on its own I guess. // nothing, we'll just let it finish on its own I guess.
} }
@@ -260,7 +263,7 @@ public class KeyguardService extends Service {
} }
} }
private void finish() throws RemoteException { private void finish(IBinder transition) throws RemoteException {
IRemoteTransitionFinishedCallback finishCallback = null; IRemoteTransitionFinishedCallback finishCallback = null;
SurfaceControl.Transaction finishTransaction = null; SurfaceControl.Transaction finishTransaction = null;
@@ -271,8 +274,7 @@ public class KeyguardService extends Service {
mCounterRotator.cleanUp(finishTransaction); mCounterRotator.cleanUp(finishTransaction);
} }
mLeashMap.clear(); mLeashMap.clear();
finishCallback = mFinishCallback; finishCallback = mFinishCallbacks.remove(transition);
mFinishCallback = null;
} }
if (finishCallback != null) { if (finishCallback != null) {