Merge "Null check when force navigation bar true and on lockscreen." into tm-dev

1 files 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 4fdb1f7930f5..398816b331cb 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;