diff options
author | Christopher Tate <ctate@google.com> | 2015-09-08 15:41:08 -0700 |
---|---|---|
committer | Christopher Tate <ctate@google.com> | 2015-10-09 16:02:00 -0700 |
commit | 90de3bebf432d0897607adaca281fe248cd6575f (patch) | |
tree | da373ba84a76391ee202dea14f7ebbd5d0e5ee3e /src/com/android/settings/Utils.java | |
parent | 47e870adc8df32c2a6e2c531be115dd0b698850e (diff) | |
download | packages_apps_Settings-90de3bebf432d0897607adaca281fe248cd6575f.zip packages_apps_Settings-90de3bebf432d0897607adaca281fe248cd6575f.tar.gz packages_apps_Settings-90de3bebf432d0897607adaca281fe248cd6575f.tar.bz2 |
Disable app-link preferences for browser apps
Also make sure that the 'Clear defaults' action unsets the app's
standing as the default browser, when applicable.
Bug 23751034
Change-Id: I6131b763bfa76ba38d18cad2abbb35caffe789aa
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 d25d8c3..d2d04ec 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -1146,9 +1146,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); |