Merge "Snap for 10460856 from eed0c7347768de4f127f924f9b658b593351280f to android13-tests-release" into android13-tests-releasesparse-10463770-L65000000962175506

5 files changed, 18 insertions, 8 deletions

diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSchemaCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSchemaCtsTest.java
index 4661354b07c..21b3af04256 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSchemaCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSchemaCtsTest.java
@@ -367,7 +367,6 @@ public class AppSearchSchemaCtsTest {
                         .build();
 
         String schemaString = schema.toString();
-
         String expectedString =
                 "{\n"
                         + "  schemaType: \"testSchema\",\n"
@@ -423,6 +422,9 @@ public class AppSearchSchemaCtsTest {
                         + "  ]\n"
                         + "}";
 
-        assertThat(schemaString).isEqualTo(expectedString);
+        String[] lines = expectedString.split("\\R");
+        for (String line : lines) {
+            assertThat(schemaString).contains(line);
+        }
     }
 }
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
index f994fec881c..8da11479096 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
@@ -785,7 +785,7 @@ public class PinnedStackTests extends ActivityManagerTestBase {
         launchActivity(PIP_ACTIVITY);
         mBroadcastActionTrigger.doAction(ACTION_ENTER_PIP);
         waitForEnterPipAnimationComplete(PIP_ACTIVITY);
-        int defaultDisplayWindowingMode = getDefaultDisplayWindowingMode(PIP_ACTIVITY);
+        int defaultDisplayWindowingMode = getDisplayAreaWindowingMode(PIP_ACTIVITY);
 
         // Launch second PIP activity
         launchActivity(PIP_ACTIVITY2, extraString(EXTRA_ENTER_PIP, "true"));
@@ -1713,10 +1713,8 @@ public class PinnedStackTests extends ActivityManagerTestBase {
         assertTrue(displayRect.contains(pinnedStackBounds));
     }
 
-    private int getDefaultDisplayWindowingMode(ComponentName activityName) {
-        Task task = mWmState.getTaskByActivity(activityName);
-        return mWmState.getDisplay(task.mDisplayId)
-                .getWindowingMode();
+    private int getDisplayAreaWindowingMode(ComponentName activityName) {
+        return mWmState.getTaskDisplayArea(activityName).getWindowingMode();
     }
 
     /**
diff --git a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
index 90f410e84ee..0b89c2611bc 100644
--- a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
@@ -398,7 +398,7 @@ public class PackageManagerShellCommandIncrementalTest {
         try {
             mSession.start(Executors.newSingleThreadExecutor(),
                     IncrementalDeviceConnection.Factory.reliableExpectInstallationFailure());
-            mSession.waitForAnyCompletion(3, TimeUnit.SECONDS);
+            mSession.waitForAnyCompletion(30, TimeUnit.SECONDS);
         } finally {
             getUiAutomation().dropShellPermissionIdentity();
         }
diff --git a/tools/cts-tradefed/res/config/cts-common.xml b/tools/cts-tradefed/res/config/cts-common.xml
index e1152c72f2e..f9df3e36ae8 100644
--- a/tools/cts-tradefed/res/config/cts-common.xml
+++ b/tools/cts-tradefed/res/config/cts-common.xml
@@ -39,6 +39,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 -->
diff --git a/tools/cts-tradefed/res/config/cts-exclude.xml b/tools/cts-tradefed/res/config/cts-exclude.xml
index 60b9609194c..112660db803 100644
--- a/tools/cts-tradefed/res/config/cts-exclude.xml
+++ b/tools/cts-tradefed/res/config/cts-exclude.xml
@@ -45,4 +45,9 @@
     <option name="compatibility:exclude-filter" value="CtsJvmtiRunTest913HostTestCases" />
     <option name="compatibility:exclude-filter" value="CtsJvmtiRunTest912HostTestCases" />
     <option name="compatibility:exclude-filter" value="CtsJvmtiRunTest988HostTestCases" />
+
+    <!-- Exclude art_standalone_dex2oat_cts_tests which cannot link with recent
+         ART module due to internal library symbol changes. b/288212464#comment5 -->
+    <option name="compatibility:exclude-filter" value="art_standalone_dex2oat_cts_tests" />
+
 </configuration>