diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-06-11 18:52:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 18:52:39 +0000 |
| commit | db6ac98ec375f388d4815fe405201e9649a003f8 (patch) | |
| tree | ea427d6fdbba9f9ecfb52eb98ba0a2cb887ef21d | |
| parent | 8a26514687ccf651eb73d5acdd3ae7c62d247d97 (diff) | |
| parent | 9fb3c8826ceb2c1b7d93c7c151ec5f39f26c9e1d (diff) | |
| download | frameworks_base-db6ac98ec375f388d4815fe405201e9649a003f8.zip frameworks_base-db6ac98ec375f388d4815fe405201e9649a003f8.tar.gz frameworks_base-db6ac98ec375f388d4815fe405201e9649a003f8.tar.bz2 | |
Merge "DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/20220885" into mnc-dev
| -rw-r--r-- | core/res/AndroidManifest.xml | 18 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 6 |
2 files changed, 0 insertions, 24 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 5526a3c..a16a2f4 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1580,24 +1580,6 @@ <permission android:name="android.permission.WRITE_APN_SETTINGS" android:protectionLevel="signature|system" /> - <!-- Allows an application to allow access the subscribed feeds ContentProvider. - @hide - @removed - --> - <permission android:name="android.permission.SUBSCRIBED_FEEDS_READ" - android:label="@string/permlab_subscribedFeedsRead" - android:description="@string/permdesc_subscribedFeedsRead" - android:protectionLevel="normal" /> - - <!-- - @hide - @removed - --> - <permission android:name="android.permission.SUBSCRIBED_FEEDS_WRITE" - android:label="@string/permlab_subscribedFeedsWrite" - android:description="@string/permdesc_subscribedFeedsWrite" - android:protectionLevel="dangerous" /> - <!-- Allows applications to change network connectivity state --> <permission android:name="android.permission.CHANGE_NETWORK_STATE" android:description="@string/permdesc_changeNetworkState" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 9ad4be2..f6af19c 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1281,12 +1281,6 @@ <string name="permdesc_readSyncStats">Allows an app to read the sync stats for an account, including the history of sync events and how much data is synced. </string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permlab_subscribedFeedsWrite">write subscribed feeds</string> - <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_subscribedFeedsWrite">Allows the app to modify - your currently synced feeds. Malicious apps may change your synced feeds.</string> - - <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_readDictionary">read terms you added to the dictionary</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_readDictionary">Allows the app to read all words, |