Merge "Added guard to logging in AsyncTask" into nyc-mr1-dev
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 12f036a..e0f727f 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -236,17 +236,18 @@
@Override
protected List<Tile> doInBackground(Void... params) {
+ final Context context = getContext();
List<Tile> suggestions = mSuggestionParser.getSuggestions();
for (int i = 0; i < suggestions.size(); i++) {
Tile suggestion = suggestions.get(i);
if (mSuggestionsChecks.isSuggestionComplete(suggestion)) {
mAdapter.disableSuggestion(suggestion);
suggestions.remove(i--);
- } else {
- String id = DashboardAdapter.getSuggestionIdentifier(getContext(), suggestion);
+ } else if (context != null) {
+ String id = DashboardAdapter.getSuggestionIdentifier(context, suggestion);
if (!mSuggestionsShownLogged.contains(id)) {
mSuggestionsShownLogged.add(id);
- MetricsLogger.action(getContext(),
+ MetricsLogger.action(context,
MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, id);
}
}