diff options
| author | Dave Santoro <dsantoro@google.com> | 2011-10-03 18:25:26 -0700 |
|---|---|---|
| committer | Dave Santoro <dsantoro@google.com> | 2011-10-04 15:35:48 -0700 |
| commit | 0b61f59d77153e7d63a33fc5d47805feb99d918b (patch) | |
| tree | 4b74dadd5e4e15d58a5af9f6db395a5e1b59a879 /core/res/AndroidManifest.xml | |
| parent | 58d807f66a98d61c4e0e5c16d56212279e8b3c68 (diff) | |
| download | frameworks_base-0b61f59d77153e7d63a33fc5d47805feb99d918b.zip frameworks_base-0b61f59d77153e7d63a33fc5d47805feb99d918b.tar.gz frameworks_base-0b61f59d77153e7d63a33fc5d47805feb99d918b.tar.bz2 | |
Add new permissions for read/write social stream.
This is a manual merge of a change going in to ICS-FactoryROM.
These permissions are needed to separate the (potentially invasive)
access to the user's social stream from the existing read/write
contacts permission.
Per discussion with Android release team, we are also hiding the
stream item API until we figure out a better way to guard the data.
Bug 5406886
Change-Id: I8339d743c3ebe8923c7ee47f2900444efcf82a52
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 9755f22..18194ee 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -263,6 +263,23 @@ android:label="@string/permlab_writeProfile" android:description="@string/permdesc_writeProfile" /> + <!-- Allows an application to read from the user's social stream. + @hide --> + <permission android:name="android.permission.READ_SOCIAL_STREAM" + android:permissionGroup="android.permission-group.PERSONAL_INFO" + android:protectionLevel="dangerous" + android:label="@string/permlab_readSocialStream" + android:description="@string/permdesc_readSocialStream" /> + + <!-- Allows an application to write (but not read) the user's + social stream data. + @hide --> + <permission android:name="android.permission.WRITE_SOCIAL_STREAM" + android:permissionGroup="android.permission-group.PERSONAL_INFO" + android:protectionLevel="dangerous" + android:label="@string/permlab_writeSocialStream" + android:description="@string/permdesc_writeSocialStream" /> + <!-- Allows an application to read the user's calendar data. --> <permission android:name="android.permission.READ_CALENDAR" android:permissionGroup="android.permission-group.PERSONAL_INFO" |