diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-29 20:39:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-29 20:39:27 +0000 |
| commit | 726d47b7716807f740ceea6ea71c46b20ecb8ba7 (patch) | |
| tree | c008122817db79053b4579a014d74d68049ed29b /api | |
| parent | 47a74e7e2b45d9ec462f47f6741c381c478b4156 (diff) | |
| parent | 7811d9f5095a343acd218f4bb0a0e9e8f480b401 (diff) | |
| download | frameworks_base-726d47b7716807f740ceea6ea71c46b20ecb8ba7.zip frameworks_base-726d47b7716807f740ceea6ea71c46b20ecb8ba7.tar.gz frameworks_base-726d47b7716807f740ceea6ea71c46b20ecb8ba7.tar.bz2 | |
Merge "Fix and deprecate lock pattern related settings" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index df72adf..7f788a5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26576,7 +26576,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 319aa9f..4ef1719 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -28636,7 +28636,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"; |