Merge pull request #2359 from Mathias-Boulay:main

PiperOrigin-RevId: 761561298

Author: copybara-androidxtest

espresso/CHANGELOG.md

@@ -16,6 +16,9 @@ The following artifacts were released:
 
 **Bug Fixes**
 
+* Fix #2349, where multi-process + different rotation on 2 activities would
+  instantly timeout when waiting for the UI to rotate.
+
 **New Features**
 
 **Breaking Changes**

espresso/core/java/androidx/test/espresso/base/ConfigurationSynchronizationUtils.java

@@ -19,13 +19,15 @@
 import static java.util.Collections.unmodifiableList;
 
 import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
 import android.os.Build;
 import android.util.Log;
 import androidx.test.espresso.NoActivityResumedException;
 import androidx.test.espresso.UiController;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 /** Helper methods to synchronize configuration changes with onView actions. */
 final class ConfigurationSynchronizationUtils {
@@ -49,6 +51,13 @@ public static void waitForConfigurationChangesOnActivity(
     if (Build.VERSION.SDK_INT >= 24 && currentActivity.isInMultiWindowMode()) {
       return;
     }
+    // If the application is running activities in different processes, activities that aren't
+    // on the main process may have a different orientation
+    if (Build.VERSION.SDK_INT >= 28
+        && !Objects.equals(
+            currentActivity.getApplicationInfo().processName, Application.getProcessName())) {
+      return;
+    }
 
     int applicationOrientation = appContext.getResources().getConfiguration().orientation;
     if (applicationOrientation != currentActivity.getResources().getConfiguration().orientation) {