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

Merge "AnimationControllers: Only unlinkToDeath if previously linked" into pi-dev

Browse Source 
am: 6f53a85569

Change-Id: I39caa0a8cbd6ddc3f91f50abd99ddfe2480ac595
This commit is contained in:
Adrian Roos
2018-04-10 11:14:18 -07:00
committed by android-build-merger
parent 03f68333b7 6f53a85569
commit e439e9b505
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/wm/RecentsAnimationController.java
View File

@@ -111,7 +111,9 @@ public class RecentsAnimationController implements DeathRecipient {
// minimized
private boolean mSplitScreenMinimized;
private Rect mTmpRect = new Rect();
private final Rect mTmpRect = new Rect();
private boolean mLinkedToDeathOfRunner;
public interface RecentsAnimationCallbacks {
void onAnimationFinished(@ReorderMode int reorderMode);
@@ -267,7 +269,7 @@ public class RecentsAnimationController implements DeathRecipient {
}
try {
mRunner.asBinder().linkToDeath(this, 0);
linkToDeathOfRunner();
} catch (RemoteException e) {
cancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION);
return;
@@ -393,7 +395,7 @@ public class RecentsAnimationController implements DeathRecipient {
removeAnimation(taskAdapter);
}
mRunner.asBinder().unlinkToDeath(this, 0);
unlinkToDeathOfRunner();
// Clear associated input consumers
mService.mInputMonitor.updateInputWindowsLw(true /*force*/);
mService.destroyInputConsumer(INPUT_CONSUMER_RECENTS_ANIMATION);
@@ -403,6 +405,20 @@ public class RecentsAnimationController implements DeathRecipient {
mService.mH.postDelayed(mFailsafeRunnable, FAILSAFE_DELAY);
}
private void linkToDeathOfRunner() throws RemoteException {
if (!mLinkedToDeathOfRunner) {
mRunner.asBinder().linkToDeath(this, 0);
mLinkedToDeathOfRunner = true;
}
}
private void unlinkToDeathOfRunner() {
if (mLinkedToDeathOfRunner) {
mRunner.asBinder().unlinkToDeath(this, 0);
mLinkedToDeathOfRunner = false;
}
}
@Override
public void binderDied() {
cancelAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION);

19
services/core/java/com/android/server/wm/RemoteAnimationController.java
View File

@@ -61,6 +61,7 @@ class RemoteAnimationController implements DeathRecipient {
private FinishedCallback mFinishedCallback;
private boolean mCanceled;
private boolean mLinkedToDeathOfRunner;
RemoteAnimationController(WindowManagerService service,
RemoteAnimationAdapter remoteAnimationAdapter, Handler handler) {
@@ -106,7 +107,7 @@ class RemoteAnimationController implements DeathRecipient {
}
mService.mAnimator.addAfterPrepareSurfacesRunnable(() -> {
try {
mRemoteAnimationAdapter.getRunner().asBinder().linkToDeath(this, 0);
linkToDeathOfRunner();
mRemoteAnimationAdapter.getRunner().onAnimationStart(animations, mFinishedCallback);
} catch (RemoteException e) {
Slog.e(TAG, "Failed to start remote animation", e);
@@ -164,8 +165,8 @@ class RemoteAnimationController implements DeathRecipient {
private void onAnimationFinished() {
mHandler.removeCallbacks(mTimeoutRunnable);
mRemoteAnimationAdapter.getRunner().asBinder().unlinkToDeath(this, 0);
synchronized (mService.mWindowMap) {
unlinkToDeathOfRunner();
releaseFinishedCallback();
mService.openSurfaceTransaction();
try {
@@ -204,6 +205,20 @@ class RemoteAnimationController implements DeathRecipient {
mService.sendSetRunningRemoteAnimation(pid, running);
}
private void linkToDeathOfRunner() throws RemoteException {
if (!mLinkedToDeathOfRunner) {
mRemoteAnimationAdapter.getRunner().asBinder().linkToDeath(this, 0);
mLinkedToDeathOfRunner = true;
}
}
private void unlinkToDeathOfRunner() {
if (mLinkedToDeathOfRunner) {
mRemoteAnimationAdapter.getRunner().asBinder().unlinkToDeath(this, 0);
mLinkedToDeathOfRunner = false;
}
}
@Override
public void binderDied() {
cancelAnimation();