From 24f04668decfba35d56f2662a656efd478262360 Mon Sep 17 00:00:00 2001
From: Tarandeep Singh <tarandeep@google.com>
Date: Mon, 6 Jan 2020 16:48:46 -0800
Subject: [PATCH] Skip forwardInset with adjustResize test for IME insets

IME Insets are handled on the client for ADJUST_RESIZE in the new insets world, test
should be skipped.
Bug: 111084606
Test: atest DisplayPolicyLayoutTests

Change-Id: Ifa0fd69f0e77143b8011c9ae37c2436764a6e162
---
 .../src/com/android/server/wm/DisplayPolicyLayoutTests.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java
index 5aece4577c52c..0527561880f2e 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java
@@ -594,6 +594,8 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase {
 
     @Test
     public void layoutWindowLw_withForwardInset_SoftInputAdjustResize() {
+        assumeTrue(ViewRootImpl.sNewInsetsMode == ViewRootImpl.NEW_INSETS_MODE_NONE);
+
         mWindow.mAttrs.flags =
                 FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR | FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
         mWindow.mAttrs.softInputMode = SOFT_INPUT_ADJUST_RESIZE;