From 8f097e11050ef972d52568df753473ccd60bf202 Mon Sep 17 00:00:00 2001 From: Pat Manning Date: Wed, 2 Mar 2022 14:00:06 +0000 Subject: [PATCH] Null check when force navigation bar true and on lockscreen. Remove kids-mode comments as well. Bug: 203748816 Test: manual Change-Id: I3cf7a41841ac7f2d2e07bc12a5b4c9f06765ec28 --- services/core/java/com/android/server/wm/InsetsPolicy.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/wm/InsetsPolicy.java b/services/core/java/com/android/server/wm/InsetsPolicy.java index 4fdb1f7930f5d..398816b331cb0 100644 --- a/services/core/java/com/android/server/wm/InsetsPolicy.java +++ b/services/core/java/com/android/server/wm/InsetsPolicy.java @@ -583,10 +583,10 @@ class InsetsPolicy { // Notification shade has control anyways, no reason to force anything. return focusedWin; } - if (mPolicy.isForceShowNavigationBarEnabled() + if (mPolicy.isForceShowNavigationBarEnabled() && focusedWin != null && focusedWin.getActivityType() == ACTIVITY_TYPE_STANDARD) { - // When "force show navigation bar" is enabled, it means we are in kid navigation bar - // and 3-button navigation bar mode. In this mode, the navigation bar is forcibly shown + // When "force show navigation bar" is enabled, it means both force visible is true, and + // we are in 3-button navigation. In this mode, the navigation bar is forcibly shown // when activity type is ACTIVITY_TYPE_STANDARD which means Launcher or Recent could // still control the navigation bar in this mode. return null;