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

Merge "Expose Secure.get{Int,String}ForUser as systemApi"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-01 23:57:15 +00:00
committed by Android (Google) Code Review
parent b662177e24 c51683b7e7
commit da6dafc0bb
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -10295,6 +10295,8 @@ package android.provider {
}
public static final class Settings.Secure extends android.provider.Settings.NameValueTable {
method public static int getIntForUser(@NonNull android.content.ContentResolver, @NonNull String, int, int);
method @Nullable public static String getStringForUser(@NonNull android.content.ContentResolver, @NonNull String, int);
method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static boolean putString(@NonNull android.content.ContentResolver, @NonNull String, @Nullable String, @Nullable String, boolean);
method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public static void resetToDefaults(@NonNull android.content.ContentResolver, @Nullable String);
field @Deprecated public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED = "accessibility_display_magnification_navbar_enabled";

13
core/java/android/provider/Settings.java
View File

@@ -6094,9 +6094,11 @@ public final class Settings {
}
/** @hide */
@UnsupportedAppUsage
public static String getStringForUser(ContentResolver resolver, String name,
int userHandle) {
@SystemApi
@Nullable
@SuppressLint("VisiblySynchronized")
public static String getStringForUser(@NonNull ContentResolver resolver,
@NonNull String name, int userHandle) {
if (MOVED_TO_GLOBAL.contains(name)) {
Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.Secure"
+ " to android.provider.Settings.Global.");
@@ -6328,8 +6330,9 @@ public final class Settings {
}
/** @hide */
@UnsupportedAppUsage
public static int getIntForUser(ContentResolver cr, String name, int def, int userHandle) {
@SystemApi
public static int getIntForUser(@NonNull ContentResolver cr, @NonNull String name,
int def, int userHandle) {
String v = getStringForUser(cr, name, userHandle);
return parseIntSettingWithDefault(v, def);
}