commit 7c8cb46fe383956830a04e079a13ded56f7c2154
author Chris Tate <ctate@android.com> Fri Aug 14 17:27:02 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 14 17:27:02 2015 +0000
tree c974dd308ef91be19f933b99695f06118d17d4c3
parent fa62043590d5ae99008aa1ddbd1e8b1f052fc0a1
parent 36e2d32dab47f9d46c0234202c2a799c43b67c9e

am 36e2d32d: am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev

* commit '36e2d32dab47f9d46c0234202c2a799c43b67c9e':
  Make "Ask every time" actually work that way

src/com/android/settings/applications/AppLaunchSettings.java

diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java
index b63bd7d..c885b02 100644
--- a/src/com/android/settings/applications/AppLaunchSettings.java
+++ b/src/com/android/settings/applications/AppLaunchSettings.java
@@ -39,6 +39,7 @@
 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 java.util.List;
@@ -93,7 +94,7 @@
         mAppLinkState.addItem(R.string.app_link_open_always,
                 INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS);
         mAppLinkState.addItem(R.string.app_link_open_ask,
-                INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK);
+                INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK);
         mAppLinkState.addItem(R.string.app_link_open_never,
                 INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER);
 
@@ -105,7 +106,7 @@
             final int state = mPm.getIntentVerificationStatus(mPackageName, UserHandle.myUserId());
             mAppLinkState.setSelectedValue(
                     (state == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED)
-                        ? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK
+                        ? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK
                         : state);
 
             // Set the callback only after setting the initial selected item