Skip to content

Commit c61f288

Browse files
committed
Guard fontWeightAdjustment access in AccessibilityBridge
Move the API 31 fontWeightAdjustment field access behind a dedicated helper so the direct field reference stays out of AccessibilityBridge's main code path. Also fall back to bold-text unsupported if an affected runtime still throws NoSuchFieldError during startup. See flutter#184286.
1 parent 47018b1 commit c61f288

1 file changed

Lines changed: 17 additions & 2 deletions

File tree

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

Lines changed: 17 additions & 2 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,8 +659,14 @@ private void setBoldTextFlag() {
658659
if (rootAccessibilityView == null || rootAccessibilityView.getResources() == null) {
659660
return;
660661
}
661-
int fontWeightAdjustment =
662-
rootAccessibilityView.getResources().getConfiguration().fontWeightAdjustment;
662+
int fontWeightAdjustment;
663+
try {
664+
fontWeightAdjustment = Api31Impl.getFontWeightAdjustment(rootAccessibilityView);
665+
} catch (NoSuchFieldError exception) {
666+
accessibilityFeatureFlags &= ~AccessibilityFeature.BOLD_TEXT.value;
667+
sendLatestAccessibilityFlagsToFlutter();
668+
return;
669+
}
663670
boolean shouldBold =
664671
fontWeightAdjustment != Configuration.FONT_WEIGHT_ADJUSTMENT_UNDEFINED
665672
&& fontWeightAdjustment >= BOLD_TEXT_WEIGHT_ADJUSTMENT;
@@ -682,6 +689,14 @@ public AccessibilityNodeInfo obtainAccessibilityNodeInfo(View rootView, int virt
682689
return AccessibilityNodeInfo.obtain(rootView, virtualViewId);
683690
}
684691

692+
@RequiresApi(API_LEVELS.API_31)
693+
private static class Api31Impl {
694+
@DoNotInline
695+
static int getFontWeightAdjustment(@NonNull View rootAccessibilityView) {
696+
return rootAccessibilityView.getResources().getConfiguration().fontWeightAdjustment;
697+
}
698+
}
699+
685700
/**
686701
* Returns {@link AccessibilityNodeInfo} for the view corresponding to the given {@code
687702
* virtualViewId}.

0 commit comments

Comments
 (0)