OSDN Git Service

Show correct text for app link domains.
authorTim Kilbourn <tkilbourn@google.com>
Thu, 11 Jun 2015 23:43:59 +0000 (16:43 -0700)
committerTim Kilbourn <tkilbourn@google.com>
Wed, 8 Jul 2015 22:43:43 +0000 (15:43 -0700)
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

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

index 0a09133..6099af1 100644 (file)
@@ -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<String> result = Utils.getHandledDomains(mPm, packageName);
             if (result.size() == 0) {
                 return mContext.getString(R.string.domain_urls_summary_none);