diff options
Diffstat (limited to 'tests/framework/base/windowmanager/src/android/server/wm/ForceRelayoutTestBase.java')
-rw-r--r-- | tests/framework/base/windowmanager/src/android/server/wm/ForceRelayoutTestBase.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/ForceRelayoutTestBase.java b/tests/framework/base/windowmanager/src/android/server/wm/ForceRelayoutTestBase.java index ac06678d80b..713958d94a4 100644 --- a/tests/framework/base/windowmanager/src/android/server/wm/ForceRelayoutTestBase.java +++ b/tests/framework/base/windowmanager/src/android/server/wm/ForceRelayoutTestBase.java @@ -28,6 +28,8 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; import android.app.Activity; +import android.content.res.Resources; +import android.content.pm.PackageManager; import android.graphics.Insets; import android.os.Bundle; import android.view.View; @@ -55,6 +57,7 @@ public class ForceRelayoutTestBase { assertNotNull("test setup failed", activity.mLastContentInsets); assumeFalse(Insets.NONE.equals(activity.mLastContentInsets.getInsetsIgnoringVisibility( statusBars() | navigationBars()))); + assumeFalse(isCar() && remoteInsetsControllerControlsSystemBars()); InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> { activity.mLayoutHappened = false; @@ -113,4 +116,15 @@ public class ForceRelayoutTestBase { setContentView(view); } } + + private static boolean remoteInsetsControllerControlsSystemBars() { + return InstrumentationRegistry.getInstrumentation().getTargetContext().getResources() + .getBoolean(android.R.bool.config_remoteInsetsControllerControlsSystemBars); + } + + private boolean isCar() { + PackageManager pm = InstrumentationRegistry.getInstrumentation().getContext() + .getPackageManager(); + return pm.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE); + } } |