diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-06-02 08:20:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-02 08:20:36 -0700 |
| commit | cbc5e0aae45374ec92574b1cab9b31e494ce10e7 (patch) | |
| tree | 28896b53a0c0617b7dc32f9722b385bd3b1b5f56 /api | |
| parent | b1ebee8ac7c96b48fb47e03a239d41edc376021b (diff) | |
| parent | 3522225dba19e77defaf56f0e70c0382c2cbb0a2 (diff) | |
| download | frameworks_base-cbc5e0aae45374ec92574b1cab9b31e494ce10e7.zip frameworks_base-cbc5e0aae45374ec92574b1cab9b31e494ce10e7.tar.gz frameworks_base-cbc5e0aae45374ec92574b1cab9b31e494ce10e7.tar.bz2 | |
am 3522225d: am ea01e4a2: Merge "Survey says: NIET!" into jb-dev
* commit '3522225dba19e77defaf56f0e70c0382c2cbb0a2':
Survey says: NIET!
Diffstat (limited to 'api')
| -rw-r--r-- | api/16.txt | 4 | ||||
| -rw-r--r-- | api/current.txt | 4 |
2 files changed, 0 insertions, 8 deletions
@@ -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 @@ -6596,11 +6595,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 { diff --git a/api/current.txt b/api/current.txt index a7c89fa..2f49d53 100644 --- a/api/current.txt +++ b/api/current.txt @@ -759,7 +759,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 @@ -6605,11 +6604,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 { |