Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct visibility for LOCATION_MODE_ON" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-30 14:58:38 +00:00
committed by Android (Google) Code Review
parent fa2e9939d2 c67cc12148
commit ec554bddec
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/current.txt
View File

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

1
api/system-current.txt
View File

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

18
core/java/android/provider/Settings.java
View File

@@ -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;
/**