Opt in InstrumentationActivityInvoker to grant BAL

PiperOrigin-RevId: 587045326

Author: copybara-androidxtest

core/CHANGELOG.md

@@ -5,6 +5,7 @@
 `androidx.test:core:{version}` and `androidx.test:core-ktx:{version}` are released.
 
 **Bug Fixes**
+* Activity starts are automatically opted in to allow background activity laucnhes when targetSdk >= 34
 
 **New Features**
 

core/java/androidx/test/core/app/InstrumentationActivityInvoker.java

@@ -168,7 +168,9 @@ protected void onResume() {
         isTargetActivityStarted = true;
         PendingIntent startTargetActivityIntent =
             checkNotNull(getIntent().getParcelableExtra(TARGET_ACTIVITY_INTENT_KEY));
-        Bundle options = getIntent().getBundleExtra(TARGET_ACTIVITY_OPTIONS_BUNDLE_KEY);
+        Bundle options =
+            optInToGrantBalPrivileges(
+                getIntent().getBundleExtra(TARGET_ACTIVITY_OPTIONS_BUNDLE_KEY));
         try {
           if (options == null) {
             // Override and disable FLAG_ACTIVITY_NEW_TASK flag by flagsMask and flagsValue.
@@ -441,15 +443,7 @@ public void startActivityForResult(Intent intent, @Nullable Bundle activityOptio
 
     activityResultWaiter = new ActivityResultWaiter(getApplicationContext());
 
-    if (VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE) {
-      ActivityOptions activityOptions =
-          ActivityOptions.makeBasic()
-              .setPendingIntentBackgroundActivityStartMode(MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
-      if (activityOptionsBundle == null) {
-        activityOptionsBundle = new Bundle();
-      }
-      activityOptionsBundle.putAll(activityOptions.toBundle());
-    }
+    activityOptionsBundle = optInToGrantBalPrivileges(activityOptionsBundle);
 
     // Note: Instrumentation.startActivitySync(Intent) cannot be used here because BootstrapActivity
     // may start in different process. Also, we use PendingIntent because the target activity may
@@ -470,6 +464,22 @@ public void startActivityForResult(Intent intent, @Nullable Bundle activityOptio
     getApplicationContext().startActivity(bootstrapIntent, activityOptionsBundle);
   }
 
+  private static Bundle optInToGrantBalPrivileges(Bundle activityOptionsBundle) {
+    if (VERSION.SDK_INT < VERSION_CODES.UPSIDE_DOWN_CAKE) {
+      return activityOptionsBundle;
+    }
+    // Initialize a bundle to grant this activities start privilege.
+    Bundle updatedActivityOptions =
+        ActivityOptions.makeBasic()
+            .setPendingIntentBackgroundActivityStartMode(MODE_BACKGROUND_ACTIVITY_START_ALLOWED)
+            .toBundle();
+    // Merge the bundle with the one passed in. This allows overriding the start mode if desired.
+    if (activityOptionsBundle != null) {
+      updatedActivityOptions.putAll(activityOptionsBundle);
+    }
+    return updatedActivityOptions;
+  }
+
   @Override
   public void startActivityForResult(Intent intent) {
     startActivityForResult(intent, null);