diff options
| author | Nick Kralevich <nnk@google.com> | 2013-04-11 10:20:09 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2013-04-11 10:20:09 -0700 |
| commit | 32eb5b182458c05f744f9ab2963a13ef620ce069 (patch) | |
| tree | bfa2d2280c1b49998cc7b0f52f1db483f99df9c4 /core/java/android | |
| parent | f8a67f4f5dd4c5499a6e7148331f0286e31203ec (diff) | |
Optional <uses-permission> not yet supported.
Change-Id: Ieaa97a29db75161f35905ff340b2c525bbf50612
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/pm/PackageInfo.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageInfo.java b/core/java/android/content/pm/PackageInfo.java index fb539c572b69..33a67572c567 100644 --- a/core/java/android/content/pm/PackageInfo.java +++ b/core/java/android/content/pm/PackageInfo.java @@ -154,7 +154,7 @@ public class PackageInfo implements Parcelable { /** * Flag for {@link #requestedPermissionsFlags}: the requested permission * is required for the application to run; the user can not optionally - * disable it. + * disable it. Currently all permissions are required. */ public static final int REQUESTED_PERMISSION_REQUIRED = 1<<0; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index da15e3b2d2a9..30bdfef6e4bd 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1754,6 +1754,7 @@ public abstract class PackageManager { /** * Returns an {@link Intent} suitable for passing to {@code startActivityForResult} * which prompts the user to grant {@code permissions} to this application. + * @hide * * @throws NullPointerException if {@code permissions} is {@code null}. * @throws IllegalArgumentException if {@code permissions} contains {@code null}. diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 384aed89ff3e..5a50ec29db0e 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -1407,8 +1407,11 @@ public class PackageParser { // that may change. String name = sa.getNonResourceString( com.android.internal.R.styleable.AndroidManifestUsesPermission_name); +/* boolean required = sa.getBoolean( com.android.internal.R.styleable.AndroidManifestUsesPermission_required, true); +*/ + boolean required = true; // Optional <uses-permission> not supported sa.recycle(); |