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: I5b90f1cd644d40e3dfe57795ec2315d330fcaa0e

7 files changed, 7 insertions, 7 deletions

diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java
index 51f19ebee987..8553c24ce368 100644
--- a/core/java/android/provider/CallLog.java
+++ b/core/java/android/provider/CallLog.java
@@ -1742,7 +1742,7 @@ public class CallLog {
             Uri result = null;
 
             final UserManager userManager = context.getSystemService(UserManager.class);
-            final int currentUserId = userManager.getUserHandle();
+            final int currentUserId = userManager.getProcessUserId();
 
             if (params.mAddForAllUsers) {
                 if (userManager.isUserUnlocked(UserHandle.SYSTEM)) {
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
index 8e5c5c52cb3f..2e918f63eddd 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
@@ -295,7 +295,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb
             ShellExecutor mainExecutor
     ) {
         // Ensure that we are the primary user's SystemUI.
-        final int processUser = UserManager.get(context).getUserHandle();
+        final int processUser = UserManager.get(context).getProcessUserId();
         if (processUser != UserHandle.USER_SYSTEM) {
             throw new IllegalStateException("Non-primary Pip component not currently supported.");
         }
diff --git a/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java b/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java
index f9d3aaf6b383..ba63a8e8b195 100644
--- a/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java
+++ b/packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java
@@ -102,7 +102,7 @@ public abstract class ActionDisabledLearnMoreButtonLauncher {
     protected boolean isSameProfileGroup(Context context, int enforcementAdminUserId) {
         UserManager um = context.getSystemService(UserManager.class);
 
-        return um.isSameProfileGroup(enforcementAdminUserId, um.getUserHandle());
+        return um.isSameProfileGroup(enforcementAdminUserId, um.getProcessUserId());
     }
 
     private boolean isEnforcedByDeviceOwnerOnSystemUserMode(
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncherTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncherTest.java
index c2063c65d9c8..47556daba139 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncherTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncherTest.java
@@ -80,7 +80,7 @@ public final class ActionDisabledLearnMoreButtonLauncherTest {
     @Before
     public void setUp() {
         when(mContext.getUserId()).thenReturn(CONTEXT_USER_ID);
-        when(mUserManager.getUserHandle()).thenReturn(CONTEXT_USER_ID);
+        when(mUserManager.getProcessUserId()).thenReturn(CONTEXT_USER_ID);
         when(mContext.getSystemService(DevicePolicyManager.class)).thenReturn(mDevicePolicyManager);
         when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
     }
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java b/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java
index b5219fda1cc8..d09ba298c593 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java
@@ -91,7 +91,7 @@ class TaskSnapshotPersisterTestBase extends WindowTestsBase {
     @Before
     public void setUp() {
         final UserManager um = UserManager.get(getInstrumentation().getTargetContext());
-        mTestUserId = um.getUserHandle();
+        mTestUserId = um.getProcessUserId();
 
         final UserManagerInternal userManagerInternal =
                 LocalServices.getService(UserManagerInternal.class);
diff --git a/telecomm/java/android/telecom/CallerInfoAsyncQuery.java b/telecomm/java/android/telecom/CallerInfoAsyncQuery.java
index bf49f3c7b9bf..93cd291aeea0 100644
--- a/telecomm/java/android/telecom/CallerInfoAsyncQuery.java
+++ b/telecomm/java/android/telecom/CallerInfoAsyncQuery.java
@@ -112,7 +112,7 @@ public class CallerInfoAsyncQuery {
         if (DBG) Log.d(LOG_TAG, "Trying to get current content resolver...");
 
         final int currentUser = ActivityManager.getCurrentUser();
-        final int myUser = UserManager.get(context).getUserHandle();
+        final int myUser = UserManager.get(context).getProcessUserId();
 
         if (DBG) Log.d(LOG_TAG, "myUser=" + myUser + "currentUser=" + currentUser);
 
diff --git a/tests/VoiceEnrollment/src/com/android/test/voiceenrollment/TestEnrollmentActivity.java b/tests/VoiceEnrollment/src/com/android/test/voiceenrollment/TestEnrollmentActivity.java
index e4880fd10d67..1341c85feec3 100644
--- a/tests/VoiceEnrollment/src/com/android/test/voiceenrollment/TestEnrollmentActivity.java
+++ b/tests/VoiceEnrollment/src/com/android/test/voiceenrollment/TestEnrollmentActivity.java
@@ -62,7 +62,7 @@ public class TestEnrollmentActivity extends Activity {
     public void onEnrollButtonClicked(View v) {
         Keyphrase kp = new Keyphrase(KEYPHRASE_ID, RECOGNITION_MODES,
                 Locale.forLanguageTag(BCP47_LOCALE), TEXT,
-                new int[] { UserManager.get(this).getUserHandle() /* current user */});
+                new int[] { UserManager.get(this).getProcessUserId() /* current user */});
         UUID modelUuid = UUID.randomUUID();
         // Generate a fake model to push.
         byte[] data = new byte[1024];