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

Commit 74491089 authored by Soonil Nagarkar's avatar Soonil Nagarkar
Browse files

Correct visibility for LOCATION_MODE_ON 

As per API feedback in b/126727563, move LOCATION_MODE_ON to SystemApi
instead of deprecated. This is safe as this constant is not used
anywhere yet.

Test: manual
Bug: 126727563
Change-Id: Iddbea546d1585cb8677c4adb97e465d5ac7a76a4
parent c2a1b3f4

api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -38801,8 +38801,7 @@ package android.provider { 
    field @Deprecated public static final String LOCATION_MODE = "location_mode";

    field @Deprecated public static final int LOCATION_MODE_BATTERY_SAVING = 2; // 0x2

    field @Deprecated public static final int LOCATION_MODE_HIGH_ACCURACY = 3; // 0x3

    field @Deprecated public static final int LOCATION_MODE_OFF = 0; // 0x0

    field @Deprecated public static final int LOCATION_MODE_ON = 3; // 0x3

    field public static final int LOCATION_MODE_OFF = 0; // 0x0

    field @Deprecated public static final int LOCATION_MODE_SENSORS_ONLY = 1; // 0x1

    field @Deprecated public static final String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";

    field @Deprecated public static final String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6048,6 +6048,7 @@ package android.provider { 
    field public static final String LAST_SETUP_SHOWN = "last_setup_shown";

    field public static final String LOCATION_ACCESS_CHECK_DELAY_MILLIS = "location_access_check_delay_millis";

    field public static final String LOCATION_ACCESS_CHECK_INTERVAL_MILLIS = "location_access_check_interval_millis";

    field public static final int LOCATION_MODE_ON = 3; // 0x3

    field @Deprecated public static final String LOCATION_PERMISSIONS_UPGRADE_TO_Q_MODE = "location_permissions_upgrade_to_q_mode";

    field public static final String LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS = "lock_screen_allow_private_notifications";

    field public static final String LOCK_SCREEN_SHOW_NOTIFICATIONS = "lock_screen_show_notifications";

core/java/android/provider/Settings.java

+7 −11
Original line number Diff line number Diff line
@@ -6053,9 +6053,8 @@ public final class Settings { 
                "unknown_sources_default_reversed";















        /**













         * Comma-separated list of location providers that are accessible. Do not rely on













         * this value being present or correct, or on ContentObserver notifications on the













         * corresponding Uri.













         * Comma-separated list of location providers that are enabled. Do not rely on this value













         * being present or correct, or on ContentObserver notifications on the corresponding Uri.















         *















         * @deprecated The preferred methods for checking provider status and listening for changes















         * are via {@link LocationManager#isProviderEnabled(String)} and










@@ -6098,17 +6097,14 @@ public final class Settings {



























        /**















         * Location mode is off.













         *













         * @deprecated See {@link #LOCATION_MODE}.















         */













        @Deprecated















        public static final int LOCATION_MODE_OFF = 0;





























        /**















         * This mode no longer has any distinct meaning, but is interpreted as the location mode is















         * on.















         *













         * @deprecated See {@link #LOCATION_MODE_ON}.













         * @deprecated See {@link #LOCATION_MODE}.















         */















        @Deprecated















        public static final int LOCATION_MODE_SENSORS_ONLY = 1;









@@ -6117,7 +6113,7 @@ public final class Settings {













         * This mode no longer has any distinct meaning, but is interpreted as the location mode is















         * on.















         *













         * @deprecated See {@link #LOCATION_MODE_ON}.













         * @deprecated See {@link #LOCATION_MODE}.















         */















        @Deprecated















        public static final int LOCATION_MODE_BATTERY_SAVING = 2;









@@ -6126,7 +6122,7 @@ public final class Settings {













         * This mode no longer has any distinct meaning, but is interpreted as the location mode is















         * on.















         *













         * @deprecated See {@link #LOCATION_MODE_ON}.













         * @deprecated See {@link #LOCATION_MODE}.















         */















        @Deprecated















        public static final int LOCATION_MODE_HIGH_ACCURACY = 3;









@@ -6134,9 +6130,9 @@ public final class Settings {













        /**















         * Location mode is on.















         *













         * @deprecated See {@link #LOCATION_MODE}.













         * @hide















         */













        @Deprecated













        @SystemApi















        public static final int LOCATION_MODE_ON = LOCATION_MODE_HIGH_ACCURACY;





























        /**