Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7454d3b7 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

New permissions UI, again. 

Change-Id: I0bbecd88ff1f212b30d1ef32d5bcaa49cdf1e9ce
parent 2a4057d2

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -755,6 +755,7 @@ package android { 
    field public static final int pathPrefix = 16842795; // 0x101002b

    field public static final int permission = 16842758; // 0x1010006

    field public static final int permissionGroup = 16842762; // 0x101000a

    field public static final int permissionGroupFlags = 16843714; // 0x10103c2

    field public static final int persistent = 16842765; // 0x101000d

    field public static final int persistentDrawingCache = 16842990; // 0x10100ee

    field public static final deprecated int phoneNumber = 16843111; // 0x1010167
@@ -6704,8 +6705,11 @@ package android.content.pm { 
    method public int describeContents();

    method public java.lang.CharSequence loadDescription(android.content.pm.PackageManager);

    field public static final android.os.Parcelable.Creator CREATOR;

    field public static final int FLAG_PERSONAL_INFO = 1; // 0x1

    field public int descriptionRes;

    field public int flags;

    field public java.lang.CharSequence nonLocalizedDescription;

    field public int priority;

  }









  public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

























core/java/android/content/pm/PackageParser.java



+2
−1






























Original line number
Diff line number
Diff line







@@ -1487,7 +1487,8 @@ public class PackageParser {







        perm.info.descriptionRes = sa.getResourceId(









                com.android.internal.R.styleable.AndroidManifestPermissionGroup_description,









                0);









        perm.info.flags = 0;









        perm.info.flags = sa.getInt(









                com.android.internal.R.styleable.AndroidManifestPermissionGroup_permissionGroupFlags, 0);









        perm.info.priority = sa.getInt(









                com.android.internal.R.styleable.AndroidManifestPermissionGroup_priority, 0);









        if (perm.info.priority > 0 && (flags&PARSE_IS_SYSTEM) == 0) {
































core/java/android/content/pm/PermissionGroupInfo.java



+0
−3






























Original line number
Diff line number
Diff line







@@ -44,20 +44,17 @@ public class PermissionGroupInfo extends PackageItemInfo implements Parcelable {







    /**









     * Flag for {@link #flags}, corresponding to <code>personalInfo</code>









     * value of {@link android.R.attr#permissionGroupFlags}.









     * @hide









     */









    public static final int FLAG_PERSONAL_INFO = 1<<0;



















    /**









     * Additional flags about this group as given by









     * {@link android.R.attr#permissionGroupFlags}.









     * @hide









     */









    public int flags;



















    /**









     * Prioritization of this group, for visually sorting with other groups.









     * @hide









     */









    public int priority;