From 934af2ce64a286a40619eac681ecd5b1bf821d2c Mon Sep 17 00:00:00 2001
From: Mathias-Boulay <mathiasboulay@free.fr>
Date: Mon, 17 Mar 2025 23:07:00 +0100
Subject: [PATCH] Fix(espresso): Fix #2349

---
 .../espresso/base/ConfigurationSynchronizationUtils.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/espresso/core/java/androidx/test/espresso/base/ConfigurationSynchronizationUtils.java b/espresso/core/java/androidx/test/espresso/base/ConfigurationSynchronizationUtils.java
index f29505709..4577fc031 100644
--- a/espresso/core/java/androidx/test/espresso/base/ConfigurationSynchronizationUtils.java
+++ b/espresso/core/java/androidx/test/espresso/base/ConfigurationSynchronizationUtils.java
@@ -18,6 +18,7 @@
 
 import static java.util.Collections.unmodifiableList;
 
+import android.app.Application;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
@@ -49,6 +50,11 @@ 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 && !currentActivity.getApplicationInfo().processName.equals(Application.getProcessName())) {
+      return;
+    }
 
     int applicationOrientation = appContext.getResources().getConfiguration().orientation;
     if (applicationOrientation != currentActivity.getResources().getConfiguration().orientation) {