diff options
author | Adam Bookatz <bookatz@google.com> | 2021-10-01 00:15:09 -0700 |
---|---|---|
committer | Adam Bookatz <bookatz@google.com> | 2021-10-05 12:52:51 -0700 |
commit | 1f49e951e58befb449ffd70bbfae56b0838cbb83 (patch) | |
tree | faf4b9848199a72c1864226446d3a0dde29c18de /tests/src/com/android | |
parent | d88cfd6719a6740b61d4e1965d1dba1ae34f3be3 (diff) | |
download | ContactsProvider-1f49e951e58befb449ffd70bbfae56b0838cbb83.tar.gz |
UM.getUserHandle -> UM.getProcessUserId
UM is being made @UserHandleAware, so using an explicit method avoids ambiguity.
Bug: 201679968
Test: (No-op) compiles and treehugger
Change-Id: I5ea64c4e408509af533488ee071d0f490ee8cd96
Diffstat (limited to 'tests/src/com/android')
-rw-r--r-- | tests/src/com/android/providers/contacts/ContactsActor.java | 4 | ||||
-rw-r--r-- | tests/src/com/android/providers/contacts/enterprise/EnterprisePolicyGuardTest.java | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/src/com/android/providers/contacts/ContactsActor.java b/tests/src/com/android/providers/contacts/ContactsActor.java index 56a4fc4b..e3c606e2 100644 --- a/tests/src/com/android/providers/contacts/ContactsActor.java +++ b/tests/src/com/android/providers/contacts/ContactsActor.java @@ -191,7 +191,7 @@ public class ContactsActor { } @Override - public int getUserHandle() { + public int getProcessUserId() { return myUser; } @@ -404,7 +404,7 @@ public class ContactsActor { @Override public int getUserId() { if (mockUserManager != null) { - return mockUserManager.getUserHandle(); + return mockUserManager.getProcessUserId(); } else { return DEFAULT_USER_ID; } diff --git a/tests/src/com/android/providers/contacts/enterprise/EnterprisePolicyGuardTest.java b/tests/src/com/android/providers/contacts/enterprise/EnterprisePolicyGuardTest.java index c0684594..2e5241fb 100644 --- a/tests/src/com/android/providers/contacts/enterprise/EnterprisePolicyGuardTest.java +++ b/tests/src/com/android/providers/contacts/enterprise/EnterprisePolicyGuardTest.java @@ -16,7 +16,6 @@ package com.android.providers.contacts.enterprise; import android.app.admin.DevicePolicyManager; -import android.content.ContentResolver; import android.content.Context; import android.content.pm.UserInfo; import android.net.Uri; @@ -265,7 +264,7 @@ public class EnterprisePolicyGuardTest extends FixedAndroidTestCase { List<UserInfo> userInfos = MANAGED_USERINFO_LIST; UserManager mockUm = mock(UserManager.class); - when(mockUm.getUserHandle()).thenReturn(CURRENT_USER_ID); + when(mockUm.getProcessUserId()).thenReturn(CURRENT_USER_ID); when(mockUm.getUsers()).thenReturn(userInfos); when(mockUm.getProfiles(Matchers.anyInt())).thenReturn(userInfos); when(mockUm.getProfileParent(WORK_USER_ID)).thenReturn(CURRENT_USER_INFO); |