From 81adc530d966bd664057ca11179f709a035c2e30 Mon Sep 17 00:00:00 2001
From: Soroosh Mariooryad <soroosh@google.com>
Date: Tue, 31 Jan 2017 13:28:38 -0800
Subject: [PATCH] Adding the dismiss logic for setting smart suggestions.

Test: make RunSettingsLibRoboTests
Fixes: 35059823
Change-Id: I48a71ff525f6dded6f0b505280f5678a554f7183
---
 src/com/android/settings/dashboard/DashboardAdapter.java | 4 +++-
 src/com/android/settings/dashboard/DashboardSummary.java | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index b2ed5926569..372a3533836 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -183,7 +183,9 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         if (mSuggestionParser == null) {
             return;
         }
-        if (mSuggestionParser.dismissSuggestion(suggestion)) {
+        boolean isSmartSuggestionEnabled = FeatureFactory.getFactory(mContext)
+                .getSuggestionFeatureProvider().isSmartSuggestionEnabled(mContext);
+        if (mSuggestionParser.dismissSuggestion(suggestion, isSmartSuggestionEnabled)) {
             mContext.getPackageManager().setComponentEnabledSetting(
                     suggestion.intent.getComponent(),
                     PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index fddf2d77586..74c8bfa7e20 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -268,8 +268,10 @@ public class DashboardSummary extends InstrumentedFragment
         @Override
         protected List<Tile> doInBackground(Void... params) {
             final Context context = getContext();
-            List<Tile> suggestions = mSuggestionParser.getSuggestions();
-            if (mSuggestionFeatureProvider.isSmartSuggestionEnabled(context)) {
+            boolean isSmartSuggestionEnabled =
+                    mSuggestionFeatureProvider.isSmartSuggestionEnabled(context);
+            List<Tile> suggestions = mSuggestionParser.getSuggestions(isSmartSuggestionEnabled);
+            if (isSmartSuggestionEnabled) {
                 List<String> suggestionIds = new ArrayList<>(suggestions.size());
                 for (Tile suggestion : suggestions) {
                     suggestionIds.add(