summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-05-06 17:49:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-06 17:49:53 -0700
commit7bfa14570e3e43ae8595400353853acdd7cea37c (patch)
tree35c277e65276e247086348519d8357e7cf383ac2 /api/current.txt
parent464676bcb41e2948bd8243ed5a4a910328908789 (diff)
parent99222d212f9ff5081d4ce6eef09dbe8eff85b83a (diff)
downloadframeworks_base-7bfa14570e3e43ae8595400353853acdd7cea37c.zip
frameworks_base-7bfa14570e3e43ae8595400353853acdd7cea37c.tar.gz
frameworks_base-7bfa14570e3e43ae8595400353853acdd7cea37c.tar.bz2
Merge "Finish up issue #6249094: Display permissions based on relevance to private data" into jb-dev
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 133a280..300a690 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -144,6 +144,7 @@ package android {
field public static final java.lang.String AFFECTS_BATTERY = "android.permission-group.AFFECTS_BATTERY";
field public static final java.lang.String APP_INFO = "android.permission-group.APP_INFO";
field public static final java.lang.String AUDIO_SETTINGS = "android.permission-group.AUDIO_SETTINGS";
+ field public static final java.lang.String BLUETOOTH_NETWORK = "android.permission-group.BLUETOOTH_NETWORK";
field public static final java.lang.String BOOKMARKS = "android.permission-group.BOOKMARKS";
field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";
field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";
@@ -169,6 +170,7 @@ package android {
field public static final java.lang.String USER_DICTIONARY = "android.permission-group.USER_DICTIONARY";
field public static final java.lang.String VOICEMAIL = "android.permission-group.VOICEMAIL";
field public static final java.lang.String WALLPAPER = "android.permission-group.WALLPAPER";
+ field public static final java.lang.String WRITE_USER_DICTIONARY = "android.permission-group.WRITE_USER_DICTIONARY";
}
public final class R {