Skip to content

Commit 15c5a92

Browse files
Joyatourealmeylisdevjesswrdmboetgercamsim99
committed
Fix AccessibilityBridge startup crash on vendor-modified Android (flutter#184630)
## Summary - Some vendor-modified Android runtimes report `SDK_INT >= 31` but ship a `Configuration` class without the `fontWeightAdjustment` field (added in API 31), causing a `NoSuchFieldError` crash at app startup in `AccessibilityBridge.setBoldTextFlag` - Wrap the `fontWeightAdjustment` access in a try/catch for `NoSuchFieldError`, gracefully defaulting to non-bold text instead of crashing ## Changes - `engine/src/flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java`: Added try/catch around `fontWeightAdjustment` field access with fallback to `shouldBold = false` Fixes flutter#184286 --------- Co-authored-by: Meylis <[email protected]> Co-authored-by: jesswrd <[email protected]> Co-authored-by: Matt Boetger <[email protected]> Co-authored-by: Camille Simon <[email protected]> (cherry picked from commit 8ad7de9)
1 parent 84fc5cb commit 15c5a92

1 file changed

Lines changed: 20 additions & 4 deletions

File tree

‎engine/src/flutter/shell/platform/android/io/flutter/view/AccessibilityBridge.java‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import android.view.accessibility.AccessibilityManager;
2626
import android.view.accessibility.AccessibilityNodeInfo;
2727
import android.view.accessibility.AccessibilityNodeProvider;
28+
import androidx.annotation.DoNotInline;
2829
import androidx.annotation.NonNull;
2930
import androidx.annotation.Nullable;
3031
import androidx.annotation.RequiresApi;
@@ -658,11 +659,8 @@ private void setBoldTextFlag() {
658659
if (rootAccessibilityView == null || rootAccessibilityView.getResources() == null) {
659660
return;
660661
}
661-
int fontWeightAdjustment =
662-
rootAccessibilityView.getResources().getConfiguration().fontWeightAdjustment;
663662
boolean shouldBold =
664-
fontWeightAdjustment != Configuration.FONT_WEIGHT_ADJUSTMENT_UNDEFINED
665-
&& fontWeightAdjustment >= BOLD_TEXT_WEIGHT_ADJUSTMENT;
663+
Api31Impl.isBoldText(rootAccessibilityView.getResources().getConfiguration());
666664

667665
if (shouldBold) {
668666
accessibilityFeatureFlags |= AccessibilityFeature.BOLD_TEXT.value;
@@ -3256,4 +3254,22 @@ public boolean externalViewRequestSendAccessibilityEvent(
32563254
}
32573255
return true;
32583256
}
3257+
3258+
/**
3259+
* Isolates API-31 field references so that ART's class verifier does not attempt to resolve them
3260+
* when loading {@link AccessibilityBridge} on older API levels. Without this separation, the
3261+
* verifier eagerly resolves {@link Configuration#fontWeightAdjustment} at class-load time,
3262+
* causing a {@link NoSuchFieldError} crash on Android 11 devices (observed on Pixel 4a and
3263+
* OnePlus 8 Pro). This mirrors the fix AndroidX Compose applied for the same crash (AOSP
3264+
* b/353988277).
3265+
*/
3266+
@RequiresApi(API_LEVELS.API_31)
3267+
private static class Api31Impl {
3268+
@DoNotInline
3269+
static boolean isBoldText(Configuration configuration) {
3270+
int fontWeightAdjustment = configuration.fontWeightAdjustment;
3271+
return fontWeightAdjustment != Configuration.FONT_WEIGHT_ADJUSTMENT_UNDEFINED
3272+
&& fontWeightAdjustment >= BOLD_TEXT_WEIGHT_ADJUSTMENT;
3273+
}
3274+
}
32593275
}

0 commit comments

Comments
 (0)