Remove context from enterprisePrivacyFeatureProvider
EnterprisePrivacyFeatureProvider is created by using application
context, no need pass context in when get.
Bug: 286764889
Test: m Settings
Change-Id: I346f2b0ccbb0590f26954603ab630132cd8be63f
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 57d91f0..7cd4493 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -202,7 +202,7 @@
private String getAlternativeFragmentName() {
String alternativeFragmentClassname = null;
final SecuritySettingsFeatureProvider securitySettingsFeatureProvider =
- FeatureFactory.getFactory(this).getSecuritySettingsFeatureProvider();
+ FeatureFactory.getFeatureFactory().getSecuritySettingsFeatureProvider();
if (securitySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()) {
alternativeFragmentClassname = securitySettingsFeatureProvider
.getAlternativeSecuritySettingsFragmentClassname();
@@ -418,8 +418,7 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- if (FeatureFactory.getFactory(this)
- .getEnterprisePrivacyFeatureProvider(this)
+ if (FeatureFactory.getFeatureFactory().getEnterprisePrivacyFeatureProvider()
.showParentalControls()) {
finish();
} else if (!EnterprisePrivacySettings.isPageEnabled(this)) {
diff --git a/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java b/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
index ca0a0d6..f7816bb 100644
--- a/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
+++ b/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
@@ -35,8 +35,8 @@
public EnterpriseDisclosurePreferenceController(Context context, String key) {
// Preference key doesn't matter as we are creating the preference in code.
super(context, key);
- mFeatureProvider = FeatureFactory.getFactory(mContext)
- .getEnterprisePrivacyFeatureProvider(mContext);
+ mFeatureProvider = FeatureFactory.getFeatureFactory()
+ .getEnterprisePrivacyFeatureProvider();
}
@Override
diff --git a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
index cf1b8a3..bdbdce9 100644
--- a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
@@ -36,8 +36,8 @@
public AdminActionPreferenceControllerBase(Context context) {
super(context);
- mFeatureProvider = FeatureFactory.getFactory(context)
- .getEnterprisePrivacyFeatureProvider(context);
+ mFeatureProvider = FeatureFactory.getFeatureFactory()
+ .getEnterprisePrivacyFeatureProvider();
}
protected abstract Date getAdminActionTimestamp();
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
index f1f9a61..b602791 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
@@ -35,8 +35,8 @@
public AlwaysOnVpnCurrentUserPreferenceController(Context context) {
super(context);
- mFeatureProvider = FeatureFactory.getFactory(context)
- .getEnterprisePrivacyFeatureProvider(context);
+ mFeatureProvider = FeatureFactory.getFeatureFactory()
+ .getEnterprisePrivacyFeatureProvider();
mDevicePolicyManager = context.getSystemService(DevicePolicyManager.class);
}
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
index a23af0c..c545a28 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
@@ -27,8 +27,8 @@
public AlwaysOnVpnManagedProfilePreferenceController(Context context) {
super(context);
- mFeatureProvider = FeatureFactory.getFactory(context)
- .getEnterprisePrivacyFeatureProvider(context);
+ mFeatureProvider = FeatureFactory.getFeatureFactory()
+ .getEnterprisePrivacyFeatureProvider();
}
@Override
diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
index 936df25..2e87cb9 100644
--- a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
@@ -31,8 +31,8 @@
public CaCertsPreferenceControllerBase(Context context) {
super(context);
- mFeatureProvider = FeatureFactory.getFactory(context)
- .getEnterprisePrivacyFeatureProvider(context);
+ mFeatureProvider = FeatureFactory.getFeatureFactory()
+ .getEnterprisePrivacyFeatureProvider();
}
@Override
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
index a154ded..da1cb45 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -168,8 +168,8 @@
}
public static boolean isPageEnabled(Context context) {
- return FeatureFactory.getFactory(context)
- .getEnterprisePrivacyFeatureProvider(context)
+ return FeatureFactory.getFeatureFactory()
+ .getEnterprisePrivacyFeatureProvider()
.hasDeviceOwner();
}
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
index be5e5ef..676d4ac 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
@@ -71,7 +71,7 @@
mParent = parent;
final FeatureFactory factory = FeatureFactory.getFeatureFactory();
mApplicationFeatureProvider = factory.getApplicationFeatureProvider();
- mEnterprisePrivacyFeatureProvider = factory.getEnterprisePrivacyFeatureProvider(context);
+ mEnterprisePrivacyFeatureProvider = factory.getEnterprisePrivacyFeatureProvider();
mUserFeatureProvider = factory.getUserFeatureProvider();
buildAppList();
}
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
index f008b18..6bade7c 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
@@ -31,8 +31,8 @@
public FailedPasswordWipePreferenceControllerBase(Context context) {
super(context);
- mFeatureProvider = FeatureFactory.getFactory(context)
- .getEnterprisePrivacyFeatureProvider(context);
+ mFeatureProvider = FeatureFactory.getFeatureFactory()
+ .getEnterprisePrivacyFeatureProvider();
}
protected abstract int getMaximumFailedPasswordsBeforeWipe();
diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java
index 2adf52c..ae47d21 100644
--- a/src/com/android/settings/enterprise/ImePreferenceController.java
+++ b/src/com/android/settings/enterprise/ImePreferenceController.java
@@ -34,8 +34,8 @@
public ImePreferenceController(Context context) {
super(context);
- mFeatureProvider = FeatureFactory.getFactory(context)
- .getEnterprisePrivacyFeatureProvider(context);
+ mFeatureProvider = FeatureFactory.getFeatureFactory()
+ .getEnterprisePrivacyFeatureProvider();
}
@Override
diff --git a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
index 90a1a1e..4b301d5 100644
--- a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
+++ b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
@@ -31,8 +31,8 @@
public ManageDeviceAdminPreferenceController(Context context, String key) {
super(context, key);
- mFeatureProvider = FeatureFactory.getFactory(context)
- .getEnterprisePrivacyFeatureProvider(context);
+ mFeatureProvider = FeatureFactory.getFeatureFactory()
+ .getEnterprisePrivacyFeatureProvider();
mDevicePolicyManager =
mContext.getSystemService(DevicePolicyManager.class);
}
diff --git a/src/com/android/settings/enterprise/PrivacyPreferenceControllerHelper.java b/src/com/android/settings/enterprise/PrivacyPreferenceControllerHelper.java
index e582fb0..e54fbcb 100644
--- a/src/com/android/settings/enterprise/PrivacyPreferenceControllerHelper.java
+++ b/src/com/android/settings/enterprise/PrivacyPreferenceControllerHelper.java
@@ -39,8 +39,8 @@
PrivacyPreferenceControllerHelper(Context context) {
mContext = Objects.requireNonNull(context);
- mFeatureProvider = FeatureFactory.getFactory(context)
- .getEnterprisePrivacyFeatureProvider(context);
+ mFeatureProvider = FeatureFactory.getFeatureFactory()
+ .getEnterprisePrivacyFeatureProvider();
mDevicePolicyManager = context.getSystemService(DevicePolicyManager.class);
}
diff --git a/src/com/android/settings/overlay/FeatureFactory.kt b/src/com/android/settings/overlay/FeatureFactory.kt
index eecec36..267166b 100644
--- a/src/com/android/settings/overlay/FeatureFactory.kt
+++ b/src/com/android/settings/overlay/FeatureFactory.kt
@@ -86,9 +86,7 @@
abstract val applicationFeatureProvider: ApplicationFeatureProvider
abstract val localeFeatureProvider: LocaleFeatureProvider
- abstract fun getEnterprisePrivacyFeatureProvider(
- context: Context,
- ): EnterprisePrivacyFeatureProvider
+ abstract val enterprisePrivacyFeatureProvider: EnterprisePrivacyFeatureProvider
abstract val searchFeatureProvider: SearchFeatureProvider
abstract fun getSurveyFeatureProvider(context: Context): SurveyFeatureProvider?
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.kt b/src/com/android/settings/overlay/FeatureFactoryImpl.kt
index 686bc0f..2f0fe8b 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.kt
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.kt
@@ -67,18 +67,6 @@
* [FeatureFactory] implementation for AOSP Settings.
*/
open class FeatureFactoryImpl : FeatureFactory() {
- private val enterprisePrivacyFeatureProvider by lazy {
- EnterprisePrivacyFeatureProviderImpl(
- appContext,
- appContext.devicePolicyManager,
- appContext.packageManager,
- UserManager.get(appContext),
- appContext.getSystemService(ConnectivityManager::class.java),
- appContext.getSystemService(VpnManager::class.java),
- appContext.resources,
- )
- }
-
private val contextualCardFeatureProvider by lazy {
ContextualCardFeatureProviderImpl(appContext)
}
@@ -113,8 +101,17 @@
override val localeFeatureProvider by lazy { LocaleFeatureProviderImpl() }
- override fun getEnterprisePrivacyFeatureProvider(context: Context) =
- enterprisePrivacyFeatureProvider
+ override val enterprisePrivacyFeatureProvider by lazy {
+ EnterprisePrivacyFeatureProviderImpl(
+ appContext,
+ appContext.devicePolicyManager,
+ appContext.packageManager,
+ UserManager.get(appContext),
+ appContext.getSystemService(ConnectivityManager::class.java),
+ appContext.getSystemService(VpnManager::class.java),
+ appContext.resources,
+ )
+ }
override val searchFeatureProvider: SearchFeatureProvider by lazy {
SearchFeatureProviderImpl()
diff --git a/src/com/android/settings/privacy/WorkPolicyInfoPreferenceController.java b/src/com/android/settings/privacy/WorkPolicyInfoPreferenceController.java
index 2d1d9e1..d7203cb 100644
--- a/src/com/android/settings/privacy/WorkPolicyInfoPreferenceController.java
+++ b/src/com/android/settings/privacy/WorkPolicyInfoPreferenceController.java
@@ -34,7 +34,7 @@
public WorkPolicyInfoPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mEnterpriseProvider =
- FeatureFactory.getFactory(context).getEnterprisePrivacyFeatureProvider(context);
+ FeatureFactory.getFeatureFactory().getEnterprisePrivacyFeatureProvider();
}
@Override
diff --git a/tests/robotests/src/com/android/settings/privacy/WorkPolicyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/privacy/WorkPolicyInfoPreferenceControllerTest.java
index a983228..b9c80b0 100644
--- a/tests/robotests/src/com/android/settings/privacy/WorkPolicyInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/privacy/WorkPolicyInfoPreferenceControllerTest.java
@@ -53,7 +53,7 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
- mEnterpriseProvider = mFakeFeatureFactory.getEnterprisePrivacyFeatureProvider(mContext);
+ mEnterpriseProvider = mFakeFeatureFactory.getEnterprisePrivacyFeatureProvider();
SafetyCenterManagerWrapper.sInstance = mock(SafetyCenterManagerWrapper.class);
}
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index b8fa0bc..0d7c0b1 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -193,8 +193,9 @@
return localeFeatureProvider;
}
+ @NotNull
@Override
- public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider(Context context) {
+ public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider() {
return enterprisePrivacyFeatureProvider;
}
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 7a17fe8..e5e4990 100644
--- a/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt
+++ b/tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt
@@ -88,11 +88,8 @@
override val localeFeatureProvider: LocaleFeatureProvider
get() = TODO("Not yet implemented")
- override fun getEnterprisePrivacyFeatureProvider(
- context: Context,
- ): EnterprisePrivacyFeatureProvider {
- TODO("Not yet implemented")
- }
+ override val enterprisePrivacyFeatureProvider: EnterprisePrivacyFeatureProvider
+ get() = TODO("Not yet implemented")
override val searchFeatureProvider: SearchFeatureProvider
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 c2c485d..90b4efe 100644
--- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -192,8 +192,9 @@
return localeFeatureProvider;
}
+ @NotNull
@Override
- public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider(Context context) {
+ public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider() {
return enterprisePrivacyFeatureProvider;
}