Skip to content

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

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

Merged
NathanWalker merged 3 commits into from
Dec 3, 2025
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79b8c9e
fix(android): Corrected invalid a11y listeners that crashed apps on exit
CatchABus Dec 3, 2025
48c649c
fix: Corrected function call
CatchABus Dec 3, 2025
c2596dd
fix: Another updateAccessibilityServiceState correction
CatchABus Dec 3, 2025
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
30 changes: 16 additions & 14 deletions packages/core/application/application.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,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();

Expand All @@ -1273,19 +1274,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();

Expand All @@ -1298,11 +1300,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);
}
}

Expand Down