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

Commit ab0b3297 authored by Soonil Nagarkar's avatar Soonil Nagarkar Committed by Android (Google) Code Review
Browse files

Merge "Revert API removal"

parents 066faf7e 09a3ce7c

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -39007,10 +39007,12 @@ package android.provider { 
    method public static long getLong(android.content.ContentResolver, String) throws android.provider.Settings.SettingNotFoundException;

    method public static String getString(android.content.ContentResolver, String);

    method public static android.net.Uri getUriFor(String);

    method @Deprecated public static boolean isLocationProviderEnabled(android.content.ContentResolver, String);

    method public static boolean putFloat(android.content.ContentResolver, String, float);

    method public static boolean putInt(android.content.ContentResolver, String, int);

    method public static boolean putLong(android.content.ContentResolver, String, long);

    method public static boolean putString(android.content.ContentResolver, String, String);

    method @Deprecated public static void setLocationProviderEnabled(android.content.ContentResolver, String, boolean);

    field public static final String ACCESSIBILITY_DISPLAY_INVERSION_ENABLED = "accessibility_display_inversion_enabled";

    field public static final String ACCESSIBILITY_ENABLED = "accessibility_enabled";

    field @Deprecated public static final String ACCESSIBILITY_SPEAK_PASSWORD = "speak_password";

api/removed.txt

+0 −5
Original line number Diff line number Diff line
@@ -553,11 +553,6 @@ package android.provider { 
    field @Deprecated public static final String CONTACT_METADATA_SYNC = "contact_metadata_sync";

  }



  public static final class Settings.Secure extends android.provider.Settings.NameValueTable {

    method @Deprecated public static boolean isLocationProviderEnabled(android.content.ContentResolver, String);

    method @Deprecated public static void setLocationProviderEnabled(android.content.ContentResolver, String, boolean);

  }



  public static final class Settings.System extends android.provider.Settings.NameValueTable {

    field public static final String APPEND_FOR_LAST_AUDIBLE = "_last_audible";

    field public static final String VOLUME_ALARM = "volume_alarm";

core/java/android/provider/Settings.java

+2 −3
Original line number Diff line number Diff line
@@ -9053,7 +9053,6 @@ public final class Settings { 
         * @return true if the provider is enabled

         *

         * @deprecated use {@link LocationManager#isProviderEnabled(String)}

         * @removed no longer supported

         */

        @Deprecated

        public static boolean isLocationProviderEnabled(ContentResolver cr, String provider) {
@@ -9063,12 +9062,12 @@ public final class Settings { 
        }















        /**













         * Thread-safe method for enabling or disabling a single location provider.













         * Thread-safe method for enabling or disabling a single location provider. This will have













         * no effect on Android Q and above.















         * @param cr the content resolver to use















         * @param provider the location provider to enable or disable















         * @param enabled true if the provider should be enabled















         * @deprecated This API is deprecated













         * @removed no longer supported















         */















        @Deprecated















        public static void setLocationProviderEnabled(ContentResolver cr,