Merge "Check for null activity before getting dashboard categories." into nyc-mr1-dev

This commit is contained in:
Doris Ling
2016-07-21 20:58:21 +00:00
committed by Android (Google) Code Review

View File

@@ -16,6 +16,7 @@
package com.android.settings.dashboard; package com.android.settings.dashboard;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
@@ -231,8 +232,12 @@ public class DashboardSummary extends InstrumentedFragment
@Override @Override
protected void onPostExecute(List<Tile> tiles) { protected void onPostExecute(List<Tile> tiles) {
final Activity activity = getActivity();
if (activity == null) {
return;
}
List<DashboardCategory> categories = List<DashboardCategory> categories =
((SettingsActivity) getActivity()).getDashboardCategories(); ((SettingsActivity) activity).getDashboardCategories();
mAdapter.setCategoriesAndSuggestions(categories, tiles); mAdapter.setCategoriesAndSuggestions(categories, tiles);
} }
} }