Merge "UM.getUserHandle -> UM.getProcessUserId"

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);