summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorTom Taylor <tomtaylor@google.com>2011-11-08 09:00:22 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-08 09:00:22 -0800
commit1366c756d28cdbb6c7c07959dfb4c93c81a9539d (patch)
tree1a530c9125555320f5f3cc08d05d2411a60d3a61 /api/current.txt
parent26f70db99f483be36caa7a4c84fec5de50bec034 (diff)
parent03da2f00aac04e6565a02cf5a9bf6bb1ec926930 (diff)
downloadframeworks_base-1366c756d28cdbb6c7c07959dfb4c93c81a9539d.zip
frameworks_base-1366c756d28cdbb6c7c07959dfb4c93c81a9539d.tar.gz
frameworks_base-1366c756d28cdbb6c7c07959dfb4c93c81a9539d.tar.bz2
Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index cc7f0798..4c1e447 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17363,6 +17363,7 @@ package android.provider {
field public static final 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 LOGGING_ID = "logging_id";
+ field public static final java.lang.String MESSAGING_APP_NOTIFICATIONS = "messaging_app_notifications";
field public static final java.lang.String NETWORK_PREFERENCE = "network_preference";
field public static final java.lang.String PARENTAL_CONTROL_ENABLED = "parental_control_enabled";
field public static final java.lang.String PARENTAL_CONTROL_LAST_UPDATE = "parental_control_last_update";