From 3e2d7f4581ffd8f72c16f871361c7bd0951aee20 Mon Sep 17 00:00:00 2001 From: Prabal Singh Date: Wed, 27 Apr 2022 22:32:36 +0100 Subject: [PATCH] Remove extra argument WorkPolicyUtil constructor Only constructor is required for WorkPolicyInfo constructor. The other dependencies can be derives Test: make ROBOTEST_FILTER=EnterprisePrivacyFeatureProviderImplTest RunSettingsRoboTests -j40 Change-Id: I7f35e5ed344d452190b333aad7fa823a010d17b3 --- .../enterprise/EnterprisePrivacyFeatureProviderImpl.java | 2 +- .../enterprise/EnterprisePrivacyFeatureProviderImplTest.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java index f3085bccbfb..b1ffcf145b4 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java @@ -69,7 +69,7 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe mCm = cm; mVm = vm; mResources = resources; - mWorkPolicyUtils = new WorkPolicyUtils(mContext, mPm, mUm, mDpm); + mWorkPolicyUtils = new WorkPolicyUtils(mContext); } @Override diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java index 0005e71628a..87a447d1fbb 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -105,6 +105,10 @@ public class EnterprisePrivacyFeatureProviderImplTest { when(mContext.getApplicationContext()).thenReturn(mContext); resetAndInitializePackageManager(); when(mUserManager.getProfiles(mUserId)).thenReturn(mProfiles); + when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)) + .thenReturn(mDevicePolicyManager); + when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); + when(mContext.getPackageManager()).thenReturn(mPackageManager); mProfiles.add(new UserInfo(mUserId, "", "", 0 /* flags */)); mResources = RuntimeEnvironment.application.getResources();