commit 76f95e82b861441bccb9f452fe77e1c47acc1d3c
author Jason Monk <jmonk@google.com> Wed May 11 15:06:04 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 11 15:06:05 2016 +0000
tree e8518074133b547cb85ed9993d8a9adcdd84e954
parent e8c5eca02dab28c7c3860660c9cc8d890ee5a638
parent 31ecec0ab117c1decfe9165951f095b5490377c8

Merge "Protect against case when suggestions haven't loaded" into nyc-dev

src/com/android/settings/dashboard/DashboardSummary.java

diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 67004e7..18b941c 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -142,6 +142,9 @@
                 MetricsLogger.hidden(getContext(), c.getMetricsConstant());
             }
         }
+        if (mAdapter.getSuggestions() == null) {
+            return;
+        }
         for (Tile suggestion : mAdapter.getSuggestions()) {
             MetricsLogger.action(getContext(), MetricsEvent.ACTION_HIDE_SETTINGS_SUGGESTION,
                     DashboardAdapter.getSuggestionIdentifier(getContext(), suggestion));