Add pickInstrumentation to allow different versions of Instrumentation.

By being protected, any service loaded versions of AndroidTestEnvironment can overwrite the Instrumentation version.

PiperOrigin-RevId: 625792840

1 files changed, 5 insertions, 1 deletions

diff --git a/robolectric/src/main/java/org/robolectric/android/internal/AndroidTestEnvironment.java b/robolectric/src/main/java/org/robolectric/android/internal/AndroidTestEnvironment.java
index e21545d9f..15918a0c4 100755
--- a/robolectric/src/main/java/org/robolectric/android/internal/AndroidTestEnvironment.java
+++ b/robolectric/src/main/java/org/robolectric/android/internal/AndroidTestEnvironment.java
@@ -594,8 +594,12 @@ public class AndroidTestEnvironment implements TestEnvironment {
     }
   }
 
+  protected Instrumentation pickInstrumentation() {
+    return new RoboMonitoringInstrumentation();
+  }
+
   private Instrumentation createInstrumentation() {
-    Instrumentation androidInstrumentation = new RoboMonitoringInstrumentation();
+    Instrumentation androidInstrumentation = pickInstrumentation();
     androidInstrumentation.runOnMainSync(
         () -> {
           ActivityThread activityThread = ReflectionHelpers.callConstructor(ActivityThread.class);