Merge "Fix NPE when finishing remote animation" am: a58ffe3791
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2260542 Change-Id: Ie9f188ef11dbe22cf15306457c29c18e3e375dec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -323,11 +323,11 @@ class RemoteAnimationController implements DeathRecipient {
|
||||
mService.closeSurfaceTransaction("RemoteAnimationController#finished");
|
||||
mIsFinishing = false;
|
||||
}
|
||||
// Reset input for all activities when the remote animation is finished.
|
||||
final Consumer<ActivityRecord> updateActivities =
|
||||
activity -> activity.setDropInputForAnimation(false);
|
||||
mDisplayContent.forAllActivities(updateActivities);
|
||||
}
|
||||
// Reset input for all activities when the remote animation is finished.
|
||||
final Consumer<ActivityRecord> updateActivities =
|
||||
activity -> activity.setDropInputForAnimation(false);
|
||||
mDisplayContent.forAllActivities(updateActivities);
|
||||
setRunningRemoteAnimation(false);
|
||||
ProtoLog.i(WM_DEBUG_REMOTE_ANIMATIONS, "Finishing remote animation");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user