From 71dea4743e743dd7748f75991984dc0c421ca362 Mon Sep 17 00:00:00 2001 From: tmfang Date: Thu, 23 May 2019 17:49:44 +0800 Subject: [PATCH] Fix no apps shown on app info screen If Settings app hasn't loaded apps list completely yet, we can't filter result from list. Since there is nothing can be filtered, we just need to show all apps. Test: visual Fixes: 131697606 Change-Id: I971c942b0fe5889206c40d855f8508acd42461a7 --- .../manageapplications/ManageApplications.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index d2b21b0158a..971c6f53f99 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -1169,10 +1169,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); }