Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not update surface for dummy animation as long as transition is set" into nyc-dev

Browse Source 
am: 5b7a097b22

* commit '5b7a097b22cae234a7b0e575bda063525989a985':
  Do not update surface for dummy animation as long as transition is set

Change-Id: If472fc155d34d155a626bdaf4addb1650ee8e385
This commit is contained in:
Chong Zhang
2016-05-02 17:39:15 +00:00
committed by android-build-merger
parent 771f8d6b15 5b7a097b22
commit 31fd5681fd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -1448,7 +1448,7 @@ class WindowStateAnimator {
// the same app again before the app's surface is destroyed or saved, the surface
// is always ready in the whole process.) If we go ahead here, the opening app
// will be shown with the full size before the correct animation spec arrives.
if (mService.mAppTransition.isReady() && isDummyAnimation() &&
if (mService.mAppTransition.isTransitionSet() && isDummyAnimation() &&
mService.mOpeningApps.contains(w.mAppToken)) {
return;
}