diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/TaskOrganizerController.java | 21 |
2 files changed, 15 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index a044e60b40ae..91f8b3b9c361 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -2612,7 +2612,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // either way, abort and reset the sequence. if (parcelable == null || mTransferringSplashScreenState != TRANSFER_SPLASH_SCREEN_COPYING - || mStartingWindow == null + || mStartingWindow == null || mStartingWindow.mRemoved || finishing) { if (parcelable != null) { parcelable.clearIfNeeded(); diff --git a/services/core/java/com/android/server/wm/TaskOrganizerController.java b/services/core/java/com/android/server/wm/TaskOrganizerController.java index 801665862d29..c6989ef906d5 100644 --- a/services/core/java/com/android/server/wm/TaskOrganizerController.java +++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java @@ -632,6 +632,11 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { final Rect mainFrame = window.getRelativeFrame(); final StartingWindowAnimationAdaptor adaptor = new StartingWindowAnimationAdaptor(); window.startAnimation(t, adaptor, false, ANIMATION_TYPE_STARTING_REVEAL); + if (adaptor.mAnimationLeash == null) { + Slog.e(TAG, "Cannot start starting window animation, the window " + window + + " was removed"); + return null; + } t.setPosition(adaptor.mAnimationLeash, mainFrame.left, mainFrame.top); return adaptor.mAnimationLeash; } @@ -679,13 +684,15 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { if (topActivity != null) { removalInfo.deferRemoveForIme = topActivity.mDisplayContent .mayImeShowOnLaunchingActivity(topActivity); - if (removalInfo.playRevealAnimation && playShiftUpAnimation) { - final WindowState mainWindow = - topActivity.findMainWindow(false/* includeStartingApp */); - if (mainWindow != null) { - removalInfo.windowAnimationLeash = applyStartingWindowAnimation(mainWindow); - removalInfo.mainFrame = mainWindow.getRelativeFrame(); - } + final WindowState mainWindow = + topActivity.findMainWindow(false/* includeStartingApp */); + // No app window for this activity, app might be crashed. + // Remove starting window immediately without playing reveal animation. + if (mainWindow == null || mainWindow.mRemoved) { + removalInfo.playRevealAnimation = false; + } else if (removalInfo.playRevealAnimation && playShiftUpAnimation) { + removalInfo.windowAnimationLeash = applyStartingWindowAnimation(mainWindow); + removalInfo.mainFrame = mainWindow.getRelativeFrame(); } } try { |