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

Merge "Make getUid a method on UserHandle itself instead of static"

Browse Source
This commit is contained in:
Chiachang Wang
2021-04-13 08:15:47 +00:00
committed by Gerrit Code Review
parent 045961b828 97565cfdb3
commit 4bc8b1386f
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/android/net/UidRange.java
View File

@@ -46,8 +46,8 @@ public final class UidRange implements Parcelable {
/** Creates a UidRange for the specified user. */ /** Creates a UidRange for the specified user. */
public static UidRange createForUser(UserHandle user) { public static UidRange createForUser(UserHandle user) {
final UserHandle nextUser = UserHandle.of(user.getIdentifier() + 1); final UserHandle nextUser = UserHandle.of(user.getIdentifier() + 1);
final int start = UserHandle.getUid(user, 0 /* appId */); final int start = user.getUid(0 /* appId */);
final int end = UserHandle.getUid(nextUser, 0) - 1; final int end = nextUser.getUid(0 /* appId */) - 1;
return new UidRange(start, end); return new UidRange(start, end);
} }

2
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -9804,7 +9804,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
for (final UserHandle ui : users) { for (final UserHandle ui : users) {
// Add the rules for all users as this policy is device wide. // Add the rules for all users as this policy is device wide.
uids.get(pref).add(UserHandle.getUid(ui, uid)); uids.get(pref).add(ui.getUid(uid));
} }
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
// Although this may seem like an error scenario, it is ok that uninstalled // Although this may seem like an error scenario, it is ok that uninstalled

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

@@ -286,7 +286,7 @@ public class PermissionMonitor {
for (UserHandle user : users) { for (UserHandle user : users) {
if (user == null) continue; if (user == null) continue;
list.add(UserHandle.getUid(user, app.getKey())); list.add(user.getUid(app.getKey()));
} }
} }
try { try {
@@ -555,7 +555,7 @@ public class PermissionMonitor {
final UserHandle handle = UserHandle.of(userId); final UserHandle handle = UserHandle.of(userId);
if (handle == null) continue; if (handle == null) continue;
final int uid = UserHandle.getUid(handle, appId); final int uid = handle.getUid(appId);
if (range.contains(uid)) { if (range.contains(uid)) {
result.add(uid); result.add(uid);
} }

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

@@ -197,7 +197,7 @@ public class PermissionMonitorTest {
} else { } else {
pkgInfo = packageInfoWithPermissions(REQUESTED_PERMISSION_GRANTED, new String[] {}, ""); pkgInfo = packageInfoWithPermissions(REQUESTED_PERMISSION_GRANTED, new String[] {}, "");
} }
pkgInfo.applicationInfo.uid = UserHandle.getUid(user, UserHandle.getAppId(uid)); pkgInfo.applicationInfo.uid = user.getUid(UserHandle.getAppId(uid));
return pkgInfo; return pkgInfo;
} }
@@ -390,7 +390,7 @@ public class PermissionMonitorTest {
public void expectPermission(Boolean permission, UserHandle[] users, int[] apps) { public void expectPermission(Boolean permission, UserHandle[] users, int[] apps) {
for (final UserHandle user : users) { for (final UserHandle user : users) {
for (final int app : apps) { for (final int app : apps) {
final int uid = UserHandle.getUid(user, app); final int uid = user.getUid(app);
if (!mApps.containsKey(uid)) { if (!mApps.containsKey(uid)) {
fail("uid " + uid + " does not exist."); fail("uid " + uid + " does not exist.");
} }
@@ -404,7 +404,7 @@ public class PermissionMonitorTest {
public void expectNoPermission(UserHandle[] users, int[] apps) { public void expectNoPermission(UserHandle[] users, int[] apps) {
for (final UserHandle user : users) { for (final UserHandle user : users) {
for (final int app : apps) { for (final int app : apps) {
final int uid = UserHandle.getUid(user, app); final int uid = user.getUid(app);
if (mApps.containsKey(uid)) { if (mApps.containsKey(uid)) {
fail("uid " + uid + " has listed permissions, expected none."); fail("uid " + uid + " has listed permissions, expected none.");
} }
@@ -502,9 +502,9 @@ public class PermissionMonitorTest {
// When MOCK_UID1 package is uninstalled and reinstalled, expect Netd to be updated // When MOCK_UID1 package is uninstalled and reinstalled, expect Netd to be updated
mPermissionMonitor.onPackageRemoved( mPermissionMonitor.onPackageRemoved(
MOCK_PACKAGE1, UserHandle.getUid(MOCK_USER1, MOCK_UID1)); MOCK_PACKAGE1, MOCK_USER1.getUid(MOCK_UID1));
verify(mNetdService).firewallRemoveUidInterfaceRules(aryEq(new int[] {MOCK_UID1})); verify(mNetdService).firewallRemoveUidInterfaceRules(aryEq(new int[] {MOCK_UID1}));
mPermissionMonitor.onPackageAdded(MOCK_PACKAGE1, UserHandle.getUid(MOCK_USER1, MOCK_UID1)); mPermissionMonitor.onPackageAdded(MOCK_PACKAGE1, MOCK_USER1.getUid(MOCK_UID1));
verify(mNetdService).firewallAddUidInterfaceRules(eq("tun0"), verify(mNetdService).firewallAddUidInterfaceRules(eq("tun0"),
aryEq(new int[] {MOCK_UID1})); aryEq(new int[] {MOCK_UID1}));
@@ -541,13 +541,13 @@ public class PermissionMonitorTest {
mPermissionMonitor.onVpnUidRangesAdded("tun0", vpnRange, VPN_UID); mPermissionMonitor.onVpnUidRangesAdded("tun0", vpnRange, VPN_UID);
// Newly-installed package should have uid rules added // Newly-installed package should have uid rules added
mPermissionMonitor.onPackageAdded(MOCK_PACKAGE1, UserHandle.getUid(MOCK_USER1, MOCK_UID1)); mPermissionMonitor.onPackageAdded(MOCK_PACKAGE1, MOCK_USER1.getUid(MOCK_UID1));
verify(mNetdService).firewallAddUidInterfaceRules(eq("tun0"), verify(mNetdService).firewallAddUidInterfaceRules(eq("tun0"),
aryEq(new int[] {MOCK_UID1})); aryEq(new int[] {MOCK_UID1}));
// Removed package should have its uid rules removed // Removed package should have its uid rules removed
mPermissionMonitor.onPackageRemoved( mPermissionMonitor.onPackageRemoved(
MOCK_PACKAGE1, UserHandle.getUid(MOCK_USER1, MOCK_UID1)); MOCK_PACKAGE1, MOCK_USER1.getUid(MOCK_UID1));
verify(mNetdService).firewallRemoveUidInterfaceRules(aryEq(new int[] {MOCK_UID1})); verify(mNetdService).firewallRemoveUidInterfaceRules(aryEq(new int[] {MOCK_UID1}));
} }
@@ -557,13 +557,13 @@ public class PermissionMonitorTest {
// called multiple times with the uid corresponding to each user. // called multiple times with the uid corresponding to each user.
private void addPackageForUsers(UserHandle[] users, String packageName, int uid) { private void addPackageForUsers(UserHandle[] users, String packageName, int uid) {
for (final UserHandle user : users) { for (final UserHandle user : users) {
mPermissionMonitor.onPackageAdded(packageName, UserHandle.getUid(user, uid)); mPermissionMonitor.onPackageAdded(packageName, user.getUid(uid));
} }
} }
private void removePackageForUsers(UserHandle[] users, String packageName, int uid) { private void removePackageForUsers(UserHandle[] users, String packageName, int uid) {
for (final UserHandle user : users) { for (final UserHandle user : users) {
mPermissionMonitor.onPackageRemoved(packageName, UserHandle.getUid(user, uid)); mPermissionMonitor.onPackageRemoved(packageName, user.getUid(uid));
} }
} }