Merge "Fix no apps shown on app info screen" into qt-dev am: 11e4847d61 am: 848ead645b

am: ee4ca732ef

Change-Id: Ib81ac88e76507992649eebeba3d4910cae3f4ca5

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

@@ -1159,10 +1159,16 @@ public class ManageApplications extends InstrumentedFragment
             });
         }
 
-        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);
         }