commit 11e4847d6188f7997140095263041f53cfedbf1c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 24 08:03:26 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 24 08:03:26 2019 +0000
tree 34f749de139235a901e9bc033262c02a8486856e
parent 505a46f7ff33e0e1f3ef5246bc23fab7feae4add
parent 71dea4743e743dd7748f75991984dc0c421ca362

Merge "Fix no apps shown on app info screen" into qt-dev

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

diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index d2b21b0..971c6f5 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -1169,10 +1169,16 @@
             });
         }
 
-        public void filterSearch(String query) {
+        @VisibleForTesting
+        void filterSearch(String query) {
             if (mSearchFilter == null) {
                 mSearchFilter = new SearchFilter();
             }
+            // If we haven't load apps list completely, don't filter anything.
+            if(mOriginalEntries == null) {
+                Log.w(TAG, "Apps haven't loaded completely yet, so nothing can be filtered");
+                return;
+            }
             mSearchFilter.filter(query);
         }