Merge "Fix null pointer exception when logging suggestions." into oc-mr1-dev am: d94fbbc325

am: c2eab36c7c Change-Id: I09efabd3f8a4a7358f2b6a6d52a15fdd75ca7672
2017-08-24 01:11:22 +00:00
parent a5b20303ee c2eab36c7c
commit d9d877cb48
2 changed files with 20 additions and 1 deletions
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -329,7 +329,11 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
    }

    private void logSuggestions() {
-        for (Tile suggestion : mDashboardData.getSuggestions()) {
+        final List<Tile> suggestions = mDashboardData.getSuggestions();
+        if (suggestions == null) {
+            return;
+        }
+        for (Tile suggestion : suggestions) {
            final String suggestionId = mSuggestionFeatureProvider.getSuggestionIdentifier(
                mContext, suggestion);
            if (!mSuggestionsShownLogged.contains(suggestionId)) {