Skip to content

Commit 502efe1

Browse files
Abbondanzometa-codesync[bot]
Abbondanzo
authored and
meta-codesync[bot]
committed
Clean up sweepActiveTouchOnChildNativeGesturesAndroid (#54389)
Summary: Pull Request resolved: #54389 This feature flag had its default value set to the expected value in #54307, let's remove it Changelog: [Internal] Reviewed By: alanleedev Differential Revision: D85914420 fbshipit-source-id: 77c156f3ab6dcfba840973c3f9d6b1a602cf9274
1 parent dc9702e commit 502efe1

21 files changed

+38
-156
lines changed

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<d8dc8c3a2efe8b7e870546e5749ef5ad>>
7+
* @generated SignedSource<<15ede8025e516f2bdc0329efe49f4a62>>
88
*/
99

1010
/**
@@ -420,12 +420,6 @@ public object ReactNativeFeatureFlags {
420420
@JvmStatic
421421
public fun skipActivityIdentityAssertionOnHostPause(): Boolean = accessor.skipActivityIdentityAssertionOnHostPause()
422422

423-
/**
424-
* A flag to tell Fabric to sweep active touches from JSTouchDispatcher in Android when a child native gesture is started.
425-
*/
426-
@JvmStatic
427-
public fun sweepActiveTouchOnChildNativeGesturesAndroid(): Boolean = accessor.sweepActiveTouchOnChildNativeGesturesAndroid()
428-
429423
/**
430424
* Enables storing js caller stack when creating promise in native module. This is useful in case of Promise rejection and tracing the cause.
431425
*/

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxAccessor.kt‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<447ccc7271b71b0208a2297b7eba5995>>
7+
* @generated SignedSource<<c62242068e649aa652b1a8f700bf0ab3>>
88
*/
99

1010
/**
@@ -85,7 +85,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
8585
private var shouldPressibilityUseW3CPointerEventsForHoverCache: Boolean? = null
8686
private var shouldTriggerResponderTransferOnScrollAndroidCache: Boolean? = null
8787
private var skipActivityIdentityAssertionOnHostPauseCache: Boolean? = null
88-
private var sweepActiveTouchOnChildNativeGesturesAndroidCache: Boolean? = null
8988
private var traceTurboModulePromiseRejectionsOnAndroidCache: Boolean? = null
9089
private var updateRuntimeShadowNodeReferencesOnCommitCache: Boolean? = null
9190
private var useAlwaysAvailableJSErrorHandlingCache: Boolean? = null
@@ -689,15 +688,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
689688
return cached
690689
}
691690

692-
override fun sweepActiveTouchOnChildNativeGesturesAndroid(): Boolean {
693-
var cached = sweepActiveTouchOnChildNativeGesturesAndroidCache
694-
if (cached == null) {
695-
cached = ReactNativeFeatureFlagsCxxInterop.sweepActiveTouchOnChildNativeGesturesAndroid()
696-
sweepActiveTouchOnChildNativeGesturesAndroidCache = cached
697-
}
698-
return cached
699-
}
700-
701691
override fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean {
702692
var cached = traceTurboModulePromiseRejectionsOnAndroidCache
703693
if (cached == null) {

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsCxxInterop.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<d6403b67e269ad80ef3e2389ac923c8a>>
7+
* @generated SignedSource<<9a1bdbc2a3ae299433e690b254d7bf0a>>
88
*/
99

1010
/**
@@ -158,8 +158,6 @@ public object ReactNativeFeatureFlagsCxxInterop {
158158

159159
@DoNotStrip @JvmStatic public external fun skipActivityIdentityAssertionOnHostPause(): Boolean
160160

161-
@DoNotStrip @JvmStatic public external fun sweepActiveTouchOnChildNativeGesturesAndroid(): Boolean
162-
163161
@DoNotStrip @JvmStatic public external fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean
164162

165163
@DoNotStrip @JvmStatic public external fun updateRuntimeShadowNodeReferencesOnCommit(): Boolean

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<ab48ba86a7cf3cd35ec530a216aea774>>
7+
* @generated SignedSource<<0d78a0405db2a10c14bd69aaf2a3708a>>
88
*/
99

1010
/**
@@ -153,8 +153,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
153153

154154
override fun skipActivityIdentityAssertionOnHostPause(): Boolean = false
155155

156-
override fun sweepActiveTouchOnChildNativeGesturesAndroid(): Boolean = true
157-
158156
override fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean = false
159157

160158
override fun updateRuntimeShadowNodeReferencesOnCommit(): Boolean = false

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsLocalAccessor.kt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<6f6b5abe79764b88cf3ed62fe0230786>>
7+
* @generated SignedSource<<98f16fd1bb180b247ee87bb24b10120e>>
88
*/
99

1010
/**
@@ -89,7 +89,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
8989
private var shouldPressibilityUseW3CPointerEventsForHoverCache: Boolean? = null
9090
private var shouldTriggerResponderTransferOnScrollAndroidCache: Boolean? = null
9191
private var skipActivityIdentityAssertionOnHostPauseCache: Boolean? = null
92-
private var sweepActiveTouchOnChildNativeGesturesAndroidCache: Boolean? = null
9392
private var traceTurboModulePromiseRejectionsOnAndroidCache: Boolean? = null
9493
private var updateRuntimeShadowNodeReferencesOnCommitCache: Boolean? = null
9594
private var useAlwaysAvailableJSErrorHandlingCache: Boolean? = null
@@ -758,16 +757,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
758757
return cached
759758
}
760759

761-
override fun sweepActiveTouchOnChildNativeGesturesAndroid(): Boolean {
762-
var cached = sweepActiveTouchOnChildNativeGesturesAndroidCache
763-
if (cached == null) {
764-
cached = currentProvider.sweepActiveTouchOnChildNativeGesturesAndroid()
765-
accessedFeatureFlags.add("sweepActiveTouchOnChildNativeGesturesAndroid")
766-
sweepActiveTouchOnChildNativeGesturesAndroidCache = cached
767-
}
768-
return cached
769-
}
770-
771760
override fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean {
772761
var cached = traceTurboModulePromiseRejectionsOnAndroidCache
773762
if (cached == null) {

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsProvider.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<6b61490a8d6b1df1d6264016455382f8>>
7+
* @generated SignedSource<<c810245ced5a83806ace12572e112a70>>
88
*/
99

1010
/**
@@ -153,8 +153,6 @@ public interface ReactNativeFeatureFlagsProvider {
153153

154154
@DoNotStrip public fun skipActivityIdentityAssertionOnHostPause(): Boolean
155155

156-
@DoNotStrip public fun sweepActiveTouchOnChildNativeGesturesAndroid(): Boolean
157-
158156
@DoNotStrip public fun traceTurboModulePromiseRejectionsOnAndroid(): Boolean
159157

160158
@DoNotStrip public fun updateRuntimeShadowNodeReferencesOnCommit(): Boolean

‎packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/JSTouchDispatcher.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import com.facebook.infer.annotation.Assertions
1414
import com.facebook.react.bridge.ReactContext
1515
import com.facebook.react.common.ReactConstants
1616
import com.facebook.react.common.annotations.UnstableReactNativeAPI
17-
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
1817
import com.facebook.react.uimanager.common.UIManagerType
1918
import com.facebook.react.uimanager.events.EventDispatcher
2019
import com.facebook.react.uimanager.events.TouchEvent
@@ -59,7 +58,7 @@ public class JSTouchDispatcher(private val viewGroup: ViewGroup) {
5958
dispatchCancelEvent(androidEvent, eventDispatcher)
6059
childIsHandlingNativeGesture = true
6160

62-
if (targetTag != -1 && ReactNativeFeatureFlags.sweepActiveTouchOnChildNativeGesturesAndroid()) {
61+
if (targetTag != -1) {
6362
val surfaceId = UIManagerHelper.getSurfaceId(viewGroup)
6463
sweepActiveTouchForTag(surfaceId, targetTag, reactContext)
6564
}

‎packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<13ed11b5c260fae79048ea80745d22fe>>
7+
* @generated SignedSource<<b83a74b94f72ed85c7a5323bb56a38a0>>
88
*/
99

1010
/**
@@ -429,12 +429,6 @@ class ReactNativeFeatureFlagsJavaProvider
429429
return method(javaProvider_);
430430
}
431431

432-
bool sweepActiveTouchOnChildNativeGesturesAndroid() override {
433-
static const auto method =
434-
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("sweepActiveTouchOnChildNativeGesturesAndroid");
435-
return method(javaProvider_);
436-
}
437-
438432
bool traceTurboModulePromiseRejectionsOnAndroid() override {
439433
static const auto method =
440434
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("traceTurboModulePromiseRejectionsOnAndroid");
@@ -866,11 +860,6 @@ bool JReactNativeFeatureFlagsCxxInterop::skipActivityIdentityAssertionOnHostPaus
866860
return ReactNativeFeatureFlags::skipActivityIdentityAssertionOnHostPause();
867861
}
868862

869-
bool JReactNativeFeatureFlagsCxxInterop::sweepActiveTouchOnChildNativeGesturesAndroid(
870-
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
871-
return ReactNativeFeatureFlags::sweepActiveTouchOnChildNativeGesturesAndroid();
872-
}
873-
874863
bool JReactNativeFeatureFlagsCxxInterop::traceTurboModulePromiseRejectionsOnAndroid(
875864
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
876865
return ReactNativeFeatureFlags::traceTurboModulePromiseRejectionsOnAndroid();
@@ -1182,9 +1171,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
11821171
makeNativeMethod(
11831172
"skipActivityIdentityAssertionOnHostPause",
11841173
JReactNativeFeatureFlagsCxxInterop::skipActivityIdentityAssertionOnHostPause),
1185-
makeNativeMethod(
1186-
"sweepActiveTouchOnChildNativeGesturesAndroid",
1187-
JReactNativeFeatureFlagsCxxInterop::sweepActiveTouchOnChildNativeGesturesAndroid),
11881174
makeNativeMethod(
11891175
"traceTurboModulePromiseRejectionsOnAndroid",
11901176
JReactNativeFeatureFlagsCxxInterop::traceTurboModulePromiseRejectionsOnAndroid),

‎packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<1e57bf8252c16fc10bbfcae08710af85>>
7+
* @generated SignedSource<<6238eb0739467af8477aa8fa79a023bf>>
88
*/
99

1010
/**
@@ -225,9 +225,6 @@ class JReactNativeFeatureFlagsCxxInterop
225225
static bool skipActivityIdentityAssertionOnHostPause(
226226
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
227227

228-
static bool sweepActiveTouchOnChildNativeGesturesAndroid(
229-
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
230-
231228
static bool traceTurboModulePromiseRejectionsOnAndroid(
232229
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
233230

‎packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<5d596cc470e66861d7c1b2ffbb15b268>>
7+
* @generated SignedSource<<6f88454830626622f9b5720ae0395938>>
88
*/
99

1010
/**
@@ -286,10 +286,6 @@ bool ReactNativeFeatureFlags::skipActivityIdentityAssertionOnHostPause() {
286286
return getAccessor().skipActivityIdentityAssertionOnHostPause();
287287
}
288288

289-
bool ReactNativeFeatureFlags::sweepActiveTouchOnChildNativeGesturesAndroid() {
290-
return getAccessor().sweepActiveTouchOnChildNativeGesturesAndroid();
291-
}
292-
293289
bool ReactNativeFeatureFlags::traceTurboModulePromiseRejectionsOnAndroid() {
294290
return getAccessor().traceTurboModulePromiseRejectionsOnAndroid();
295291
}

0 commit comments

Comments
 (0)