Merge cherrypicks of [12257241, 12257478, 12257643, 12257707, 12257297, 12257742, 12257668, 12257743, 12257513, 12257278, 12257279, 12257514, 12257644, 12257669, 12257670, 12257671] into rvc-release

Change-Id: Ic5bafe8179fde5f69058149b7472367fcd5b9287

1 files changed, 6 insertions, 1 deletions

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/DialogFrameTests.java b/tests/framework/base/windowmanager/src/android/server/wm/DialogFrameTests.java
index 5b3a2508ecb..627c3d6dbd9 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/DialogFrameTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/DialogFrameTests.java
@@ -63,6 +63,7 @@ public class DialogFrameTests extends ParentChildTestBase<DialogFrameTestActivit
 
     private static final ComponentName DIALOG_FRAME_TEST_ACTIVITY = new ComponentName(
             getInstrumentation().getContext(), DialogFrameTestActivity.class);
+    private Insets mContentInsets;
 
     @Rule
     public final ActivityTestRule<DialogFrameTestActivity> mDialogTestActivity =
@@ -246,12 +247,16 @@ public class DialogFrameTests extends ParentChildTestBase<DialogFrameTestActivit
     }
 
     private Insets getActivitySystemInsets() {
-        return mDialogTestActivity
+        getInstrumentation().runOnMainSync(() -> {
+            final Insets insets = mDialogTestActivity
                 .getActivity()
                 .getWindow()
                 .getDecorView()
                 .getRootWindowInsets()
                 .getInsets(WindowInsets.Type.systemBars());
+            mContentInsets = Insets.of(insets.left, insets.top, insets.right, insets.bottom);
+      });
+      return mContentInsets;
     }
 
     private static Rect inset(Rect original, Insets insets) {