Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cd6759e4: am db6ac98e: Merge "DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/20220885" into mnc-dev

Browse Source 
* commit 'cd6759e4eff0beb63f16f9d625a35bbbeb8b3b45':
  DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/20220885
This commit is contained in:
Svet Ganov
2015-06-11 19:15:43 +00:00
committed by Android Git Automerger
parent 2656fa065f cd6759e4ef
commit 11f2c5feb0
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/res/AndroidManifest.xml
View File

@@ -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"

6
core/res/res/values/strings.xml
View File

@@ -1280,12 +1280,6 @@
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<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. -->