Merge "Guard potential null case in FullscreenTaskListener.releaseWindowDecor found in testing." into tm-qpr-dev

2022-09-01 02:07:09 +00:00
parent c8f7faf7f9 0e1f47361e
commit 21688acee8
1 changed files with 3 additions and 0 deletions
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java
@@ -287,6 +287,9 @@ public class FullscreenTaskListener<T extends AutoCloseable>
    }

    private void releaseWindowDecor(T windowDecor) {
+        if (windowDecor == null) {
+            return;
+        }
        try {
            windowDecor.close();
        } catch (Exception e) {