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

Fix NPE in deferToPendingTransaction.

Browse Source 
Just because a child window has a surface doesn't necessarily
mean the parent window will have a surface. destroySurfaceLocked()
only takes care of setting mAttachedHidden so the child surface
will be invisible, but it may not be destroyed until a later point.

Bug: 30813094
Change-Id: Idb1b03fd61a7537ebfe33bafc93f278c0e6751f4
This commit is contained in:
Robert Carr
2016-08-11 13:03:02 -07:00
parent ff38f6a699
commit c24078f1a2
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

@@ -2066,7 +2066,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);