PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove context from enterprisePrivacyFeatureProvider

Browse Source 
EnterprisePrivacyFeatureProvider is created by using application
context, no need pass context in when get.

Bug: 286764889
Test: m Settings
Change-Id: I346f2b0ccbb0590f26954603ab630132cd8be63f
This commit is contained in:
Chaohui Wang
2023-07-17 12:03:05 +08:00
parent b042f81e34
commit 3cdf5b9be9
19 changed files with 43 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/Settings.java
View File

@@ -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)) {

4
src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
View File

@@ -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

4
src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
View File

@@ -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();

4
src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
View File

@@ -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);
}

4
src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
View File

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

4
src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
View File

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

4
src/com/android/settings/enterprise/EnterprisePrivacySettings.java
View File

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

2
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
View File

@@ -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();
}

4
src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
View File

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

4
src/com/android/settings/enterprise/ImePreferenceController.java
View File

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

4
src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java
View File

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

4
src/com/android/settings/enterprise/PrivacyPreferenceControllerHelper.java
View File

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

4
src/com/android/settings/overlay/FeatureFactory.kt
View File

@@ -86,9 +86,7 @@ abstract class FeatureFactory {
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?

25
src/com/android/settings/overlay/FeatureFactoryImpl.kt
View File

@@ -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) =
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()

2
src/com/android/settings/privacy/WorkPolicyInfoPreferenceController.java
View File

@@ -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

2
tests/robotests/src/com/android/settings/privacy/WorkPolicyInfoPreferenceControllerTest.java
View File

@@ -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);
}

3
tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

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

7
tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt
View File

@@ -88,11 +88,8 @@ class FakeFeatureFactory : FeatureFactory() {
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")

3
tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

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