am e49dcfed: am 9b7a4ac5: am e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev

* commit 'e49dcfed5ac1226ccbf2a3d139b5ea8ebf611f72':
  Teach Pm about the "always ask" link-handling state
This commit is contained in:
Chris Tate
2015-08-26 00:35:43 +00:00
committed by Android Git Automerger

View File

@@ -983,6 +983,7 @@ public final class Pm {
case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK: return "ask"; case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK: return "ask";
case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS: return "always"; case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS: return "always";
case INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER: return "never"; 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; return "Unknown link state: " + state;
} }