From 0e1f47361e032d6368d07e80158f842a8d6ad4ff Mon Sep 17 00:00:00 2001 From: mattsziklay Date: Tue, 30 Aug 2022 17:26:58 -0700 Subject: Guard potential null case in FullscreenTaskListener.releaseWindowDecor found in testing. Bug: 244333148 Test: Test no longer fails. Change-Id: Ie65ac68f11afc6777e2c9c18f8ad8386ae43082f --- .../src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java | 3 +++ 1 file changed, 3 insertions(+) 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 } private void releaseWindowDecor(T windowDecor) { + if (windowDecor == null) { + return; + } try { windowDecor.close(); } catch (Exception e) { -- cgit v1.2.3-59-g8ed1b