diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java index 9fa6f58fe30..6fedbff2cb8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/HeadlessJsTaskService.java @@ -179,9 +179,18 @@ public abstract class HeadlessJsTaskService extends Service implements HeadlessJ } private void createReactContextAndScheduleTask(final HeadlessJsTaskConfig taskConfig) { - final ReactHost reactHost = getReactHost(); - - if (reactHost == null) { // old arch + if (ReactNativeFeatureFlags.enableBridgelessArchitecture()) { + final ReactHost reactHost = getReactHost(); + reactHost.addReactInstanceEventListener( + new ReactInstanceEventListener() { + @Override + public void onReactContextInitialized(@NonNull ReactContext reactContext) { + invokeStartTask(reactContext, taskConfig); + reactHost.removeReactInstanceEventListener(this); + } + }); + reactHost.start(); + } else { final ReactInstanceManager reactInstanceManager = getReactNativeHost().getReactInstanceManager(); @@ -194,16 +203,6 @@ public abstract class HeadlessJsTaskService extends Service implements HeadlessJ } }); reactInstanceManager.createReactContextInBackground(); - } else { // new arch - reactHost.addReactInstanceEventListener( - new ReactInstanceEventListener() { - @Override - public void onReactContextInitialized(@NonNull ReactContext reactContext) { - invokeStartTask(reactContext, taskConfig); - reactHost.removeReactInstanceEventListener(this); - } - }); - reactHost.start(); } } }