diff options
| author | Nick Kralevich <nnk@google.com> | 2013-04-11 14:58:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-11 14:58:13 -0700 |
| commit | 6e2157456a38c7b4db37ddba8c14caed2f0576c2 (patch) | |
| tree | 9a1c86e9f9a49f6173e74cf543ef28d5c0c811ce /core/java/android/content/pm | |
| parent | 3e4e221e6dd0e5c6fd4ef6036a37b166bd1053e4 (diff) | |
| parent | c5931edb4c8d95e90ac739ec88d8fca2610a57f1 (diff) | |
| download | frameworks_base-6e2157456a38c7b4db37ddba8c14caed2f0576c2.zip frameworks_base-6e2157456a38c7b4db37ddba8c14caed2f0576c2.tar.gz frameworks_base-6e2157456a38c7b4db37ddba8c14caed2f0576c2.tar.bz2 | |
am c5931edb: am c65e4633: Merge "Optional <uses-permission> not yet supported." into jb-mr2-dev
* commit 'c5931edb4c8d95e90ac739ec88d8fca2610a57f1':
Optional <uses-permission> not yet supported.
Diffstat (limited to 'core/java/android/content/pm')
| -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 fb539c5..33a6757 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 da15e3b..30bdfef 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 245aa51..0e22b7b 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -1424,8 +1424,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(); |