Merge "Remove context from userFeatureProvider" into main
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
index 5e7878e..be5e5ef 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
@@ -72,7 +72,7 @@
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 d09e54b..72a06fe 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
@@ -39,7 +39,7 @@
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 5f456e0..eecec36 100644
--- a/src/com/android/settings/overlay/FeatureFactory.kt
+++ b/src/com/android/settings/overlay/FeatureFactory.kt
@@ -93,7 +93,7 @@
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 0da5871..686bc0f 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.kt
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.kt
@@ -79,8 +79,6 @@
)
}
- private val userFeatureProvider by lazy { UserFeatureProviderImpl(appContext) }
-
private val contextualCardFeatureProvider by lazy {
ContextualCardFeatureProviderImpl(appContext)
}
@@ -130,7 +128,7 @@
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 cd9b081..b8fa0bc 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 @@
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 0fe634a..7a17fe8 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 @@
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 0c3bc8c..c2c485d 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 @@
return securityFeatureProvider;
}
+ @NotNull
@Override
- public UserFeatureProvider getUserFeatureProvider(Context context) {
+ public UserFeatureProvider getUserFeatureProvider() {
return userFeatureProvider;
}