drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not show removed permissions in the UI - framework" into mnc-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2015-08-08 06:48:38 +00:00
committed by Android (Google) Code Review
parent fc81be947f 3e0be7440b
commit 90b030bae8
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/content/pm/PermissionInfo.java
View File

@ -144,6 +144,13 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
*/ */
public static final int FLAG_COSTS_MONEY = 1<<0; public static final int FLAG_COSTS_MONEY = 1<<0;
/**
* Flag for {@link #flags}, corresponding to <code>hidden</code>
* value of {@link android.R.attr#permissionFlags}.
* @hide
*/
public static final int FLAG_HIDDEN = 1<<1;
/** /**
* Flag for {@link #flags}, indicating that this permission has been * Flag for {@link #flags}, indicating that this permission has been
* installed into the system's globally defined permissions. * installed into the system's globally defined permissions.

13
core/res/AndroidManifest.xml
View File

@ -599,7 +599,6 @@
--> -->
<permission android:name="android.permission.ACCESS_IMS_CALL_SERVICE" <permission android:name="android.permission.ACCESS_IMS_CALL_SERVICE"
android:permissionGroup="android.permission-group.PHONE" android:permissionGroup="android.permission-group.PHONE"
android:permissionFlags="hide"
android:label="@string/permlab_accessImsCallService" android:label="@string/permlab_accessImsCallService"
android:description="@string/permdesc_accessImsCallService" android:description="@string/permdesc_accessImsCallService"
android:protectionLevel="signature|system" /> android:protectionLevel="signature|system" />
@ -760,32 +759,32 @@
<!-- @hide We need to keep this around for backwards compatibility --> <!-- @hide We need to keep this around for backwards compatibility -->
<permission android:name="android.permission.READ_PROFILE" <permission android:name="android.permission.READ_PROFILE"
android:protectionLevel="normal" android:protectionLevel="normal"
android:permissionFlags="hide"/> android:permissionFlags="hidden"/>
<!-- @hide We need to keep this around for backwards compatibility --> <!-- @hide We need to keep this around for backwards compatibility -->
<permission android:name="android.permission.WRITE_PROFILE" <permission android:name="android.permission.WRITE_PROFILE"
android:protectionLevel="normal" android:protectionLevel="normal"
android:permissionFlags="hide"/> android:permissionFlags="hidden"/>
<!-- @hide We need to keep this around for backwards compatibility --> <!-- @hide We need to keep this around for backwards compatibility -->
<permission android:name="android.permission.READ_SOCIAL_STREAM" <permission android:name="android.permission.READ_SOCIAL_STREAM"
android:protectionLevel="normal" android:protectionLevel="normal"
android:permissionFlags="hide"/> android:permissionFlags="hidden"/>
<!-- @hide We need to keep this around for backwards compatibility --> <!-- @hide We need to keep this around for backwards compatibility -->
<permission android:name="android.permission.WRITE_SOCIAL_STREAM" <permission android:name="android.permission.WRITE_SOCIAL_STREAM"
android:protectionLevel="normal" android:protectionLevel="normal"
android:permissionFlags="hide"/> android:permissionFlags="hidden"/>
<!-- @hide We need to keep this around for backwards compatibility --> <!-- @hide We need to keep this around for backwards compatibility -->
<permission android:name="android.permission.READ_USER_DICTIONARY" <permission android:name="android.permission.READ_USER_DICTIONARY"
android:protectionLevel="normal" android:protectionLevel="normal"
android:permissionFlags="hide"/> android:permissionFlags="hidden"/>
<!-- @hide We need to keep this around for backwards compatibility --> <!-- @hide We need to keep this around for backwards compatibility -->
<permission android:name="android.permission.WRITE_USER_DICTIONARY" <permission android:name="android.permission.WRITE_USER_DICTIONARY"
android:protectionLevel="normal" android:protectionLevel="normal"
android:permissionFlags="hide"/> android:permissionFlags="hidden"/>
<!-- ====================================================================== --> <!-- ====================================================================== -->
<!-- INSTALL PERMISSIONS --> <!-- INSTALL PERMISSIONS -->

2
core/res/res/values/attrs_manifest.xml
View File

@ -250,7 +250,7 @@
<flag name="costsMoney" value="0x0001" /> <flag name="costsMoney" value="0x0001" />
<!-- Additional flag from base permission type: this permission is hidden <!-- Additional flag from base permission type: this permission is hidden
and should not show in the UI. --> and should not show in the UI. -->
<flag name="hide" value="0x2" /> <flag name="hidden" value="0x2" />
</attr> </attr>
<!-- Specified the name of a group that this permission is associated <!-- Specified the name of a group that this permission is associated

6
services/core/java/com/android/server/pm/Settings.java
View File

@ -4150,6 +4150,9 @@ final class Settings {
if ((perm.info.flags&PermissionInfo.FLAG_COSTS_MONEY) != 0) { if ((perm.info.flags&PermissionInfo.FLAG_COSTS_MONEY) != 0) {
pw.print(", COSTS_MONEY"); pw.print(", COSTS_MONEY");
} }
if ((perm.info.flags&PermissionInfo.FLAG_HIDDEN) != 0) {
pw.print(", COSTS_HIDDEN");
}
if ((perm.info.flags&PermissionInfo.FLAG_INSTALLED) != 0) { if ((perm.info.flags&PermissionInfo.FLAG_INSTALLED) != 0) {
pw.print(", INSTALLED"); pw.print(", INSTALLED");
} }
@ -4306,7 +4309,8 @@ final class Settings {
pw.println(PermissionInfo.protectionToString(p.protectionLevel)); pw.println(PermissionInfo.protectionToString(p.protectionLevel));
if (p.perm != null) { if (p.perm != null) {
pw.print(" perm="); pw.println(p.perm); pw.print(" perm="); pw.println(p.perm);
if (p.perm.info.flags != PermissionInfo.FLAG_INSTALLED) { if ((p.perm.info.flags & PermissionInfo.FLAG_INSTALLED) == 0
|| (p.perm.info.flags & PermissionInfo.FLAG_HIDDEN) != 0) {
pw.print(" flags=0x"); pw.println(Integer.toHexString(p.perm.info.flags)); pw.print(" flags=0x"); pw.println(Integer.toHexString(p.perm.info.flags));
} }
} }