Merge "Disable navigation bar related tests on tablet" into android12L-devandroid12L-dev

1 files changed, 4 insertions, 0 deletions

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsControllerTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsControllerTests.java
index 054da4c5da3..4ee96f05066 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsControllerTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsControllerTests.java
@@ -17,6 +17,7 @@
 package android.server.wm;
 
 import static android.graphics.PixelFormat.TRANSLUCENT;
+import static android.server.wm.ActivityManagerTestBase.isTablet;
 import static android.view.KeyEvent.ACTION_DOWN;
 import static android.view.KeyEvent.KEYCODE_BACK;
 import static android.view.View.SYSTEM_UI_FLAG_FULLSCREEN;
@@ -360,6 +361,9 @@ public class WindowInsetsControllerTests extends WindowManagerTestBase {
         final int[] targetSysUiVis = new int[1];
         final View nonControlTarget = new View(mTargetContext);
         final int[] nonTargetSysUiVis = new int[1];
+        if (isTablet()) {
+            return;
+        }
         final WindowManager.LayoutParams nonTargetAttrs =
                 new WindowManager.LayoutParams(TYPE_APPLICATION);
         nonTargetAttrs.flags = FLAG_NOT_FOCUSABLE;