diff options
| author | Chris Tate <ctate@android.com> | 2015-08-14 17:11:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-14 17:11:30 +0000 |
| commit | 7e7d79ef2f4aa6a8da86af459d419bd24c47b440 (patch) | |
| tree | 1c16785e8107d1b4624c3658fd47e4174684f0b5 /core | |
| parent | 81f3a85aa29d83ed1a5de4de1006587d375a1c77 (diff) | |
| parent | 56f0ff3c48c88b969d9bf5e62eb1ee590e03e461 (diff) | |
| download | frameworks_base-7e7d79ef2f4aa6a8da86af459d419bd24c47b440.zip frameworks_base-7e7d79ef2f4aa6a8da86af459d419bd24c47b440.tar.gz frameworks_base-7e7d79ef2f4aa6a8da86af459d419bd24c47b440.tar.bz2 | |
Merge "Make "Ask every time" actually work that way" into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/pm/IntentFilterVerificationInfo.java | 5 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/core/java/android/content/pm/IntentFilterVerificationInfo.java b/core/java/android/content/pm/IntentFilterVerificationInfo.java index 4dbac05..953b051 100644 --- a/core/java/android/content/pm/IntentFilterVerificationInfo.java +++ b/core/java/android/content/pm/IntentFilterVerificationInfo.java @@ -19,6 +19,7 @@ package android.content.pm; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS; +import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK; import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER; import android.os.Parcel; @@ -199,6 +200,10 @@ public final class IntentFilterVerificationInfo implements Parcelable { sb.append("never"); break; + case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK: + sb.append("always-ask"); + break; + case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED: default: sb.append("undefined"); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 0f936fd..c8e9402 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1073,6 +1073,18 @@ public abstract class PackageManager { public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER = 3; /** + * Used as the {@code status} argument for {@link PackageManager#updateIntentVerificationStatus} + * to indicate that this app should always be considered as an ambiguous candidate for + * handling the matching Intent even if there are other candidate apps in the "always" + * state. Put another way: if there are any 'always ask' apps in a set of more than + * one candidate app, then a disambiguation is *always* presented even if there is + * another candidate app with the 'always' state. + * + * @hide + */ + public static final int INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK = 4; + + /** * Can be used as the {@code millisecondsToDelay} argument for * {@link PackageManager#extendVerificationTimeout}. This is the * maximum time {@code PackageManager} waits for the verification |