From d011d45da5b6565a2bbad3e09e20928125e29cd8 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 20 Aug 2018 16:00:26 -0700
Subject: [PATCH] Remove getExtraAction() from DashboardFeatureProvider.

It's always set to null and not doing anything.

Bug: 111427617
Test: robotest
Change-Id: I7172a31056950b1597f0b98625a3a2615305e466
---
 .../android/settings/dashboard/CategoryManager.java  | 12 +++---------
 .../settings/dashboard/DashboardFeatureProvider.java |  5 -----
 .../dashboard/DashboardFeatureProviderImpl.java      |  7 +------
 .../dashboard/DashboardFeatureProviderImplTest.java  |  5 -----
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/com/android/settings/dashboard/CategoryManager.java b/src/com/android/settings/dashboard/CategoryManager.java
index 21324b288a8..5cc75c88f91 100644
--- a/src/com/android/settings/dashboard/CategoryManager.java
+++ b/src/com/android/settings/dashboard/CategoryManager.java
@@ -51,25 +51,19 @@ public class CategoryManager {
     private final Map<String, DashboardCategory> mCategoryByKeyMap;
 
     private List<DashboardCategory> mCategories;
-    private String mExtraAction;
 
     public static CategoryManager get(Context context) {
-        return get(context, null);
-    }
-
-    public static CategoryManager get(Context context, String action) {
         if (sInstance == null) {
-            sInstance = new CategoryManager(context, action);
+            sInstance = new CategoryManager(context);
         }
         return sInstance;
     }
 
-    CategoryManager(Context context, String action) {
+    CategoryManager(Context context) {
         mTileByComponentCache = new ArrayMap<>();
         mCategoryByKeyMap = new ArrayMap<>();
         mInterestingConfigChanges = new InterestingConfigChanges();
         mInterestingConfigChanges.applyNewConfig(context.getResources());
-        mExtraAction = action;
     }
 
     public synchronized DashboardCategory getTilesByCategory(Context context, String categoryKey) {
@@ -117,7 +111,7 @@ public class CategoryManager {
                 mTileByComponentCache.clear();
             }
             mCategoryByKeyMap.clear();
-            mCategories = TileUtils.getCategories(context, mTileByComponentCache, mExtraAction);
+            mCategories = TileUtils.getCategories(context, mTileByComponentCache);
             for (DashboardCategory category : mCategories) {
                 mCategoryByKeyMap.put(category.key, category);
             }
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
index 81fb99e83be..9f562a08467 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
@@ -58,11 +58,6 @@ public interface DashboardFeatureProvider {
     void bindPreferenceToTile(FragmentActivity activity, boolean forceRoundedIcon,
             int sourceMetricsCategory, Preference pref, Tile tile, String key, int baseOrder);
 
-    /**
-     * Returns additional intent filter action for dashboard tiles
-     */
-    String getExtraIntentAction();
-
     /**
      * Opens a tile to its destination intent.
      */
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 3c0a65d30f0..2267311a6e4 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -71,7 +71,7 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
 
     public DashboardFeatureProviderImpl(Context context) {
         mContext = context.getApplicationContext();
-        mCategoryManager = CategoryManager.get(context, getExtraIntentAction());
+        mCategoryManager = CategoryManager.get(context);
         mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
         mPackageManager = context.getPackageManager();
     }
@@ -151,11 +151,6 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
         }
     }
 
-    @Override
-    public String getExtraIntentAction() {
-        return null;
-    }
-
     @Override
     public void openTileIntent(FragmentActivity activity, Tile tile) {
         if (tile == null) {
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index d49e4fbb057..4e788a11516 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -365,11 +365,6 @@ public class DashboardFeatureProviderImplTest {
         assertThat(launchIntent).isNull();
     }
 
-    @Test
-    public void testGetExtraIntentAction_shouldReturnNull() {
-        assertThat(mImpl.getExtraIntentAction()).isNull();
-    }
-
     @Test
     public void openTileIntent_profileSelectionDialog_shouldShow() {
         final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);