Allow performShowLocked when transition animation started am: 83caa366f4 am: 280d7fdcb0

am: 9897aa946c

Change-Id: I30a580432377210e533833bd6762e5cd0e5afbfc

diff --cc services/core/java/com/android/server/wm/WindowState.java
index 546498a,81545b6..c83c083
--- 1/services/core/java/com/android/server/wm/WindowState.java
--- 2/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@@ -1322,10 -1331,11 +1322,11 @@@ class WindowState extends WindowContain
              return false;
          }
          return mHasSurface && !mDestroying
 -                && ((!mAttachedHidden && mViewVisibility == View.VISIBLE && !mRootToken.hidden)
 +                && ((!isParentWindowHidden() && mViewVisibility == View.VISIBLE && !mToken.hidden)
                          || mWinAnimator.mAnimation != null
                          || ((atoken != null) && (atoken.mAppAnimator.animation != null)
-                                 && !mWinAnimator.isDummyAnimation()));
+                                 && !mWinAnimator.isDummyAnimation())
+                         || isAnimatingWithSavedSurface());
      }
  
      /**