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

Commit 06753101 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by The Android Automerger
Browse files

Survey says: NIET!

Bug: 6593206
Change-Id: I5390609a5615d6aff1793a9bc361012a0cea330b
parent 59d22ad8
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -754,7 +754,6 @@ 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 = 16843688; // 0x10103a8
    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
@@ -6594,11 +6593,8 @@ 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 {
+0 −4
Original line number Diff line number Diff line
@@ -754,7 +754,6 @@ 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 = 16843688; // 0x10103a8
    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
@@ -6594,11 +6593,8 @@ 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 {
+1 −2
Original line number Diff line number Diff line
@@ -1454,8 +1454,7 @@ public class PackageParser {
        perm.info.descriptionRes = sa.getResourceId(
                com.android.internal.R.styleable.AndroidManifestPermissionGroup_description,
                0);
        perm.info.flags = sa.getInt(
                com.android.internal.R.styleable.AndroidManifestPermissionGroup_permissionGroupFlags, 0);
        perm.info.flags = 0;
        perm.info.priority = sa.getInt(
                com.android.internal.R.styleable.AndroidManifestPermissionGroup_priority, 0);
        if (perm.info.priority > 0 && (flags&PARSE_IS_SYSTEM) == 0) {
+3 −0
Original line number Diff line number Diff line
@@ -44,17 +44,20 @@ 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;

+279 −439

File changed.

Preview size limit exceeded, changes collapsed.

Loading