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

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

Browse Source
This commit is contained in:
Rob Carr
2016-08-12 20:00:05 +00:00
committed by Android (Google) Code Review
parent b6ee436eee c24078f1a2
commit 4a86fbc4d9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2076,7 +2076,8 @@ class WindowStateAnimator {
if (time > mDeferTransactionTime + PENDING_TRANSACTION_FINISH_WAIT_TIME) { if (time > mDeferTransactionTime + PENDING_TRANSACTION_FINISH_WAIT_TIME) {
mDeferTransactionTime = -1; mDeferTransactionTime = -1;
mDeferTransactionUntilFrame = -1; mDeferTransactionUntilFrame = -1;
} else { } else if (mWin.mAttachedWindow != null &&
mWin.mAttachedWindow.mWinAnimator.hasSurface()) {
mSurfaceController.deferTransactionUntil( mSurfaceController.deferTransactionUntil(
mWin.mAttachedWindow.mWinAnimator.mSurfaceController.getHandle(), mWin.mAttachedWindow.mWinAnimator.mSurfaceController.getHandle(),
mDeferTransactionUntilFrame); mDeferTransactionUntilFrame);