Merge "Replace PackageManagerWrapper with PackageManager"

This commit is contained in:
TreeHugger Robot
2018-04-26 02:40:34 +00:00
committed by Android (Google) Code Review
68 changed files with 181 additions and 276 deletions

View File

@@ -53,7 +53,6 @@ import com.android.settings.slices.SlicesFeatureProviderImpl;
import com.android.settings.users.UserFeatureProvider;
import com.android.settings.users.UserFeatureProviderImpl;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.wrapper.PackageManagerWrapper;
/**
* {@link FeatureFactory} implementation for AOSP Settings.
@@ -119,7 +118,7 @@ public class FeatureFactoryImpl extends FeatureFactory {
public ApplicationFeatureProvider getApplicationFeatureProvider(Context context) {
if (mApplicationFeatureProvider == null) {
mApplicationFeatureProvider = new ApplicationFeatureProviderImpl(context,
new PackageManagerWrapper(context.getPackageManager()),
context.getPackageManager(),
AppGlobals.getPackageManager(),
(DevicePolicyManager) context
.getSystemService(Context.DEVICE_POLICY_SERVICE));
@@ -140,7 +139,7 @@ public class FeatureFactoryImpl extends FeatureFactory {
if (mEnterprisePrivacyFeatureProvider == null) {
mEnterprisePrivacyFeatureProvider = new EnterprisePrivacyFeatureProviderImpl(context,
(DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE),
new PackageManagerWrapper(context.getPackageManager()),
context.getPackageManager(),
UserManager.get(context),
(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE),
context.getResources());