Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix(#Magnification): mis-use non resoure id in resource getter when magnification capability setup" am: 085797df58 am: 7a558ab92b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2628770

Change-Id: Id255bde16fc3bea6b5c80e6b1f2fd03fae97e5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Roy Chou
2023-06-21 05:19:35 +00:00
committed by Automerger Merge Worker
parent a421af531e 7a558ab92b
commit 8a64ee2bfc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -5001,14 +5001,15 @@ public class SettingsProvider extends ContentProvider {
Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY); Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY);
final boolean supportMagnificationArea = getContext().getResources().getBoolean( final boolean supportMagnificationArea = getContext().getResources().getBoolean(
com.android.internal.R.bool.config_magnification_area); 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"; final String supportShowPrompt = supportMagnificationArea ? "1" : "0";
if (magnificationCapabilities.isNull()) { if (magnificationCapabilities.isNull()) {
final int capability = supportMagnificationArea
? getContext().getResources().getInteger(
R.integer.def_accessibility_magnification_capabilities)
: Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN;
secureSettings.insertSettingLocked( secureSettings.insertSettingLocked(
Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY, Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY,
String.valueOf(getContext().getResources().getInteger(capability)), String.valueOf(capability),
null, true, SettingsState.SYSTEM_PACKAGE_NAME); null, true, SettingsState.SYSTEM_PACKAGE_NAME);
if (isMagnificationSettingsOn(secureSettings)) { if (isMagnificationSettingsOn(secureSettings)) {