From aa0e31a7d28265a4e80ae4ee4c6074af1724b611 Mon Sep 17 00:00:00 2001
From: Alyssa Ketpreechasawat <kalyssa@google.com>
Date: Thu, 15 Sep 2022 11:16:12 +0000
Subject: [PATCH] Revert "Make extra navigation bar count towards non decor
 frame (3/3)"

This reverts commit 6a6fbd2eb7a44e9519acaf30b428b0d16c91b33d.

Reason for revert: DroidMonitor: Potential culprit for Bug 246909852

Change-Id: I8979d1e4ed83bfbe092ad0c9f446c0d99d86245d
---
 services/core/java/com/android/server/wm/DisplayPolicy.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 22a43b92a84fa..b26de07461d6c 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -2111,10 +2111,12 @@ public class DisplayPolicy {
             }
         }
 
+        // TODO (b/235842600): Use public type once we can treat task bar as navigation bar.
         static final int[] INTERNAL_DECOR_TYPES;
         static {
             final ArraySet<Integer> decorTypes = InsetsState.toInternalType(
                     Type.displayCutout() | Type.navigationBars());
+            decorTypes.remove(ITYPE_EXTRA_NAVIGATION_BAR);
             INTERNAL_DECOR_TYPES = new int[decorTypes.size()];
             for (int i = 0; i < INTERNAL_DECOR_TYPES.length; i++) {
                 INTERNAL_DECOR_TYPES[i] = decorTypes.valueAt(i);
@@ -2147,6 +2149,7 @@ public class DisplayPolicy {
             }
         }
 
+        // TODO (b/235842600): Remove this method once we can treat task bar as navigation bar.
         private static Insets calculateDecorInsetsWithInternalTypes(InsetsState state) {
             final Rect frame = state.getDisplayFrame();
             Insets insets = Insets.NONE;