Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4000b90f authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Remove context from enterprisePrivacyFeatureProvider" into main

parents 636f2888 3cdf5b9b

src/com/android/settings/Settings.java

+2 −3
Original line number Diff line number Diff line
@@ -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)

                    .getEnterprisePrivacyFeatureProvider(this)

            if (FeatureFactory.getFeatureFactory().getEnterprisePrivacyFeatureProvider()

                    .showParentalControls()) {

                finish();

            } else if (!EnterprisePrivacySettings.isPageEnabled(this)) {

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

+2 −2
Original line number Diff line number Diff line
@@ -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)

                .getEnterprisePrivacyFeatureProvider(mContext);

        mFeatureProvider = FeatureFactory.getFeatureFactory()

                .getEnterprisePrivacyFeatureProvider();

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ public abstract class AdminActionPreferenceControllerBase extends 


    public AdminActionPreferenceControllerBase(Context context) {

        super(context);

        mFeatureProvider = FeatureFactory.getFactory(context)

                .getEnterprisePrivacyFeatureProvider(context);

        mFeatureProvider = FeatureFactory.getFeatureFactory()

                .getEnterprisePrivacyFeatureProvider();

    }



    protected abstract Date getAdminActionTimestamp();

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

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ public class AlwaysOnVpnCurrentUserPreferenceController 


    public AlwaysOnVpnCurrentUserPreferenceController(Context context) {

        super(context);

        mFeatureProvider = FeatureFactory.getFactory(context)

                .getEnterprisePrivacyFeatureProvider(context);

        mFeatureProvider = FeatureFactory.getFeatureFactory()

                .getEnterprisePrivacyFeatureProvider();

        mDevicePolicyManager = context.getSystemService(DevicePolicyManager.class);

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ public class AlwaysOnVpnManagedProfilePreferenceController 


    public AlwaysOnVpnManagedProfilePreferenceController(Context context) {

        super(context);

        mFeatureProvider = FeatureFactory.getFactory(context)

                .getEnterprisePrivacyFeatureProvider(context);

        mFeatureProvider = FeatureFactory.getFeatureFactory()

                .getEnterprisePrivacyFeatureProvider();

    }



    @Override