From fedcd296f59f40ff1570aaf8561a4fb3bf3b7dba Mon Sep 17 00:00:00 2001 From: Tiger Huang Date: Thu, 26 Mar 2020 01:54:46 +0800 Subject: Fix a potential NullPointerException in InsetsPolicy Fix: 151308746 Test: Presubmit Change-Id: Ia98f809c08d741a01a75979c03eb6ddfbc86fd89 --- services/core/java/com/android/server/wm/InsetsPolicy.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/InsetsPolicy.java b/services/core/java/com/android/server/wm/InsetsPolicy.java index ac6e75c717ff..fda70d14db2b 100644 --- a/services/core/java/com/android/server/wm/InsetsPolicy.java +++ b/services/core/java/com/android/server/wm/InsetsPolicy.java @@ -97,7 +97,8 @@ class InsetsPolicy { private void updateHideNavInputEventReceiver() { mPolicy.updateHideNavInputEventReceiver(!isHidden(ITYPE_NAVIGATION_BAR), - mFocusedWin.mAttrs.insetsFlags.behavior != BEHAVIOR_SHOW_BARS_BY_TOUCH); + mFocusedWin != null + && mFocusedWin.mAttrs.insetsFlags.behavior != BEHAVIOR_SHOW_BARS_BY_TOUCH); } boolean isHidden(@InternalInsetsType int type) { -- cgit v1.2.3-59-g8ed1b