PawletOS/app_Settings
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: If067af7ced5017a9689cafbf99ceec1d26c06b3b
This commit is contained in:
Adam Bookatz
2021-10-01 00:15:32 -07:00
parent e959dc02ab
commit 30dafd4140
7 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
View File

@@ -194,7 +194,7 @@ public class DefaultAutofillPickerTest {
.thenReturn(Arrays.asList(mainUserHandle, managedUserHandle));
when(mUserManager.getUserInfo(MANAGED_PROFILE_UID))
.thenReturn(managedUserInfo);
when(mUserManager.getUserHandle()).thenReturn(MAIN_PROFILE_UID);
when(mUserManager.getProcessUserId()).thenReturn(MAIN_PROFILE_UID);
}
private void setupCaller() {

7
tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
View File

@@ -15,14 +15,11 @@
*/
package com.android.settings.location;
import static android.Manifest.permission.WRITE_SECURE_SETTINGS;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -31,11 +28,9 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.ActivityManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.UserInfo;
import android.location.LocationManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
@@ -207,7 +202,7 @@ public class LocationEnablerTest {
when(userHandle.getIdentifier()).thenReturn(5);
userProfiles.add(userHandle);
when(mUserManager.getUserProfiles()).thenReturn(userProfiles);
when(mUserManager.getUserHandle()).thenReturn(1);
when(mUserManager.getProcessUserId()).thenReturn(1);
when(mUserManager.getUserInfo(5))
.thenReturn(new UserInfo(5, "user 5", UserInfo.FLAG_MANAGED_PROFILE));
}

2
tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
View File

@@ -178,7 +178,7 @@ public class LocationForWorkPreferenceControllerTest {
when(mUserHandle.getIdentifier()).thenReturn(5);
userProfiles.add(mUserHandle);
when(mUserManager.getUserProfiles()).thenReturn(userProfiles);
when(mUserManager.getUserHandle()).thenReturn(1);
when(mUserManager.getProcessUserId()).thenReturn(1);
when(mUserManager.getUserInfo(5))
.thenReturn(new UserInfo(5, "user 5", UserInfo.FLAG_MANAGED_PROFILE));
}