Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up FeatureFactory.getFeature()

Browse Source 
Bug: 286764889
Test: m Settings
Change-Id: I7e472e6b0ca6b7a735c1b92742ddf06c545176fc
This commit is contained in:
Chaohui Wang
2023-08-04 15:42:43 +08:00
parent 0062308347
commit 8e2ae547d6
220 changed files with 282 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/security/ChangeScreenLockPreferenceController.java
View File

@@ -56,12 +56,12 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont
public ChangeScreenLockPreferenceController(Context context, SettingsPreferenceFragment host) {
super(context);
mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
mLockPatternUtils = FeatureFactory.getFactory(context)
mLockPatternUtils = FeatureFactory.getFeatureFactory()
.getSecurityFeatureProvider()
.getLockPatternUtils(context);
mHost = host;
mProfileChallengeUserId = Utils.getManagedProfileId(mUm, mUserId);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
mScreenLockPreferenceDetailUtils = new ScreenLockPreferenceDetailsUtils(context);
}

2
src/com/android/settings/security/ConfirmSimDeletionPreferenceController.java
View File

@@ -48,7 +48,7 @@ public class ConfirmSimDeletionPreferenceController extends BasePreferenceContro
mConfirmationDefaultOn =
context.getResources()
.getBoolean(R.bool.config_sim_deletion_confirmation_default_on);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
mMetricsFeatureProvider = FeatureFactory.getFeatureFactory().getMetricsFeatureProvider();
mUserManager = context.getSystemService(UserManager.class);
mKeyguardManager = mContext.getSystemService(KeyguardManager.class);

2
src/com/android/settings/security/LockUnificationPreferenceController.java
View File

@@ -97,7 +97,7 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
mHost = host;
mUm = context.getSystemService(UserManager.class);
mDpm = context.getSystemService(DevicePolicyManager.class);
mLockPatternUtils = FeatureFactory.getFactory(context)
mLockPatternUtils = FeatureFactory.getFeatureFactory()
.getSecurityFeatureProvider()
.getLockPatternUtils(context);
mProfileUserId = Utils.getManagedProfileId(mUm, MY_USER_ID);

2
src/com/android/settings/security/ScreenLockPreferenceDetailsUtils.java
View File

@@ -50,7 +50,7 @@ public class ScreenLockPreferenceDetailsUtils {
public ScreenLockPreferenceDetailsUtils(Context context) {
mContext = context;
mUm = context.getSystemService(UserManager.class);
mLockPatternUtils = FeatureFactory.getFactory(context)
mLockPatternUtils = FeatureFactory.getFeatureFactory()
.getSecurityFeatureProvider()
.getLockPatternUtils(context);
mProfileChallengeUserId = Utils.getManagedProfileId(mUm, mUserId);

2
src/com/android/settings/security/SecurityAdvancedSettings.java
View File

@@ -70,7 +70,7 @@ public class SecurityAdvancedSettings extends DashboardFragment {
return CategoryKey.CATEGORY_SECURITY_ADVANCED_SETTINGS;
} else {
final SecuritySettingsFeatureProvider securitySettingsFeatureProvider =
FeatureFactory.getFactory(context).getSecuritySettingsFeatureProvider();
FeatureFactory.getFeatureFactory().getSecuritySettingsFeatureProvider();
if (securitySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()) {
return securitySettingsFeatureProvider.getAlternativeAdvancedSettingsCategoryKey();

2
src/com/android/settings/security/SecuritySettings.java
View File

@@ -127,7 +127,7 @@ public class SecuritySettings extends DashboardFragment {
@Override
protected boolean isPageSearchEnabled(Context context) {
return !FeatureFactory.getFactory(context).getSecuritySettingsFeatureProvider()
return !FeatureFactory.getFeatureFactory().getSecuritySettingsFeatureProvider()
.hasAlternativeSecuritySettingsFragment()
&& !SafetyCenterManagerWrapper.get().isEnabled(context);
}

2
src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
View File

@@ -32,7 +32,7 @@ public class TopLevelSecurityEntryPreferenceController extends BasePreferenceCon
public TopLevelSecurityEntryPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mSecuritySettingsFeatureProvider = FeatureFactory.getFactory(mContext)
mSecuritySettingsFeatureProvider = FeatureFactory.getFeatureFactory()
.getSecuritySettingsFeatureProvider();
}

2
src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
View File

@@ -66,7 +66,7 @@ public class VisiblePatternProfilePreferenceController extends TogglePreferenceC
Context context, Lifecycle lifecycle, String key) {
super(context, key);
mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
mLockPatternUtils = FeatureFactory.getFactory(context)
mLockPatternUtils = FeatureFactory.getFeatureFactory()
.getSecurityFeatureProvider()
.getLockPatternUtils(context);
mProfileChallengeUserId = Utils.getManagedProfileId(mUm, mUserId);

2
src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
View File

@@ -54,7 +54,7 @@ public class LockAfterTimeoutPreferenceController extends AbstractPreferenceCont
mUserId = userId;
mLockPatternUtils = lockPatternUtils;
mDPM = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
mTrustAgentManager = FeatureFactory.getFactory(context)
mTrustAgentManager = FeatureFactory.getFeatureFactory()
.getSecurityFeatureProvider().getTrustAgentManager();
}

2
src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
View File

@@ -44,7 +44,7 @@ public class PowerButtonInstantLockPreferenceController extends AbstractPreferen
super(context);
mUserId = userId;
mLockPatternUtils = lockPatternUtils;
mTrustAgentManager = FeatureFactory.getFactory(context)
mTrustAgentManager = FeatureFactory.getFeatureFactory()
.getSecurityFeatureProvider().getTrustAgentManager();
}

2
src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
View File

@@ -37,7 +37,7 @@ public class ManageTrustAgentsPreferenceController extends BasePreferenceControl
public ManageTrustAgentsPreferenceController(Context context, String key) {
super(context, key);
final SecurityFeatureProvider securityFeatureProvider = FeatureFactory.getFactory(context)
final SecurityFeatureProvider securityFeatureProvider = FeatureFactory.getFeatureFactory()
.getSecurityFeatureProvider();
mLockPatternUtils = securityFeatureProvider.getLockPatternUtils(context);
mTrustAgentManager = securityFeatureProvider.getTrustAgentManager();

2
src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
View File

@@ -74,7 +74,7 @@ public class TrustAgentListPreferenceController extends AbstractPreferenceContro
public TrustAgentListPreferenceController(Context context, SettingsPreferenceFragment host,
Lifecycle lifecycle) {
super(context);
final SecurityFeatureProvider provider = FeatureFactory.getFactory(context)
final SecurityFeatureProvider provider = FeatureFactory.getFeatureFactory()
.getSecurityFeatureProvider();
mHost = host;
mLockPatternUtils = provider.getLockPatternUtils(context);

2
src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java
View File

@@ -70,7 +70,7 @@ public class TrustAgentsPreferenceController extends BasePreferenceController
mDevicePolicyManager = context.getSystemService(DevicePolicyManager.class);
mIconDrawableFactory = IconDrawableFactory.newInstance(context);
final SecurityFeatureProvider securityFeatureProvider =
FeatureFactory.getFactory(context).getSecurityFeatureProvider();
FeatureFactory.getFeatureFactory().getSecurityFeatureProvider();
mTrustAgentManager = securityFeatureProvider.getTrustAgentManager();
mLockPatternUtils = securityFeatureProvider.getLockPatternUtils(context);
mPackageManager = context.getPackageManager();