diff options
| author | 2018-07-25 00:48:12 +0000 | |
|---|---|---|
| committer | 2018-07-25 00:48:12 +0000 | |
| commit | 9352e362d1afbecf055113d3bacea53d4fa1b101 (patch) | |
| tree | 9d31684b2daaab990906a371f8e804d4c9ad35d8 | |
| parent | aa7766b4d4990bc80764f942ee49ad7ba8d6334b (diff) | |
| parent | dcb24ca47138219f41b730af8cdcd2db8f553562 (diff) | |
Merge "WM: Guard against released surfaces in forced rotator" into pi-dev
| -rw-r--r-- | services/core/java/com/android/server/wm/ForcedSeamlessRotator.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/wm/ForcedSeamlessRotator.java b/services/core/java/com/android/server/wm/ForcedSeamlessRotator.java index f25ec5cd935e..bebc5656c284 100644 --- a/services/core/java/com/android/server/wm/ForcedSeamlessRotator.java +++ b/services/core/java/com/android/server/wm/ForcedSeamlessRotator.java @@ -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) { |