diff options
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index d03ca085204f..b3dd7a76a8cf 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -10285,8 +10285,6 @@ 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"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index ee6f9c033271..c4fe1a44d161 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6094,11 +6094,9 @@ public final class Settings { } /** @hide */ - @SystemApi - @Nullable - @SuppressLint("VisiblySynchronized") - public static String getStringForUser(@NonNull ContentResolver resolver, - @NonNull String name, int userHandle) { + @UnsupportedAppUsage + public static String getStringForUser(ContentResolver resolver, 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."); @@ -6330,9 +6328,8 @@ public final class Settings { } /** @hide */ - @SystemApi - public static int getIntForUser(@NonNull ContentResolver cr, @NonNull String name, - int def, int userHandle) { + @UnsupportedAppUsage + public static int getIntForUser(ContentResolver cr, String name, int def, int userHandle) { String v = getStringForUser(cr, name, userHandle); return parseIntSettingWithDefault(v, def); } |