From da796d80f133e0f5592ffd427013ee40bb296f3f Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Tue, 4 Jul 2023 13:21:33 +0800 Subject: [PATCH] Remove context from getSupportFeatureProvider Bug: 286764889 Test: m Settings Change-Id: I5635c7a809fd24d59da377993c7d1435d0c839e3 --- src/com/android/settings/overlay/FeatureFactory.kt | 5 ++++- src/com/android/settings/overlay/FeatureFactoryImpl.kt | 2 -- .../android/settings/support/SupportDashboardActivity.java | 4 ++-- .../settings/support/SupportPreferenceController.java | 3 +-- .../com/android/settings/testutils/FakeFeatureFactory.java | 2 +- .../src/com/android/settings/testutils/FakeFeatureFactory.kt | 4 ---- .../com/android/settings/testutils/FakeFeatureFactory.java | 2 +- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/com/android/settings/overlay/FeatureFactory.kt b/src/com/android/settings/overlay/FeatureFactory.kt index 81dcdd514dc..bc4f9f3d431 100644 --- a/src/com/android/settings/overlay/FeatureFactory.kt +++ b/src/com/android/settings/overlay/FeatureFactory.kt @@ -66,8 +66,11 @@ abstract class FeatureFactory { */ abstract val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider - abstract fun getSupportFeatureProvider(context: Context): SupportFeatureProvider? + /** Implementation for [SupportFeatureProvider]. */ + open val supportFeatureProvider: SupportFeatureProvider? = null + abstract val metricsFeatureProvider: MetricsFeatureProvider + abstract fun getPowerUsageFeatureProvider(context: Context): PowerUsageFeatureProvider /** diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.kt b/src/com/android/settings/overlay/FeatureFactoryImpl.kt index 77f6812c931..7e973413460 100644 --- a/src/com/android/settings/overlay/FeatureFactoryImpl.kt +++ b/src/com/android/settings/overlay/FeatureFactoryImpl.kt @@ -95,8 +95,6 @@ open class FeatureFactoryImpl : FeatureFactory() { override val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider = HardwareInfoFeatureProviderImpl - override fun getSupportFeatureProvider(context: Context): SupportFeatureProvider? = null - override val metricsFeatureProvider by lazy { SettingsMetricsFeatureProvider() } override fun getPowerUsageFeatureProvider(context: Context) = powerUsageFeatureProvider diff --git a/src/com/android/settings/support/SupportDashboardActivity.java b/src/com/android/settings/support/SupportDashboardActivity.java index 46548584e02..dc77dd4f66c 100644 --- a/src/com/android/settings/support/SupportDashboardActivity.java +++ b/src/com/android/settings/support/SupportDashboardActivity.java @@ -42,8 +42,8 @@ public class SupportDashboardActivity extends Activity implements Indexable { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - SupportFeatureProvider supportFeatureProvider = FeatureFactory.getFactory(this) - .getSupportFeatureProvider(this); + SupportFeatureProvider supportFeatureProvider = FeatureFactory.getFeatureFactory() + .getSupportFeatureProvider(); // try to launch support if we have the feature provider if (supportFeatureProvider != null) { diff --git a/src/com/android/settings/support/SupportPreferenceController.java b/src/com/android/settings/support/SupportPreferenceController.java index 793842f8712..8351e1d598c 100644 --- a/src/com/android/settings/support/SupportPreferenceController.java +++ b/src/com/android/settings/support/SupportPreferenceController.java @@ -34,8 +34,7 @@ public class SupportPreferenceController extends BasePreferenceController { public SupportPreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); - mSupportFeatureProvider = FeatureFactory.getFactory(context) - .getSupportFeatureProvider(context); + mSupportFeatureProvider = FeatureFactory.getFeatureFactory().getSupportFeatureProvider(); } public void setActivity(Activity activity) { diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java index 4c843ee72fe..67519b9a1c4 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -145,7 +145,7 @@ public class FakeFeatureFactory extends FeatureFactory { } @Override - public SupportFeatureProvider getSupportFeatureProvider(Context context) { + public SupportFeatureProvider getSupportFeatureProvider() { return supportFeatureProvider; } diff --git a/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt b/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt index 154f2e805d7..59665cf3974 100644 --- a/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt +++ b/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt @@ -69,10 +69,6 @@ class FakeFeatureFactory : FeatureFactory() { override val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider get() = TODO("Not yet implemented") - override fun getSupportFeatureProvider(context: Context): SupportFeatureProvider? { - TODO("Not yet implemented") - } - override val metricsFeatureProvider = mockMetricsFeatureProvider override fun getPowerUsageFeatureProvider(context: Context): PowerUsageFeatureProvider { diff --git a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java index 75e5f89d524..b71cd9d8ff1 100644 --- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -144,7 +144,7 @@ public class FakeFeatureFactory extends FeatureFactory { } @Override - public SupportFeatureProvider getSupportFeatureProvider(Context context) { + public SupportFeatureProvider getSupportFeatureProvider() { return supportFeatureProvider; }