Merge "Check if the sc is valid when finishing seamless rotation" into sc-dev

2021-03-15 19:05:38 +00:00
parent 2b4ee6faaf ba40611dce
commit a3e2def1ed
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/SeamlessRotator.java
+++ b/services/core/java/com/android/server/wm/SeamlessRotator.java
@@ -102,6 +102,10 @@ public class SeamlessRotator {
     * window in the new orientation.
     */
    void finish(Transaction t, WindowContainer win) {
+        if (win.mSurfaceControl == null || !win.mSurfaceControl.isValid()) {
+            return;
+        }
+
        mTransform.reset();
        t.setMatrix(win.mSurfaceControl, mTransform, mFloat9);
        t.setPosition(win.mSurfaceControl, win.mLastSurfacePosition.x, win.mLastSurfacePosition.y);