fix(android): invalid a11y listeners that crashed apps on exit (#11000)

CatchABus · web-flow · commit b9b98195e8ab · 2025-12-03T15:43:47.000-08:00
diff --git a/packages/core/application/application.android.ts b/packages/core/application/application.android.ts
@@ -1268,7 +1268,8 @@ export function isAccessibilityServiceEnabled(): boolean {
 	}
 
 	const accessibilityManager = getAndroidAccessibilityManager();
-	accessibilityStateChangeListener = new androidx.core.view.accessibility.AccessibilityManagerCompat.AccessibilityStateChangeListener({
+
+	accessibilityStateChangeListener = new android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener({
 		onAccessibilityStateChanged(enabled) {
 			updateAccessibilityServiceState();
 
@@ -1277,19 +1278,20 @@ export function isAccessibilityServiceEnabled(): boolean {
 			}
 		},
 	});
+	accessibilityManager.addAccessibilityStateChangeListener(accessibilityStateChangeListener);
 
-	touchExplorationStateChangeListener = new androidx.core.view.accessibility.AccessibilityManagerCompat.TouchExplorationStateChangeListener({
-		onTouchExplorationStateChanged(enabled) {
-			updateAccessibilityServiceState();
-
-			if (Trace.isEnabled()) {
-				Trace.write(`TouchExplorationStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
-			}
-		},
-	});
+	if (SDK_VERSION >= 19) {
+		touchExplorationStateChangeListener = new android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener({
+			onTouchExplorationStateChanged(enabled) {
+				updateAccessibilityServiceState();
 
-	androidx.core.view.accessibility.AccessibilityManagerCompat.addAccessibilityStateChangeListener(accessibilityManager, accessibilityStateChangeListener);
-	androidx.core.view.accessibility.AccessibilityManagerCompat.addTouchExplorationStateChangeListener(accessibilityManager, touchExplorationStateChangeListener);
+				if (Trace.isEnabled()) {
+					Trace.write(`TouchExplorationStateChangeListener state changed to: ${!!enabled}`, Trace.categories.Accessibility);
+				}
+			},
+		});
+		accessibilityManager.addTouchExplorationStateChangeListener(touchExplorationStateChangeListener);
+	}
 
 	updateAccessibilityServiceState();
 
@@ -1302,11 +1304,11 @@ export function isAccessibilityServiceEnabled(): boolean {
 		const accessibilityManager = getAndroidAccessibilityManager();
 		if (accessibilityManager) {
 			if (accessibilityStateChangeListener) {
-				androidx.core.view.accessibility.AccessibilityManagerCompat.removeAccessibilityStateChangeListener(accessibilityManager, accessibilityStateChangeListener);
+				accessibilityManager.removeAccessibilityStateChangeListener(accessibilityStateChangeListener);
 			}
 
 			if (touchExplorationStateChangeListener) {
-				androidx.core.view.accessibility.AccessibilityManagerCompat.removeTouchExplorationStateChangeListener(accessibilityManager, touchExplorationStateChangeListener);
+				accessibilityManager.removeTouchExplorationStateChangeListener(touchExplorationStateChangeListener);
 			}
 		}
 
