diff options
| author | 2023-06-21 04:41:38 +0000 | |
|---|---|---|
| committer | 2023-06-21 04:41:38 +0000 | |
| commit | 7a558ab92b27e23395aad5d59a80c731c6566f42 (patch) | |
| tree | 9dad5a944b5dc4701431990e0e89fa6c0afe8f14 | |
| parent | 21d5ffb82a7ac4c47630fac058c7ecdf206cb7d1 (diff) | |
| parent | 085797df588c6fd4366ff7c6c32b63bc26f8427e (diff) | |
Merge "fix(#Magnification): mis-use non resoure id in resource getter when magnification capability setup" am: 085797df58
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2628770
Change-Id: I2267fa6c8a1549d796c8c5b6813ec4482663575d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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)) { |