Merge "Fix NPE in overridePlayingAppAnimations" into nyc-mr1-dev

2016-09-30 09:02:11 +00:00
parent 84826a0d4c 6e5f3d2e9f
commit 26df2bf4f8
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -846,6 +846,9 @@ class AppWindowToken extends WindowToken {
    void overridePlayingAppAnimations(Animation a) {
        if (mAppAnimator.isAnimating()) {
            final WindowState win = findMainWindow();
+            if (win == null) {
+                return;
+            }
            final int width = win.mContainingFrame.width();
            final int height = win.mContainingFrame.height();
            mAppAnimator.setAnimation(a, width, height, false, STACK_CLIP_NONE);