summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorChris Tate <ctate@android.com>2015-08-26 00:20:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-26 00:20:50 +0000
commit9b7a4ac5846baf2da8b800c24a770669cfa735aa (patch)
tree798458fafdd7884682906a48ce575787fe086169 /cmds
parentf03c090f3e41a80282e4febd85ca53c681649f86 (diff)
parente62421f1fbc1ea44e7737989e134fdf9fc1ec4cc (diff)
downloadframeworks_base-9b7a4ac5846baf2da8b800c24a770669cfa735aa.zip
frameworks_base-9b7a4ac5846baf2da8b800c24a770669cfa735aa.tar.gz
frameworks_base-9b7a4ac5846baf2da8b800c24a770669cfa735aa.tar.bz2
am e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev
* commit 'e62421f1fbc1ea44e7737989e134fdf9fc1ec4cc': Teach Pm about the "always ask" link-handling state
Diffstat (limited to 'cmds')
-rw-r--r--cmds/pm/src/com/android/commands/pm/Pm.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java
index 9f385fe..58c3a9c 100644
--- a/cmds/pm/src/com/android/commands/pm/Pm.java
+++ b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -983,6 +983,7 @@ public final class Pm {
case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK: return "ask";
case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS: return "always";
case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER: return "never";
+ case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK : return "always ask";
}
return "Unknown link state: " + state;
}