Skip to content

Commit 4034bc4

Browse files
author
Dianne Hackborn
committed
Survey says: NIET!
Bug: 6593206 Change-Id: I5390609a5615d6aff1793a9bc361012a0cea330b
1 parent f0e96de commit 4034bc4

File tree

10 files changed

+393
-477
lines changed

10 files changed

+393
-477
lines changed

api/16.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,6 @@ package android {
754754
field public static final int pathPrefix = 16842795; // 0x101002b
755755
field public static final int permission = 16842758; // 0x1010006
756756
field public static final int permissionGroup = 16842762; // 0x101000a
757-
field public static final int permissionGroupFlags = 16843688; // 0x10103a8
758757
field public static final int persistent = 16842765; // 0x101000d
759758
field public static final int persistentDrawingCache = 16842990; // 0x10100ee
760759
field public static final deprecated int phoneNumber = 16843111; // 0x1010167
@@ -6596,11 +6595,8 @@ package android.content.pm {
65966595
method public int describeContents();
65976596
method public java.lang.CharSequence loadDescription(android.content.pm.PackageManager);
65986597
field public static final android.os.Parcelable.Creator CREATOR;
6599-
field public static final int FLAG_PERSONAL_INFO = 1; // 0x1
66006598
field public int descriptionRes;
6601-
field public int flags;
66026599
field public java.lang.CharSequence nonLocalizedDescription;
6603-
field public int priority;
66046600
}
66056601

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

api/current.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,6 @@ package android {
754754
field public static final int pathPrefix = 16842795; // 0x101002b
755755
field public static final int permission = 16842758; // 0x1010006
756756
field public static final int permissionGroup = 16842762; // 0x101000a
757-
field public static final int permissionGroupFlags = 16843688; // 0x10103a8
758757
field public static final int persistent = 16842765; // 0x101000d
759758
field public static final int persistentDrawingCache = 16842990; // 0x10100ee
760759
field public static final deprecated int phoneNumber = 16843111; // 0x1010167
@@ -6596,11 +6595,8 @@ package android.content.pm {
65966595
method public int describeContents();
65976596
method public java.lang.CharSequence loadDescription(android.content.pm.PackageManager);
65986597
field public static final android.os.Parcelable.Creator CREATOR;
6599-
field public static final int FLAG_PERSONAL_INFO = 1; // 0x1
66006598
field public int descriptionRes;
6601-
field public int flags;
66026599
field public java.lang.CharSequence nonLocalizedDescription;
6603-
field public int priority;
66046600
}
66056601

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,8 +1464,7 @@ private PermissionGroup parsePermissionGroup(Package owner, int flags, Resources
14641464
perm.info.descriptionRes = sa.getResourceId(
14651465
com.android.internal.R.styleable.AndroidManifestPermissionGroup_description,
14661466
0);
1467-
perm.info.flags = sa.getInt(
1468-
com.android.internal.R.styleable.AndroidManifestPermissionGroup_permissionGroupFlags, 0);
1467+
perm.info.flags = 0;
14691468
perm.info.priority = sa.getInt(
14701469
com.android.internal.R.styleable.AndroidManifestPermissionGroup_priority, 0);
14711470
if (perm.info.priority > 0 && (flags&PARSE_IS_SYSTEM) == 0) {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,20 @@ public class PermissionGroupInfo extends PackageItemInfo implements Parcelable {
4444
/**
4545
* Flag for {@link #flags}, corresponding to <code>personalInfo</code>
4646
* value of {@link android.R.attr#permissionGroupFlags}.
47+
* @hide
4748
*/
4849
public static final int FLAG_PERSONAL_INFO = 1<<0;
4950

5051
/**
5152
* Additional flags about this group as given by
5253
* {@link android.R.attr#permissionGroupFlags}.
54+
* @hide
5355
*/
5456
public int flags;
5557

5658
/**
5759
* Prioritization of this group, for visually sorting with other groups.
60+
* @hide
5861
*/
5962
public int priority;
6063

0 commit comments

Comments
 (0)