summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-07-27 15:10:13 -0700
committerAdrian Roos <roosa@google.com>2015-07-27 19:59:27 -0700
commit7811d9f5095a343acd218f4bb0a0e9e8f480b401 (patch)
tree194dbd8bb5d2af7183385088e25949b480c7cb75 /api
parent661794307a792690d7608dc81b4e1299937a8f67 (diff)
downloadframeworks_base-7811d9f5095a343acd218f4bb0a0e9e8f480b401.zip
frameworks_base-7811d9f5095a343acd218f4bb0a0e9e8f480b401.tar.gz
frameworks_base-7811d9f5095a343acd218f4bb0a0e9e8f480b401.tar.bz2
Fix and deprecate lock pattern related settings
Bug: 22557690 Change-Id: Ib4b3ef7cebe815ba9d9d2284f945a9ec746b216c
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 7c5115f..4f296dc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -26571,7 +26571,7 @@ package android.provider {
field public static final deprecated java.lang.String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
field public static final deprecated java.lang.String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
field public static final deprecated java.lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
- field public static final java.lang.String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";
+ field public static final deprecated java.lang.String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";
field public static final deprecated java.lang.String LOGGING_ID = "logging_id";
field public static final deprecated java.lang.String NETWORK_PREFERENCE = "network_preference";
field public static final java.lang.String PARENTAL_CONTROL_ENABLED = "parental_control_enabled";
diff --git a/api/system-current.txt b/api/system-current.txt
index a08a011..e07ef38 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -28631,7 +28631,7 @@ package android.provider {
field public static final deprecated java.lang.String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
field public static final deprecated java.lang.String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
field public static final deprecated java.lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
- field public static final java.lang.String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";
+ field public static final deprecated java.lang.String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";
field public static final deprecated java.lang.String LOGGING_ID = "logging_id";
field public static final deprecated java.lang.String NETWORK_PREFERENCE = "network_preference";
field public static final java.lang.String PARENTAL_CONTROL_ENABLED = "parental_control_enabled";