diff options
author | Christopher Tate <ctate@google.com> | 2015-10-09 23:57:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-09 23:57:48 +0000 |
commit | 78f7fa0fc8ed3ede373cdb42e2af2046c87ac470 (patch) | |
tree | 41465293c3cb8ccc9852f176898119809bc8e832 /src/com/android/settings/Utils.java | |
parent | 32f4b4690ee39986595ad0803070f112e06203ef (diff) | |
parent | 90de3bebf432d0897607adaca281fe248cd6575f (diff) | |
download | packages_apps_Settings-78f7fa0fc8ed3ede373cdb42e2af2046c87ac470.zip packages_apps_Settings-78f7fa0fc8ed3ede373cdb42e2af2046c87ac470.tar.gz packages_apps_Settings-78f7fa0fc8ed3ede373cdb42e2af2046c87ac470.tar.bz2 |
am 90de3beb: Disable app-link preferences for browser apps
* commit '90de3bebf432d0897607adaca281fe248cd6575f':
Disable app-link preferences for browser apps
Diffstat (limited to 'src/com/android/settings/Utils.java')
-rw-r--r-- | src/com/android/settings/Utils.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 7a6f165..ed1a970 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -1077,9 +1077,9 @@ public final class Utils { boolean hasPreferred = hasPreferredActivities(pm, packageName) || hasUsbDefaults(usbManager, packageName); int status = pm.getIntentVerificationStatus(packageName, UserHandle.myUserId()); + // consider a visible current link-handling state to be any explicitly designated behavior boolean hasDomainURLsPreference = - (status == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS) || - (status == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER); + status != PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED; return context.getString(hasPreferred || hasDomainURLsPreference ? R.string.launch_defaults_some : R.string.launch_defaults_none); |