Merge "Snap for 10460391 from 7925ae3c8f65062f00df781d80a8ffa87c60187e to android12L-tests-release" into android12L-tests-releasesparse-10463769-L67900000962123009

3 files changed, 10 insertions, 21 deletions

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationControllerTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationControllerTests.java
index 0281f55a71d..42939b54f1e 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationControllerTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationControllerTests.java
@@ -143,8 +143,10 @@ public class WindowInsetsAnimationControllerTests extends WindowManagerTestBase
     public void setUpWindowInsetsAnimationControllerTests() throws Throwable {
         assumeFalse(
                 "In Automotive, auxiliary inset changes can happen when IME inset changes, so "
-                        + "allow Automotive skip IME inset animation tests.",
-                isCar() && mType == ime());
+                        + "allow Automotive skip IME inset animation tests."
+                        + "And if config_remoteInsetsControllerControlsSystemBars is enabled,"
+                        + "SystemBar controls doesn't work, so allow skip inset animation tests.",
+                isCar() && (mType == ime() || remoteInsetsControllerControlsSystemBars()));
 
         final ImeEventStream mockImeEventStream;
         if (mType == ime()) {
@@ -246,8 +248,6 @@ public class WindowInsetsAnimationControllerTests extends WindowManagerTestBase
     @Presubmit
     @Test
     public void testControl_andCancel() throws Throwable {
-        assumeFalse(isCar() && remoteInsetsControllerControlsSystemBars() && mType != ime());
-
         retryIfCancelled(() -> {
             runOnUiThread(() -> {
                 setupAnimationListener();
@@ -268,8 +268,6 @@ public class WindowInsetsAnimationControllerTests extends WindowManagerTestBase
 
     @Test
     public void testControl_andImmediatelyCancel() throws Throwable {
-        assumeFalse(isCar() && remoteInsetsControllerControlsSystemBars() && mType != ime());
-
         retryIfCancelled(() -> {
             runOnUiThread(() -> {
                 setupAnimationListener();
@@ -287,8 +285,6 @@ public class WindowInsetsAnimationControllerTests extends WindowManagerTestBase
     @Presubmit
     @Test
     public void testControl_immediately_show() throws Throwable {
-        assumeFalse(isCar() && remoteInsetsControllerControlsSystemBars() && mType != ime());
-
         retryIfCancelled(() -> {
             setVisibilityAndWait(mType, false);
 
@@ -312,8 +308,6 @@ public class WindowInsetsAnimationControllerTests extends WindowManagerTestBase
     @Presubmit
     @Test
     public void testControl_immediately_hide() throws Throwable {
-        assumeFalse(isCar() && remoteInsetsControllerControlsSystemBars() && mType != ime());
-
         retryIfCancelled(() -> {
             setVisibilityAndWait(mType, true);
 
@@ -337,8 +331,6 @@ public class WindowInsetsAnimationControllerTests extends WindowManagerTestBase
     @Presubmit
     @Test
     public void testControl_transition_show() throws Throwable {
-        assumeFalse(isCar() && remoteInsetsControllerControlsSystemBars() && mType != ime());
-
         retryIfCancelled(() -> {
             setVisibilityAndWait(mType, false);
 
@@ -360,8 +352,6 @@ public class WindowInsetsAnimationControllerTests extends WindowManagerTestBase
     @Presubmit
     @Test
     public void testControl_transition_hide() throws Throwable {
-        assumeFalse(isCar() && remoteInsetsControllerControlsSystemBars() && mType != ime());
-
         retryIfCancelled(() -> {
             setVisibilityAndWait(mType, true);
 
@@ -383,8 +373,6 @@ public class WindowInsetsAnimationControllerTests extends WindowManagerTestBase
     @Presubmit
     @Test
     public void testControl_transition_show_interpolator() throws Throwable {
-        assumeFalse(isCar() && remoteInsetsControllerControlsSystemBars() && mType != ime());
-
         retryIfCancelled(() -> {
             mInterpolator = new DecelerateInterpolator();
             setVisibilityAndWait(mType, false);
@@ -407,8 +395,6 @@ public class WindowInsetsAnimationControllerTests extends WindowManagerTestBase
     @Presubmit
     @Test
     public void testControl_transition_hide_interpolator() throws Throwable {
-        assumeFalse(isCar() && remoteInsetsControllerControlsSystemBars() && mType != ime());
-
         retryIfCancelled(() -> {
             mInterpolator = new AccelerateInterpolator();
             setVisibilityAndWait(mType, true);
@@ -430,8 +416,6 @@ public class WindowInsetsAnimationControllerTests extends WindowManagerTestBase
 
     @Test
     public void testControl_andLoseControl() throws Throwable {
-        assumeFalse(isCar() && remoteInsetsControllerControlsSystemBars() && mType != ime());
-
         retryIfCancelled(() -> {
             mInterpolator = new AccelerateInterpolator();
             setVisibilityAndWait(mType, true);
diff --git a/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp b/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
index 157b3c0ab17..0f7903bf4ec 100644
--- a/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
+++ b/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
@@ -91,7 +91,7 @@ static bool is_directory(const char* path) {
 
 static bool not_accessible(const std::string& err) {
   return err.find("dlopen failed: library \"") == 0 &&
-         err.find("is not accessible for the namespace \"classloader-namespace\"") != std::string::npos;
+         err.find("is not accessible for the namespace \"") != std::string::npos;
 }
 
 static bool not_found(const std::string& err) {
diff --git a/tools/cts-tradefed/res/config/cts-common.xml b/tools/cts-tradefed/res/config/cts-common.xml
index c1dffd2426f..e7e082a0ba6 100644
--- a/tools/cts-tradefed/res/config/cts-common.xml
+++ b/tools/cts-tradefed/res/config/cts-common.xml
@@ -36,6 +36,11 @@
         <option name="teardown-command" value="settings put global package_verifier_enable 1"/>
     </target_preparer>
 
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="settings put global verifier_engprod 1" />
+        <option name="teardown-command" value="settings put global verifier_engprod 0"/>
+    </target_preparer>
+
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
         <option name="property-name" value="ro.build.type" />
         <option name="expected-value" value="user"/> <!-- Device should have user build -->