Merge "Fix crash in notifications app list"

This commit is contained in:
Jason Monk
2015-04-23 19:56:20 +00:00
committed by Android (Google) Code Review

View File

@@ -818,7 +818,7 @@ public class ManageApplications extends InstrumentedFragment
} }
notifyDataSetChanged(); notifyDataSetChanged();
if (mEntries.size() != 0 if (mSession.getAllApps().size() != 0
&& mManageApplications.mListContainer.getVisibility() != View.VISIBLE) { && mManageApplications.mListContainer.getVisibility() != View.VISIBLE) {
Utils.handleLoadingContainer(mManageApplications.mLoadingContainer, Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
mManageApplications.mListContainer, true, true); mManageApplications.mListContainer, true, true);
@@ -833,7 +833,7 @@ public class ManageApplications extends InstrumentedFragment
private void updateLoading() { private void updateLoading() {
Utils.handleLoadingContainer(mManageApplications.mLoadingContainer, Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
mManageApplications.mListContainer, mEntries.size() != 0, false); mManageApplications.mListContainer, mSession.getAllApps().size() != 0, false);
} }
private boolean hasDisabledApps() { private boolean hasDisabledApps() {