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

am: 883c214

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

Change-Id: I7728f81d30bebf447624c0305f772d4be1e97588

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();