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

Merge "WM: Guard against released surfaces in forced rotator"

Browse Source 
am: c1a15b81ac

Change-Id: I9c5d5b993a5d4b3bff97ad15cecc84bb5a567572
This commit is contained in:
Vishnu Nair
2018-11-20 10:20:57 -08:00
committed by android-build-merger
parent 5837aa482b c1a15b81ac
commit b6afff08e0
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/wm/ForcedSeamlessRotator.java
View File

@@ -75,12 +75,14 @@ public class ForcedSeamlessRotator {
public void finish(WindowToken token, WindowState win) {
mTransform.reset();
token.getPendingTransaction().setMatrix(token.mSurfaceControl, mTransform, mFloat9);
token.getPendingTransaction().deferTransactionUntil(token.mSurfaceControl,
win.mWinAnimator.mSurfaceController.mSurfaceControl.getHandle(),
win.getFrameNumber());
win.getPendingTransaction().deferTransactionUntil(win.mSurfaceControl,
win.mWinAnimator.mSurfaceController.mSurfaceControl.getHandle(),
win.getFrameNumber());
if (win.mWinAnimator.mSurfaceController != null) {
token.getPendingTransaction().deferTransactionUntil(token.mSurfaceControl,
win.mWinAnimator.mSurfaceController.mSurfaceControl.getHandle(),
win.getFrameNumber());
win.getPendingTransaction().deferTransactionUntil(win.mSurfaceControl,
win.mWinAnimator.mSurfaceController.mSurfaceControl.getHandle(),
win.getFrameNumber());
}
}
public void dump(PrintWriter pw) {