From a41a8d05abb92c0e945828afc85567cd812d1982 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 10 May 2016 13:03:35 -0400
Subject: [PATCH] Make sure TileAdapter always has a SuggestionParser

Since it expects to have one

Change-Id: Ic0dccd2271c011cf7dc877e341af5a8bfea90c37
Fixes: 28689801
---
 src/com/android/settings/dashboard/DashboardAdapter.java | 6 +++---
 src/com/android/settings/dashboard/DashboardSummary.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index fadc023a322..3fb413aa2ed 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -80,9 +80,10 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
     private Condition mExpandedCondition = null;
     private SuggestionParser mSuggestionParser;
 
-    public DashboardAdapter(Context context) {
+    public DashboardAdapter(Context context, SuggestionParser parser) {
         mContext = context;
         mCache = new IconCache(context);
+        mSuggestionParser = parser;
 
         setHasStableIds(true);
         setShowingAll(true);
@@ -92,9 +93,8 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         return mSuggestions;
     }
 
-    public void setSuggestions(List<Tile> suggestions, SuggestionParser parser) {
+    public void setSuggestions(List<Tile> suggestions) {
         mSuggestions = suggestions;
-        mSuggestionParser = parser;
         recountItems();
     }
 
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 2e93880da07..67004e7533a 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -188,7 +188,7 @@ public class DashboardSummary extends InstrumentedFragment
         mDashboard.setHasFixedSize(true);
         mDashboard.setListener(this);
         mDashboard.addItemDecoration(new DashboardDecorator(getContext()));
-        mAdapter = new DashboardAdapter(getContext());
+        mAdapter = new DashboardAdapter(getContext(), mSuggestionParser);
         mAdapter.setConditions(mConditionManager.getConditions());
         mDashboard.setAdapter(mAdapter);
         mSummaryLoader.setAdapter(mAdapter);
@@ -240,7 +240,7 @@ public class DashboardSummary extends InstrumentedFragment
 
         @Override
         protected void onPostExecute(List<Tile> tiles) {
-            mAdapter.setSuggestions(tiles, mSuggestionParser);
+            mAdapter.setSuggestions(tiles);
         }
     }
 }