Skip to content

Commit 8ad7de9

Browse files
realmeylisdevjesswrdmboetgercamsim99
authored
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: jesswrd <[email protected]> Co-authored-by: Matt Boetger <[email protected]> Co-authored-by: Camille Simon <[email protected]>
1 parent 21f8100 commit 8ad7de9

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
@@ -26,6 +26,7 @@
2626
import android.view.accessibility.AccessibilityManager;
2727
import android.view.accessibility.AccessibilityNodeInfo;
2828
import android.view.accessibility.AccessibilityNodeProvider;
29+
import androidx.annotation.DoNotInline;
2930
import androidx.annotation.NonNull;
3031
import androidx.annotation.Nullable;
3132
import androidx.annotation.RequiresApi;
@@ -706,11 +707,8 @@ private void setBoldTextFlag() {
706707
if (rootAccessibilityView.getResources() == null) {
707708
return;
708709
}
709-
int fontWeightAdjustment =
710-
rootAccessibilityView.getResources().getConfiguration().fontWeightAdjustment;
711710
boolean shouldBold =
712-
fontWeightAdjustment != Configuration.FONT_WEIGHT_ADJUSTMENT_UNDEFINED
713-
&& fontWeightAdjustment >= BOLD_TEXT_WEIGHT_ADJUSTMENT;
711+
Api31Impl.isBoldText(rootAccessibilityView.getResources().getConfiguration());
714712

715713
updateAccessibilityFeature(AccessibilityFeature.BOLD_TEXT, shouldBold);
716714
}
@@ -3389,4 +3387,22 @@ public boolean externalViewRequestSendAccessibilityEvent(
33893387
}
33903388
return true;
33913389
}
3390+
3391+
/**
3392+
* Isolates API-31 field references so that ART's class verifier does not attempt to resolve them
3393+
* when loading {@link AccessibilityBridge} on older API levels. Without this separation, the
3394+
* verifier eagerly resolves {@link Configuration#fontWeightAdjustment} at class-load time,
3395+
* causing a {@link NoSuchFieldError} crash on Android 11 devices (observed on Pixel 4a and
3396+
* OnePlus 8 Pro). This mirrors the fix AndroidX Compose applied for the same crash (AOSP
3397+
* b/353988277).
3398+
*/
3399+
@RequiresApi(API_LEVELS.API_31)
3400+
private static class Api31Impl {
3401+
@DoNotInline
3402+
static boolean isBoldText(Configuration configuration) {
3403+
int fontWeightAdjustment = configuration.fontWeightAdjustment;
3404+
return fontWeightAdjustment != Configuration.FONT_WEIGHT_ADJUSTMENT_UNDEFINED
3405+
&& fontWeightAdjustment >= BOLD_TEXT_WEIGHT_ADJUSTMENT;
3406+
}
3407+
}
33923408
}

0 commit comments

Comments
 (0)