From 5711e73146ac530d38479aaf54def236c975d345 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 11 Aug 2015 09:41:42 -0400
Subject: [PATCH] Possibly fix apps loading forever

 - Consistently handle results from filters whether async or not
 - Make sure we trigger a rebuild after loading entries is complete

Bug: 22838302
Change-Id: I4595c61d4ea7069e59440c9dc673a1f0b73bc864
---
 .../applications/ManageApplications.java      | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index a0c1c137a15..868f5f81743 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -864,6 +864,11 @@ public class ManageApplications extends InstrumentedFragment
                 // Don't have new list yet, but can continue using the old one.
                 return;
             }
+            onRebuildComplete(entries);
+        }
+
+        @Override
+        public void onRebuildComplete(ArrayList<AppEntry> entries) {
             mBaseEntries = entries;
             if (mBaseEntries != null) {
                 mEntries = applyPrefixFilter(mCurFilterPrefix, mBaseEntries);
@@ -922,21 +927,6 @@ public class ManageApplications extends InstrumentedFragment
             mManageApplications.getActivity().setProgressBarIndeterminateVisibility(running);
         }
 
-        @Override
-        public void onRebuildComplete(ArrayList<AppEntry> apps) {
-            if (mManageApplications.mLoadingContainer.getVisibility() == View.VISIBLE) {
-                mManageApplications.mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(
-                        mContext, android.R.anim.fade_out));
-                mManageApplications.mListContainer.startAnimation(AnimationUtils.loadAnimation(
-                        mContext, android.R.anim.fade_in));
-            }
-            mManageApplications.mListContainer.setVisibility(View.VISIBLE);
-            mManageApplications.mLoadingContainer.setVisibility(View.GONE);
-            mBaseEntries = apps;
-            mEntries = applyPrefixFilter(mCurFilterPrefix, mBaseEntries);
-            notifyDataSetChanged();
-        }
-
         @Override
         public void onPackageListChanged() {
             rebuild(false);
@@ -951,6 +941,8 @@ public class ManageApplications extends InstrumentedFragment
         @Override
         public void onLoadEntriesCompleted() {
             mHasReceivedLoadEntries = true;
+            // We may have been skipping rebuilds until this came in, trigger one now.
+            rebuild(false);
         }
 
         @Override