diff options
| author | 2023-06-21 04:02:13 +0000 | |
|---|---|---|
| committer | 2023-06-21 04:02:13 +0000 | |
| commit | 085797df588c6fd4366ff7c6c32b63bc26f8427e (patch) | |
| tree | caa9f8b8d2c4d405c9b5fa6cc05773d6787692b1 | |
| parent | c25c1ca1a6e077924b864133cdd02b99383b20ec (diff) | |
| parent | b7547b46c3184aa83a5c283c624f026201df3c36 (diff) | |
Merge "fix(#Magnification): mis-use non resoure id in resource getter when magnification capability setup"
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 84a559391343..9d5696306206 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -5001,14 +5001,15 @@ public class SettingsProvider extends ContentProvider { Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY); final boolean supportMagnificationArea = getContext().getResources().getBoolean( com.android.internal.R.bool.config_magnification_area); - final int capability = supportMagnificationArea - ? R.integer.def_accessibility_magnification_capabilities - : Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN; final String supportShowPrompt = supportMagnificationArea ? "1" : "0"; if (magnificationCapabilities.isNull()) { + final int capability = supportMagnificationArea + ? getContext().getResources().getInteger( + R.integer.def_accessibility_magnification_capabilities) + : Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN; secureSettings.insertSettingLocked( Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY, - String.valueOf(getContext().getResources().getInteger(capability)), + String.valueOf(capability), null, true, SettingsState.SYSTEM_PACKAGE_NAME); if (isMagnificationSettingsOn(secureSettings)) { |