Merge "Fix a Deletion Helper crash when it fails to get an app list." into nyc-mr1-dev am: 883c214

am: 35eb879

* commit '35eb879739daa0026c463494e71e525d58f5397f':
  Fix a Deletion Helper crash when it fails to get an app list.

Change-Id: Ia1e3499093808bdb795f4288b53c6235a5965e21

src/com/android/settings/deletionhelper/DeletionHelperFragment.java

@@ -153,6 +153,7 @@ public class DeletionHelperFragment extends SettingsPreferenceFragment implement
         final ArrayList<AppEntry> apps =
                 mSession.rebuild(AppStateUsageStatsBridge.FILTER_USAGE_STATS,
                         ApplicationsState.SIZE_COMPARATOR);
+        if (apps == null) return;
         mAppEntries = apps;
         cacheRemoveAllPrefs(mApps);
         int entryCount = apps.size();