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

Commit 7642301f authored by Prabal Singh's avatar Prabal Singh Committed by Automerger Merge Worker
Browse files

Merge "Remove extra argument WorkPolicyUtil constructor" into tm-dev am: 9a8f4422 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17981601



Change-Id: I0e90fc35f7916ae920ce08a2da996d69e01cf80f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9be4c5a 9a8f4422

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

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

tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java

+4 −0
Original line number Diff line number Diff line
@@ -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();