Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f097e11 authored by Pat Manning's avatar Pat Manning
Browse files

Null check when force navigation bar true and on lockscreen. 

Remove kids-mode comments as well.

Bug: 203748816
Test: manual
Change-Id: I3cf7a41841ac7f2d2e07bc12a5b4c9f06765ec28
parent 60b397e8

services/core/java/com/android/server/wm/InsetsPolicy.java

+3 −3
Original line number Diff line number Diff line
@@ -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;