Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da6dafc0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents b662177e c51683b7

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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";

























core/java/android/provider/Settings.java



+8
−5




























Original line number
Diff line number
Diff line








@@ -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);















        }