summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorDave Santoro <dsantoro@google.com>2011-11-17 12:26:17 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-17 12:26:17 -0800
commit9be4962060ca67c4fe9bfc391043f6d2829cf720 (patch)
treec4af6410ae6a04e04cd978ca74f6b8e9b68497ff /api/current.txt
parent852585c034d383ea6afe1b484afa57cbf4d04f95 (diff)
parent098d466a25cf294487188b34dfa95575911a37cf (diff)
downloadframeworks_base-9be4962060ca67c4fe9bfc391043f6d2829cf720.zip
frameworks_base-9be4962060ca67c4fe9bfc391043f6d2829cf720.tar.gz
frameworks_base-9be4962060ca67c4fe9bfc391043f6d2829cf720.tar.bz2
Merge "Unhide social stream permissions." into ics-mr1
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 f755828..cc50ff9 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -83,6 +83,7 @@ package android {
field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE";
field public static final java.lang.String READ_PROFILE = "android.permission.READ_PROFILE";
field public static final java.lang.String READ_SMS = "android.permission.READ_SMS";
+ field public static final java.lang.String READ_SOCIAL_STREAM = "android.permission.READ_SOCIAL_STREAM";
field public static final java.lang.String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS";
field public static final java.lang.String READ_SYNC_STATS = "android.permission.READ_SYNC_STATS";
field public static final java.lang.String REBOOT = "android.permission.REBOOT";
@@ -127,6 +128,7 @@ package android {
field public static final java.lang.String WRITE_SECURE_SETTINGS = "android.permission.WRITE_SECURE_SETTINGS";
field public static final java.lang.String WRITE_SETTINGS = "android.permission.WRITE_SETTINGS";
field public static final java.lang.String WRITE_SMS = "android.permission.WRITE_SMS";
+ field public static final java.lang.String WRITE_SOCIAL_STREAM = "android.permission.WRITE_SOCIAL_STREAM";
field public static final java.lang.String WRITE_SYNC_SETTINGS = "android.permission.WRITE_SYNC_SETTINGS";
}