diff options
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 18 |
3 files changed, 9 insertions, 13 deletions
diff --git a/api/current.txt b/api/current.txt index ec7df66b0e62..8b24826a267b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -38820,8 +38820,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"; diff --git a/api/system-current.txt b/api/system-current.txt index 2ce1ee15d98d..e479c4874375 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6046,6 +6046,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 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"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 4da0d2da8ee9..ced6115a2f2a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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; /** |