summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-06-12 01:40:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-12 01:40:24 +0000
commit6f918b2f92ece0ba7904262fc1fd0b50cf746a6c (patch)
tree1b3cbe75be3eb702839aa879d5c58d42a5927f88 /api
parentf412c809197a373a40720c5d63a0842ee8c2d9bf (diff)
parentee7fb4d6832e894dfc31db3ec977fda4df29cbaf (diff)
downloadframeworks_base-6f918b2f92ece0ba7904262fc1fd0b50cf746a6c.zip
frameworks_base-6f918b2f92ece0ba7904262fc1fd0b50cf746a6c.tar.gz
frameworks_base-6f918b2f92ece0ba7904262fc1fd0b50cf746a6c.tar.bz2
Merge "Add new storage permission group" into mnc-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 43c1ade..55c6987 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -176,6 +176,7 @@ package android {
field public static final java.lang.String SENSORS = "android.permission-group.SENSORS";
field public static final java.lang.String SMS = "android.permission-group.SMS";
field public static final java.lang.String SOCIAL_INFO = "android.permission-group.SOCIAL_INFO";
+ field public static final java.lang.String STORAGE = "android.permission-group.STORAGE";
field public static final java.lang.String USER_DICTIONARY = "android.permission-group.USER_DICTIONARY";
}
diff --git a/api/system-current.txt b/api/system-current.txt
index 2345ef6..17c91f1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -250,6 +250,7 @@ package android {
field public static final java.lang.String SENSORS = "android.permission-group.SENSORS";
field public static final java.lang.String SMS = "android.permission-group.SMS";
field public static final java.lang.String SOCIAL_INFO = "android.permission-group.SOCIAL_INFO";
+ field public static final java.lang.String STORAGE = "android.permission-group.STORAGE";
field public static final java.lang.String USER_DICTIONARY = "android.permission-group.USER_DICTIONARY";
}