diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:49:15 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:49:15 -0800 |
| commit | 64e314b61e865919fc8c94165e42dfc5fb7b92f4 (patch) | |
| tree | abdadcbf11c325bdf7f79a1ba051043a82909211 /src/com/android/settings/Utils.java | |
| parent | 89ae71c089067d2cd6a3e7304f4126abb57ab9be (diff) | |
| parent | 46742e0cf933abfcf65be9009cd9262863280c34 (diff) | |
| download | packages_apps_Settings-64e314b61e865919fc8c94165e42dfc5fb7b92f4.tar.gz packages_apps_Settings-64e314b61e865919fc8c94165e42dfc5fb7b92f4.tar.bz2 packages_apps_Settings-64e314b61e865919fc8c94165e42dfc5fb7b92f4.zip | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/packages/apps/Settings into HEAD
Android 6.0.1 release 3
Change-Id: If54bacef03fc826fd02ca48db5ef3a25c8fc7127
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 b18e27cba..6dcbbe5cc 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -1284,9 +1284,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); |