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

am: d94fbbc325 Change-Id: I4c827d601b8ed20934c4671d5a7de29a3001bd0b
2017-08-24 00:48:20 +00:00
parent fb13cac59f d94fbbc325
commit c2eab36c7c
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)) {