Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UM.getUserHandle -> UM.getProcessUserId

Browse Source 
UM is being made @UserHandleAware, so using an explicit method avoids ambiguity.

Bug: 201679968

Test: (No-op) compiles and treehugger
Change-Id: I5b90f1cd644d40e3dfe57795ec2315d330fcaa0e
This commit is contained in:
Adam Bookatz
2021-10-01 00:20:00 -07:00
parent 131d918075
commit 010d64fa5b
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/provider/CallLog.java
View File

@@ -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)) {

2
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipController.java
View File

@@ -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.");
}

2
packages/SettingsLib/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncher.java
View File

@@ -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(

2
packages/SettingsLib/tests/robotests/src/com/android/settingslib/enterprise/ActionDisabledLearnMoreButtonLauncherTest.java
View File

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

2
services/tests/wmtests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java
View File

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

2
telecomm/java/android/telecom/CallerInfoAsyncQuery.java
View File

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

2
tests/VoiceEnrollment/src/com/android/test/voiceenrollment/TestEnrollmentActivity.java
View File

@@ -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];