commit 42c9de42d04ebb3a263a1b90d8cf9fe7ac135eb1
author Fan Zhang <zhfan@google.com> Wed Sep 12 15:19:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 12 15:19:53 2018 -0700
tree 8272385ee3bfcbbedc4f9c088faf62b3ec39e58f
parent ce9b7b416b139c2d9de2b19fed6ab2638ad324bc
parent a6c4b1dc66a37e00b3ea441ba850d0dc61ba849e

Don't show disabled app in search in some conditions
am: a6c4b1dc66

Change-Id: I4c407f7728be5391e04bd1f62939f75e0e491cfe

src/com/android/settings/intelligence/search/query/InstalledAppResultTask.java

diff --git a/src/com/android/settings/intelligence/search/query/InstalledAppResultTask.java b/src/com/android/settings/intelligence/search/query/InstalledAppResultTask.java
index 741d803..6732765 100644
--- a/src/com/android/settings/intelligence/search/query/InstalledAppResultTask.java
+++ b/src/com/android/settings/intelligence/search/query/InstalledAppResultTask.java
@@ -73,6 +73,12 @@
                         | PackageManager.MATCH_INSTANT);
 
         for (ApplicationInfo info : appsInfo) {
+            if (!info.enabled
+                    && mPackageManager.getApplicationEnabledSetting(info.packageName)
+                    != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
+                // Disabled by something other than user, skip.
+                continue;
+            }
             final CharSequence label = info.loadLabel(mPackageManager);
             final int wordDiff = SearchQueryUtils.getWordDifference(label.toString(), mQuery);
             if (wordDiff == SearchQueryUtils.NAME_NO_MATCH) {