summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author mattsziklay <mattsziklay@google.com> 2022-08-30 17:26:58 -0700
committer mattsziklay <mattsziklay@google.com> 2022-08-30 17:26:58 -0700
commit0e1f47361e032d6368d07e80158f842a8d6ad4ff (patch)
tree717055403cdc3992c9f0228ba806fb5f3d512f81
parentdcc64534db1d178fc4185fb58326415d4a2e3de0 (diff)
Guard potential null case in FullscreenTaskListener.releaseWindowDecor
found in testing. Bug: 244333148 Test: Test no longer fails. Change-Id: Ie65ac68f11afc6777e2c9c18f8ad8386ae43082f
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java
index 0d75bc451b72..ee8a7b66cfb7 100644
--- 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) {