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

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

Browse Source 
Bluetooth is going mainline and can no longer use hidden api. We tried
to use the public alternative as our user is the same returned by
contentResolver.getUserId() but errorprone is not happy with it

Bug: 216769091
Test: Build bluetooth as apex mainline module
Change-Id: I195d545cc359d765e261c169032dfad46c916d75
CTS-Coverage-Bug: 217352944
This commit is contained in:
William Escande
2022-01-28 21:45:07 +01:00
parent 4908115674
commit c51683b7e7
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

@@ -10285,6 +10285,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);
}