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

src/com/android/settings/Settings.java

@@ -202,7 +202,7 @@ public class Settings extends SettingsActivity {
         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 @@ public class Settings extends SettingsActivity {
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            if (FeatureFactory.getFactory(this)
+            if (FeatureFactory.getFeatureFactory().getEnterprisePrivacyFeatureProvider()
-                    .getEnterprisePrivacyFeatureProvider(this)
                     .showParentalControls()) {
                 finish();
             } else if (!EnterprisePrivacySettings.isPageEnabled(this)) {

src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java

@@ -35,8 +35,8 @@ public class EnterpriseDisclosurePreferenceController extends BasePreferenceCont
     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)
+        mFeatureProvider = FeatureFactory.getFeatureFactory()
-                .getEnterprisePrivacyFeatureProvider(mContext);
+                .getEnterprisePrivacyFeatureProvider();
     }
 
     @Override

src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java

@@ -36,8 +36,8 @@ public abstract class AdminActionPreferenceControllerBase extends
 
     public AdminActionPreferenceControllerBase(Context context) {
         super(context);
-        mFeatureProvider = FeatureFactory.getFactory(context)
+        mFeatureProvider = FeatureFactory.getFeatureFactory()
-                .getEnterprisePrivacyFeatureProvider(context);
+                .getEnterprisePrivacyFeatureProvider();
     }
 
     protected abstract Date getAdminActionTimestamp();

src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java

@@ -35,8 +35,8 @@ public class AlwaysOnVpnCurrentUserPreferenceController
 
     public AlwaysOnVpnCurrentUserPreferenceController(Context context) {
         super(context);
-        mFeatureProvider = FeatureFactory.getFactory(context)
+        mFeatureProvider = FeatureFactory.getFeatureFactory()
-                .getEnterprisePrivacyFeatureProvider(context);
+                .getEnterprisePrivacyFeatureProvider();
         mDevicePolicyManager = context.getSystemService(DevicePolicyManager.class);
     }
 

src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java

@@ -27,8 +27,8 @@ public class AlwaysOnVpnManagedProfilePreferenceController
 
     public AlwaysOnVpnManagedProfilePreferenceController(Context context) {
         super(context);
-        mFeatureProvider = FeatureFactory.getFactory(context)
+        mFeatureProvider = FeatureFactory.getFeatureFactory()
-                .getEnterprisePrivacyFeatureProvider(context);
+                .getEnterprisePrivacyFeatureProvider();
     }
 
     @Override

src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java

@@ -31,8 +31,8 @@ public abstract class CaCertsPreferenceControllerBase
 
     public CaCertsPreferenceControllerBase(Context context) {
         super(context);
-        mFeatureProvider = FeatureFactory.getFactory(context)
+        mFeatureProvider = FeatureFactory.getFeatureFactory()
-                .getEnterprisePrivacyFeatureProvider(context);
+                .getEnterprisePrivacyFeatureProvider();
     }
 
     @Override

src/com/android/settings/enterprise/EnterprisePrivacySettings.java

@@ -168,8 +168,8 @@ public class EnterprisePrivacySettings extends DashboardFragment {
     }
 
     public static boolean isPageEnabled(Context context) {
-        return FeatureFactory.getFactory(context)
+        return FeatureFactory.getFeatureFactory()
-                .getEnterprisePrivacyFeatureProvider(context)
+                .getEnterprisePrivacyFeatureProvider()
                 .hasDeviceOwner();
     }
 

src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java

@@ -71,7 +71,7 @@ public class EnterpriseSetDefaultAppsListPreferenceController extends
         mParent = parent;
         final FeatureFactory factory = FeatureFactory.getFeatureFactory();
         mApplicationFeatureProvider = factory.getApplicationFeatureProvider();
-        mEnterprisePrivacyFeatureProvider = factory.getEnterprisePrivacyFeatureProvider(context);
+        mEnterprisePrivacyFeatureProvider = factory.getEnterprisePrivacyFeatureProvider();
         mUserFeatureProvider = factory.getUserFeatureProvider();
         buildAppList();
     }

src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java

@@ -31,8 +31,8 @@ public abstract class FailedPasswordWipePreferenceControllerBase
 
     public FailedPasswordWipePreferenceControllerBase(Context context) {
         super(context);
-        mFeatureProvider = FeatureFactory.getFactory(context)
+        mFeatureProvider = FeatureFactory.getFeatureFactory()
-                .getEnterprisePrivacyFeatureProvider(context);
+                .getEnterprisePrivacyFeatureProvider();
     }
 
     protected abstract int getMaximumFailedPasswordsBeforeWipe();

src/com/android/settings/enterprise/ImePreferenceController.java

@@ -34,8 +34,8 @@ public class ImePreferenceController extends AbstractPreferenceController implem
 
     public ImePreferenceController(Context context) {
         super(context);
-        mFeatureProvider = FeatureFactory.getFactory(context)
+        mFeatureProvider = FeatureFactory.getFeatureFactory()
-                .getEnterprisePrivacyFeatureProvider(context);
+                .getEnterprisePrivacyFeatureProvider();
     }
 
     @Override

src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java

@@ -31,8 +31,8 @@ public class ManageDeviceAdminPreferenceController extends BasePreferenceControl
 
     public ManageDeviceAdminPreferenceController(Context context, String key) {
         super(context, key);
-        mFeatureProvider = FeatureFactory.getFactory(context)
+        mFeatureProvider = FeatureFactory.getFeatureFactory()
-                .getEnterprisePrivacyFeatureProvider(context);
+                .getEnterprisePrivacyFeatureProvider();
         mDevicePolicyManager =
                 mContext.getSystemService(DevicePolicyManager.class);
     }

src/com/android/settings/enterprise/PrivacyPreferenceControllerHelper.java

@@ -39,8 +39,8 @@ class PrivacyPreferenceControllerHelper {
 
     PrivacyPreferenceControllerHelper(Context context) {
         mContext = Objects.requireNonNull(context);
-        mFeatureProvider = FeatureFactory.getFactory(context)
+        mFeatureProvider = FeatureFactory.getFeatureFactory()
-                .getEnterprisePrivacyFeatureProvider(context);
+                .getEnterprisePrivacyFeatureProvider();
         mDevicePolicyManager = context.getSystemService(DevicePolicyManager.class);
     }
 

src/com/android/settings/overlay/FeatureFactory.kt

@@ -86,9 +86,7 @@ abstract class FeatureFactory {
     abstract val applicationFeatureProvider: ApplicationFeatureProvider
     abstract val localeFeatureProvider: LocaleFeatureProvider
 
-    abstract fun getEnterprisePrivacyFeatureProvider(
+    abstract val enterprisePrivacyFeatureProvider: EnterprisePrivacyFeatureProvider
-        context: Context,
-    ): EnterprisePrivacyFeatureProvider
 
     abstract val searchFeatureProvider: SearchFeatureProvider
     abstract fun getSurveyFeatureProvider(context: Context): SurveyFeatureProvider?

src/com/android/settings/overlay/FeatureFactoryImpl.kt

@@ -67,18 +67,6 @@ import com.android.settingslib.spaprivileged.framework.common.devicePolicyManage
  * [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 @@ open class FeatureFactoryImpl : FeatureFactory() {
 
     override val localeFeatureProvider by lazy { LocaleFeatureProviderImpl() }
 
-    override fun getEnterprisePrivacyFeatureProvider(context: Context) =
+    override val enterprisePrivacyFeatureProvider by lazy {
-        enterprisePrivacyFeatureProvider
+        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()

src/com/android/settings/privacy/WorkPolicyInfoPreferenceController.java

@@ -34,7 +34,7 @@ public class WorkPolicyInfoPreferenceController extends BasePreferenceController
     public WorkPolicyInfoPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
         mEnterpriseProvider =
-                FeatureFactory.getFactory(context).getEnterprisePrivacyFeatureProvider(context);
+                FeatureFactory.getFeatureFactory().getEnterprisePrivacyFeatureProvider();
     }
 
     @Override

tests/robotests/src/com/android/settings/privacy/WorkPolicyInfoPreferenceControllerTest.java

@@ -53,7 +53,7 @@ public class WorkPolicyInfoPreferenceControllerTest {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
-        mEnterpriseProvider = mFakeFeatureFactory.getEnterprisePrivacyFeatureProvider(mContext);
+        mEnterpriseProvider = mFakeFeatureFactory.getEnterprisePrivacyFeatureProvider();
         SafetyCenterManagerWrapper.sInstance = mock(SafetyCenterManagerWrapper.class);
     }
 

tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java

@@ -193,8 +193,9 @@ public class FakeFeatureFactory extends FeatureFactory {
         return localeFeatureProvider;
     }
 
+    @NotNull
     @Override
-    public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider(Context context) {
+    public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider() {
         return enterprisePrivacyFeatureProvider;
     }
 

tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt

@@ -88,11 +88,8 @@ class FakeFeatureFactory : FeatureFactory() {
     override val localeFeatureProvider: LocaleFeatureProvider
         get() = TODO("Not yet implemented")
 
-    override fun getEnterprisePrivacyFeatureProvider(
+    override val enterprisePrivacyFeatureProvider: EnterprisePrivacyFeatureProvider
-        context: Context,
+        get() = TODO("Not yet implemented")
-    ): EnterprisePrivacyFeatureProvider {
-        TODO("Not yet implemented")
-    }
 
     override val searchFeatureProvider: SearchFeatureProvider
         get() = TODO("Not yet implemented")

tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java

@@ -192,8 +192,9 @@ public class FakeFeatureFactory extends FeatureFactory {
         return localeFeatureProvider;
     }
 
+    @NotNull
     @Override
-    public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider(Context context) {
+    public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider() {
         return enterprisePrivacyFeatureProvider;
     }