From 49983b991c01af0bc958eee1ddad144b7bde44ec Mon Sep 17 00:00:00 2001 From: Tim Kilbourn Date: Thu, 11 Jun 2015 16:43:59 -0700 Subject: [PATCH] Show correct text for app link domains. The user's preferences were not queried on the app listing, making it look like an app would open links even after the user disabled app links for the app. Bug: 21093152 Change-Id: I133ff229bb5e289ebec8df06924936fb3177f095 --- .../android/settings/applications/ManageApplications.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 0a09133ffb0..6099af15423 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -1045,6 +1045,14 @@ public class ManageApplications extends InstrumentedFragment } private CharSequence getDomainsSummary(String packageName) { + // If the user has explicitly said "no" for this package, that's the + // string we should show. + int domainStatus = mPm.getIntentVerificationStatus(packageName, UserHandle.myUserId()); + if (domainStatus == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER) { + return mContext.getString(R.string.domain_urls_summary_none); + } + // Otherwise, ask package manager for the domains for this package, + // and show the first one (or none if there aren't any). ArraySet result = Utils.getHandledDomains(mPm, packageName); if (result.size() == 0) { return mContext.getString(R.string.domain_urls_summary_none);