Merge "Fix NPE in deferToPendingTransaction." into nyc-mr1-dev

2016-08-12 20:00:05 +00:00
parent b6ee436eee c24078f1a2
commit 4a86fbc4d9
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -2076,7 +2076,8 @@ class WindowStateAnimator {
        if (time > mDeferTransactionTime + PENDING_TRANSACTION_FINISH_WAIT_TIME) {
            mDeferTransactionTime = -1;
            mDeferTransactionUntilFrame = -1;
-        } else {
+        } else if (mWin.mAttachedWindow != null &&
+                mWin.mAttachedWindow.mWinAnimator.hasSurface()) {
            mSurfaceController.deferTransactionUntil(
                    mWin.mAttachedWindow.mWinAnimator.mSurfaceController.getHandle(),
                    mDeferTransactionUntilFrame);