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

Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38 am: 9fa00378f7

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

Change-Id: I8f065a47384084cee16321c2ebe9ab61aa4eaa30
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Prabal Singh
2022-04-25 08:13:05 +00:00
committed by Automerger Merge Worker
parent 74c1725d99 9fa00378f7
commit 60615cbf3b
2 changed files with 21 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
View File

@@ -377,10 +377,22 @@ public class EnterprisePrivacyFeatureProviderImplTest {
}
@Test
public void workPolicyInfo_profileOwner_shouldResolveIntent() {
public void workPolicyInfo_profileOwner_shouldResolveIntent()
throws PackageManager.NameNotFoundException {
when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
when(mDevicePolicyManager.getProfileOwnerAsUser(mManagedProfileUserId)).thenReturn(mOwner);
List<UserHandle> mAllProfiles = new ArrayList<>();
mAllProfiles.add(new UserHandle(mManagedProfileUserId));
when(mUserManager.getAllProfiles()).thenReturn(mAllProfiles);
when(mUserManager.isManagedProfile(mManagedProfileUserId)).thenReturn(true);
when(mContext.getPackageName()).thenReturn("somePackageName");
when(mContext.createPackageContextAsUser(
eq(mContext.getPackageName()),
anyInt(),
any(UserHandle.class))
).thenReturn(mContext);
when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
.thenReturn(mDevicePolicyManager);
when(mDevicePolicyManager.getProfileOwner()).thenReturn(mOwner);
// If the intent is not resolved, then there's no info to show for PO
assertThat(mProvider.hasWorkPolicyInfo()).isFalse();
@@ -441,7 +453,7 @@ public class EnterprisePrivacyFeatureProviderImplTest {
}
if (profileOwner) {
when(mPackageManager.queryIntentActivitiesAsUser(
intentEquals(intent), anyInt(), eq(mManagedProfileUserId)))
intentEquals(intent), anyInt(), eq(UserHandle.of(mManagedProfileUserId))))
.thenReturn(activities);
}