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

Merge "Reduce synchronization in KeyguardService.wrap" into udc-dev

Browse Source
This commit is contained in:
Robin Lee
2023-06-14 10:58:39 +00:00
committed by Android (Google) Code Review
parent 3d82cd5920 a18e50900f
commit 97f833d979
1 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,10 +187,10 @@ public class KeyguardService extends Service {
final IRemoteAnimationRunner runner, final boolean lockscreenLiveWallpaperEnabled) { final IRemoteAnimationRunner runner, final boolean lockscreenLiveWallpaperEnabled) {
return new IRemoteTransition.Stub() { return new IRemoteTransition.Stub() {
@GuardedBy("mLeashMap")
private final ArrayMap<SurfaceControl, SurfaceControl> mLeashMap = new ArrayMap<>(); private final ArrayMap<SurfaceControl, SurfaceControl> mLeashMap = new ArrayMap<>();
private final CounterRotator mCounterRotator = new CounterRotator(); private final CounterRotator mCounterRotator = new CounterRotator();
@GuardedBy("mLeashMap") @GuardedBy("mLeashMap")
private IRemoteTransitionFinishedCallback mFinishCallback = null; private IRemoteTransitionFinishedCallback mFinishCallback = null;
@@ -200,40 +200,38 @@ public class KeyguardService extends Service {
throws RemoteException { throws RemoteException {
Slog.d(TAG, "Starts IRemoteAnimationRunner: info=" + info); Slog.d(TAG, "Starts IRemoteAnimationRunner: info=" + info);
final RemoteAnimationTarget[] apps;
final RemoteAnimationTarget[] wallpapers;
final RemoteAnimationTarget[] nonApps = new RemoteAnimationTarget[0];
synchronized (mLeashMap) { synchronized (mLeashMap) {
final RemoteAnimationTarget[] apps = apps = wrap(info, false /* wallpapers */, t, mLeashMap, mCounterRotator);
wrap(info, false /* wallpapers */, t, mLeashMap, mCounterRotator); wallpapers = wrap(info, true /* wallpapers */, t, mLeashMap, mCounterRotator);
final RemoteAnimationTarget[] wallpapers =
wrap(info, true /* wallpapers */, t, mLeashMap, mCounterRotator);
final RemoteAnimationTarget[] nonApps = new RemoteAnimationTarget[0];
// Set alpha back to 1 for the independent changes because we will be animating
// children instead.
for (TransitionInfo.Change chg : info.getChanges()) {
if (TransitionInfo.isIndependent(chg, info)) {
t.setAlpha(chg.getLeash(), 1.f);
}
}
initAlphaForAnimationTargets(t, apps);
if (lockscreenLiveWallpaperEnabled) {
initAlphaForAnimationTargets(t, wallpapers);
}
t.apply();
mFinishCallback = finishCallback; mFinishCallback = finishCallback;
runner.onAnimationStart(
getTransitionOldType(info.getType(), info.getFlags(), apps),
apps, wallpapers, nonApps,
new IRemoteAnimationFinishedCallback.Stub() {
@Override
public void onAnimationFinished() throws RemoteException {
synchronized (mLeashMap) {
Slog.d(TAG, "Finish IRemoteAnimationRunner.");
finish();
}
}
}
);
} }
// Set alpha back to 1 for the independent changes because we will be animating
// children instead.
for (TransitionInfo.Change chg : info.getChanges()) {
if (TransitionInfo.isIndependent(chg, info)) {
t.setAlpha(chg.getLeash(), 1.f);
}
}
initAlphaForAnimationTargets(t, apps);
if (lockscreenLiveWallpaperEnabled) {
initAlphaForAnimationTargets(t, wallpapers);
}
t.apply();
runner.onAnimationStart(
getTransitionOldType(info.getType(), info.getFlags(), apps),
apps, wallpapers, nonApps,
new IRemoteAnimationFinishedCallback.Stub() {
@Override
public void onAnimationFinished() throws RemoteException {
Slog.d(TAG, "Finish IRemoteAnimationRunner.");
finish();
}
});
} }
public void mergeAnimation(IBinder candidateTransition, TransitionInfo candidateInfo, public void mergeAnimation(IBinder candidateTransition, TransitionInfo candidateInfo,
@@ -247,10 +245,8 @@ public class KeyguardService extends Service {
} }
try { try {
synchronized (mLeashMap) { runner.onAnimationCancelled();
runner.onAnimationCancelled(); finish();
finish();
}
} 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.
} }
@@ -264,18 +260,22 @@ public class KeyguardService extends Service {
} }
} }
@GuardedBy("mLeashMap")
private void finish() throws RemoteException { private void finish() throws RemoteException {
IRemoteTransitionFinishedCallback finishCallback = null;
SurfaceControl.Transaction finishTransaction = null; SurfaceControl.Transaction finishTransaction = null;
if (mCounterRotator.getSurface() != null
&& mCounterRotator.getSurface().isValid()) { synchronized (mLeashMap) {
finishTransaction = new SurfaceControl.Transaction(); if (mCounterRotator.getSurface() != null
mCounterRotator.cleanUp(finishTransaction); && mCounterRotator.getSurface().isValid()) {
} finishTransaction = new SurfaceControl.Transaction();
mLeashMap.clear(); mCounterRotator.cleanUp(finishTransaction);
final IRemoteTransitionFinishedCallback finishCallback = mFinishCallback; }
if (finishCallback != null) { mLeashMap.clear();
finishCallback = mFinishCallback;
mFinishCallback = null; mFinishCallback = null;
}
if (finishCallback != null) {
finishCallback.onTransitionFinished(null /* wct */, finishTransaction); finishCallback.onTransitionFinished(null /* wct */, finishTransaction);
} else if (finishTransaction != null) { } else if (finishTransaction != null) {
finishTransaction.apply(); finishTransaction.apply();