Skip to content

fix(android): onHostPause crashes with multiple active activities #54122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −14
Open

fix(android): onHostPause crashes with multiple active activities #54122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ import com.facebook.react.uimanager.events.BlackHoleEventDispatcher
import com.facebook.react.uimanager.events.EventDispatcher
import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper
import java.lang.ref.WeakReference
import java.util.WeakHashMap
import java.util.concurrent.CopyOnWriteArrayList
import java.util.concurrent.Executor
import java.util.concurrent.Executors
Expand Down Expand Up @@ -137,6 +138,7 @@ public class ReactHostImpl(
private val reactLifecycleStateManager = ReactLifecycleStateManager(stateTracker)
private var memoryPressureListener: MemoryPressureListener? = null
private var defaultHardwareBackBtnHandler: DefaultHardwareBackBtnHandler? = null
private val activeActivitiesMap = WeakHashMap<Activity, Boolean>();

private val reactInstanceEventListeners: MutableList<ReactInstanceEventListener> =
CopyOnWriteArrayList()
Expand Down Expand Up @@ -241,6 +243,10 @@ public class ReactHostImpl(
override fun onHostResume(activity: Activity?) {
stateTracker.enterState("onHostResume(activity)")

if (activity != null) {
activeActivitiesMap[activity] = true
}

currentActivity = activity

maybeEnableDevSupport(true)
Expand All @@ -259,25 +265,17 @@ public class ReactHostImpl(
val method = "onHostPause(activity)"
stateTracker.enterState(method)

val currentActivity = this.currentActivity
if (currentActivity != null) {
val isSameActivity = activity === currentActivity
if (!isSameActivity) {
val currentActivityClass = currentActivity.javaClass.simpleName
val activityClass = if (activity == null) "null" else activity.javaClass.simpleName
val isNotSameActivityMessage =
"Pausing an activity that is not the current activity, this is incorrect! Current activity: $currentActivityClass Paused activity: $activityClass"
if (ReactNativeFeatureFlags.skipActivityIdentityAssertionOnHostPause()) {
FLog.w(TAG, method, isNotSameActivityMessage)
} else {
Assertions.assertCondition(isSameActivity, isNotSameActivityMessage)
}
if (activity != null) {
activeActivitiesMap.remove(activity)
if (activeActivitiesMap.size > 0) {
FLog.w(TAG, "Called $method by activity $activity but there are still active activities, not pausing yet.")
return
}
}

maybeEnableDevSupport(false)
defaultHardwareBackBtnHandler = null
reactLifecycleStateManager.moveToOnHostPause(currentReactContext, currentActivity)
reactLifecycleStateManager.moveToOnHostPause(currentReactContext, activity)
}

/** To be called when the host activity is paused. */
Expand Down
Loading