summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chong Zhang <chz@google.com> 2015-11-17 17:55:43 -0800
committer Chong Zhang <chz@google.com> 2015-11-17 17:55:43 -0800
commitbe2ca45c62fce12e0c5190d829ca088b0142d3a8 (patch)
treea4a541eeda25ce0d7440af85618d2a00c76ae758
parente73f6141c52f9a68ea1371af8271a6c684e6c267 (diff)
Fix crash with animation specs
Change-Id: I72ed5b19aaede0c58ea0b8665409721824ec6480
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index a9bd71ff703b..3ad2610a88b5 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3704,6 +3704,10 @@ public class WindowManagerService extends IWindowManager.Stub
// This is used by freeform <-> recents windows transition. We need to synchronize
// the animation with the appearance of the content of recents, so we will make
// animation stay on the first or last frame a little longer.
+ if (specs == null) {
+ Slog.wtf(TAG, "prolongAnimationsFromSpecs: AppTransitionAnimationSpec is null!");
+ return;
+ }
mTmpTaskIds.clear();
for (int i = specs.length - 1; i >= 0; i--) {
mTmpTaskIds.put(specs[i].taskId, 0);