From 515c0b8e3ad02557f327044786ec9c825806eed1 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Wed, 2 Aug 2023 17:25:41 +0800 Subject: [PATCH] Remove context from userFeatureProvider UserFeatureProviderImpl is created by using application context, no need pass context in when get. Bug: 286764889 Test: m Settings Change-Id: I80ac7124c3278399e562d4d7d49d1847847b92af --- .../EnterpriseSetDefaultAppsListPreferenceController.java | 2 +- .../EnterpriseSetDefaultAppsPreferenceController.java | 2 +- src/com/android/settings/overlay/FeatureFactory.kt | 2 +- src/com/android/settings/overlay/FeatureFactoryImpl.kt | 4 +--- .../com/android/settings/testutils/FakeFeatureFactory.java | 3 ++- .../src/com/android/settings/testutils/FakeFeatureFactory.kt | 5 ++--- .../com/android/settings/testutils/FakeFeatureFactory.java | 3 ++- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java index 5e7878e1e68..be5e5efb5aa 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java @@ -72,7 +72,7 @@ public class EnterpriseSetDefaultAppsListPreferenceController extends final FeatureFactory factory = FeatureFactory.getFeatureFactory(); mApplicationFeatureProvider = factory.getApplicationFeatureProvider(); mEnterprisePrivacyFeatureProvider = factory.getEnterprisePrivacyFeatureProvider(context); - mUserFeatureProvider = factory.getUserFeatureProvider(context); + mUserFeatureProvider = factory.getUserFeatureProvider(); buildAppList(); } diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java index d09e54bc8dc..72a06feae38 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java @@ -39,7 +39,7 @@ public class EnterpriseSetDefaultAppsPreferenceController super(context); final FeatureFactory factory = FeatureFactory.getFeatureFactory(); mApplicationFeatureProvider = factory.getApplicationFeatureProvider(); - mUserFeatureProvider = factory.getUserFeatureProvider(context); + mUserFeatureProvider = factory.getUserFeatureProvider(); } @Override diff --git a/src/com/android/settings/overlay/FeatureFactory.kt b/src/com/android/settings/overlay/FeatureFactory.kt index 5f456e0ebd7..eecec36fea4 100644 --- a/src/com/android/settings/overlay/FeatureFactory.kt +++ b/src/com/android/settings/overlay/FeatureFactory.kt @@ -93,7 +93,7 @@ abstract class FeatureFactory { abstract val searchFeatureProvider: SearchFeatureProvider abstract fun getSurveyFeatureProvider(context: Context): SurveyFeatureProvider? abstract val securityFeatureProvider: SecurityFeatureProvider - abstract fun getUserFeatureProvider(context: Context): UserFeatureProvider + abstract val userFeatureProvider: UserFeatureProvider abstract val slicesFeatureProvider: SlicesFeatureProvider abstract val accountFeatureProvider: AccountFeatureProvider abstract val panelFeatureProvider: PanelFeatureProvider diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.kt b/src/com/android/settings/overlay/FeatureFactoryImpl.kt index 0da58717a27..686bc0fdc82 100644 --- a/src/com/android/settings/overlay/FeatureFactoryImpl.kt +++ b/src/com/android/settings/overlay/FeatureFactoryImpl.kt @@ -79,8 +79,6 @@ open class FeatureFactoryImpl : FeatureFactory() { ) } - private val userFeatureProvider by lazy { UserFeatureProviderImpl(appContext) } - private val contextualCardFeatureProvider by lazy { ContextualCardFeatureProviderImpl(appContext) } @@ -130,7 +128,7 @@ open class FeatureFactoryImpl : FeatureFactory() { SuggestionFeatureProviderImpl() } - override fun getUserFeatureProvider(context: Context) = userFeatureProvider + override val userFeatureProvider by lazy { UserFeatureProviderImpl(appContext) } override val slicesFeatureProvider by lazy { SlicesFeatureProviderImpl() } diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java index cd9b08190ed..b8fa0bc65e5 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -213,8 +213,9 @@ public class FakeFeatureFactory extends FeatureFactory { return securityFeatureProvider; } + @NotNull @Override - public UserFeatureProvider getUserFeatureProvider(Context context) { + public UserFeatureProvider getUserFeatureProvider() { return userFeatureProvider; } 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 0fe634ab3d9..7a17fe89f48 100644 --- a/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt +++ b/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt @@ -104,9 +104,8 @@ class FakeFeatureFactory : FeatureFactory() { override val securityFeatureProvider: SecurityFeatureProvider get() = TODO("Not yet implemented") - override fun getUserFeatureProvider(context: Context): UserFeatureProvider { - TODO("Not yet implemented") - } + override val userFeatureProvider: UserFeatureProvider + get() = TODO("Not yet implemented") override val slicesFeatureProvider: SlicesFeatureProvider get() = TODO("Not yet implemented") diff --git a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java index 0c3bc8c4444..c2c485da9d5 100644 --- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -212,8 +212,9 @@ public class FakeFeatureFactory extends FeatureFactory { return securityFeatureProvider; } + @NotNull @Override - public UserFeatureProvider getUserFeatureProvider(Context context) { + public UserFeatureProvider getUserFeatureProvider() { return userFeatureProvider; }