From b6feae52620301876628d0a9a9049a92660e66e2 Mon Sep 17 00:00:00 2001 From: Salud Lemus Date: Wed, 22 Jun 2022 12:04:35 -0700 Subject: [PATCH] Change expected userId for mock for emulation The userId changes when emulation is on where the userId becomes 10 instead of 0. Bug: 236727647 Test: atest com.android.server.devicepolicy.DevicePolicyManagerTest#testIsUninstallBlocked_financeDo_success Change-Id: I48752308cdcab9523939f979904ffa9b2493aa1c --- .../android/server/devicepolicy/DevicePolicyManagerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index 8014d2502f48a..85c789c78d4b0 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -7846,7 +7846,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { setDeviceOwner(); dpm.setDeviceOwnerType(admin1, DEVICE_OWNER_TYPE_FINANCED); when(getServices().ipackageManager.getBlockUninstallForUser( - eq(packageName), eq(UserHandle.USER_SYSTEM))) + eq(packageName), eq(UserHandle.getCallingUserId()))) .thenReturn(true); assertThat(dpm.isUninstallBlocked(admin1, packageName)).isTrue();