summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Deepanshu Gupta <deepanshu@google.com> 2015-08-01 16:52:49 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-08-01 16:52:49 +0000
commit2535171fe4898d224101bcce2729904f885b1b7f (patch)
treef19d3d9808d6e4c16476201a7ca787ec786b7030
parent1e93d7e8bf262bf186eb4d7605bee2a32de39812 (diff)
parent92a59d8ea879970871392c5b2eb24810e7af9b51 (diff)
am 92a59d8e: am 92385030: am e836a229: Fix build.
* commit '92a59d8ea879970871392c5b2eb24810e7af9b51': Fix build.
-rw-r--r--core/java/android/provider/Settings.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 10470aa59bf7..a836cc5a5fcd 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4434,7 +4434,7 @@ public final class Settings {
*
* @deprecated Use {@link android.app.KeyguardManager} to determine the state and security
* level of the keyguard. Accessing this setting from an app that is targeting
- * {@link VERSION_CODES#MNC} or later throws a {@code SecurityException}.
+ * {@link VERSION_CODES#M} or later throws a {@code SecurityException}.
*/
@Deprecated
public static final String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
@@ -4443,7 +4443,7 @@ public final class Settings {
* Whether lock pattern is visible as user enters (0 = false, 1 = true)
*
* @deprecated Accessing this setting from an app that is targeting
- * {@link VERSION_CODES#MNC} or later throws a {@code SecurityException}.
+ * {@link VERSION_CODES#M} or later throws a {@code SecurityException}.
*/
@Deprecated
public static final String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern";
@@ -4456,7 +4456,7 @@ public final class Settings {
* lockscreen uses
* {@link Settings.System#HAPTIC_FEEDBACK_ENABLED}.
* Accessing this setting from an app that is targeting
- * {@link VERSION_CODES#MNC} or later throws a {@code SecurityException}.
+ * {@link VERSION_CODES#M} or later throws a {@code SecurityException}.
*/
@Deprecated
public static final String