commit d5f7ed278261652d7999ee788faae331cccb6fb8
author Heemin Seog <hseog@google.com> Wed Sep 23 10:20:18 2020 -0700
committer Heemin Seog <hseog@google.com> Wed Sep 23 18:07:42 2020 +0000
tree ecb7b11219b98fa1ba2411a9fa05faf2334d0ea6
parent 1989311276e851a2e9c8dadc44481a665b2bf39d

DO NOT MERGE Only check internal inset types if they exist

Bug: 169205727
Test: atest WindowInsetsControllerTests (sdk_gphone_x86 && gcar_emu_x86)
Change-Id: I4d4a21ac3fc1b17d848c33917efae1f80571a37a

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

diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 4a40fc6..c691a0e 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -3400,9 +3400,12 @@
                             ? Type.navigationBars() : 0)
                     | (requestedState.getSourceOrDefaultVisibility(ITYPE_STATUS_BAR)
                             ? Type.statusBars() : 0)
-                    | (requestedState.getSourceOrDefaultVisibility(ITYPE_EXTRA_NAVIGATION_BAR)
+                    | (mExtraNavBarAlt != null
+                            && requestedState.getSourceOrDefaultVisibility(
+                                    ITYPE_EXTRA_NAVIGATION_BAR)
                             ? Type.navigationBars() : 0)
-                    | (requestedState.getSourceOrDefaultVisibility(ITYPE_CLIMATE_BAR)
+                    | (mClimateBarAlt != null
+                            && requestedState.getSourceOrDefaultVisibility(ITYPE_CLIMATE_BAR)
                             ? Type.statusBars() : 0);
 
             if (swipeTarget == mNavigationBar