LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Deprecated UserManager.getUsers(excludeDying) / added getAliveUsers()" am: c0b44fca8b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406256

Change-Id: I6d0d919ddad282d526c2412efdd92e368149ab87
This commit is contained in:
Treehugger Robot
2020-12-01 17:32:56 +00:00
committed by Automerger Merge Worker
parent 2946cfe8d4 11cf60b2c5
commit 3da59ba9e3
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/connectivity/PermissionMonitor.java
View File

@@ -174,7 +174,7 @@ public class PermissionMonitor implements PackageManagerInternal.PackageListObse
netdPermsUids.put(uid, netdPermsUids.get(uid) | otherNetdPerms); netdPermsUids.put(uid, netdPermsUids.get(uid) | otherNetdPerms);
} }
List<UserInfo> users = mUserManager.getUsers(true); // exclude dying users List<UserInfo> users = mUserManager.getAliveUsers();
if (users != null) { if (users != null) {
for (UserInfo user : users) { for (UserInfo user : users) {
mUsers.add(user.id); mUsers.add(user.id);

2
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -1233,7 +1233,7 @@ public class ConnectivityServiceTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
when(mMetricsService.defaultNetworkMetrics()).thenReturn(mDefaultNetworkMetrics); when(mMetricsService.defaultNetworkMetrics()).thenReturn(mDefaultNetworkMetrics);
when(mUserManager.getUsers(eq(true))).thenReturn( when(mUserManager.getAliveUsers()).thenReturn(
Arrays.asList(new UserInfo[] { Arrays.asList(new UserInfo[] {
new UserInfo(VPN_USER, "", 0), new UserInfo(VPN_USER, "", 0),
})); }));

2
tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java
View File

@@ -123,7 +123,7 @@ public class PermissionMonitorTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
when(mContext.getPackageManager()).thenReturn(mPackageManager); when(mContext.getPackageManager()).thenReturn(mPackageManager);
when(mContext.getSystemService(eq(Context.USER_SERVICE))).thenReturn(mUserManager); when(mContext.getSystemService(eq(Context.USER_SERVICE))).thenReturn(mUserManager);
when(mUserManager.getUsers(eq(true))).thenReturn( when(mUserManager.getAliveUsers()).thenReturn(
Arrays.asList(new UserInfo[] { Arrays.asList(new UserInfo[] {
new UserInfo(MOCK_USER1, "", 0), new UserInfo(MOCK_USER1, "", 0),
new UserInfo(MOCK_USER2, "", 0), new UserInfo(MOCK_USER2, "", 0),

5
tests/net/java/com/android/server/connectivity/VpnTest.java
View File

@@ -1325,15 +1325,14 @@ public class VpnTest {
* @see UserManagerService#getUsers(boolean) * @see UserManagerService#getUsers(boolean)
*/ */
doAnswer(invocation -> { doAnswer(invocation -> {
final boolean excludeDying = (boolean) invocation.getArguments()[0];
final ArrayList<UserInfo> result = new ArrayList<>(users.length); final ArrayList<UserInfo> result = new ArrayList<>(users.length);
for (UserInfo ui : users) { for (UserInfo ui : users) {
if (!excludeDying || (ui.isEnabled() && !ui.partial)) { if (ui.isEnabled() && !ui.partial) {
result.add(ui); result.add(ui);
} }
} }
return result; return result;
}).when(mUserManager).getUsers(anyBoolean()); }).when(mUserManager).getAliveUsers();
doAnswer(invocation -> { doAnswer(invocation -> {
final int id = (int) invocation.getArguments()[0]; final int id = (int) invocation.getArguments()[0];