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

Merge "Use getUserHandles() instead of getUsers() to get user id"

Browse Source
This commit is contained in:
Lucas Lin
2020-12-11 02:02:37 +00:00
committed by Gerrit Code Review
parent 39b703a229 c0c8e0352e
commit 618b9e5609
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PackageManagerInternal; import android.content.pm.PackageManagerInternal;
import android.content.pm.UserInfo;
import android.net.INetd; import android.net.INetd;
import android.net.UidRange; import android.net.UidRange;
import android.os.Build; import android.os.Build;
@@ -174,11 +173,9 @@ public class PermissionMonitor implements PackageManagerInternal.PackageListObse
netdPermsUids.put(uid, netdPermsUids.get(uid) | otherNetdPerms); netdPermsUids.put(uid, netdPermsUids.get(uid) | otherNetdPerms);
} }
List<UserInfo> users = mUserManager.getAliveUsers(); final List<UserHandle> users = mUserManager.getUserHandles(true /* excludeDying */);
if (users != null) { for (UserHandle user : users) {
for (UserInfo user : users) { mUsers.add(user.getIdentifier());
mUsers.add(user.id);
}
} }
final SparseArray<ArraySet<String>> systemPermission = final SparseArray<ArraySet<String>> systemPermission =

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

@@ -58,7 +58,6 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManagerInternal; import android.content.pm.PackageManagerInternal;
import android.content.pm.UserInfo;
import android.net.INetd; import android.net.INetd;
import android.net.UidRange; import android.net.UidRange;
import android.os.Build; import android.os.Build;
@@ -123,10 +122,10 @@ 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.getAliveUsers()).thenReturn( when(mUserManager.getUserHandles(eq(true))).thenReturn(
Arrays.asList(new UserInfo[] { Arrays.asList(new UserHandle[] {
new UserInfo(MOCK_USER1, "", 0), new UserHandle(MOCK_USER1),
new UserInfo(MOCK_USER2, "", 0), new UserHandle(MOCK_USER2),
})); }));
mPermissionMonitor = spy(new PermissionMonitor(mContext, mNetdService, mDeps)); mPermissionMonitor = spy(new PermissionMonitor(mContext, mNetdService, mDeps));