From 97565cfdb399b0567a9b3c833ab1c36181f37351 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Thu, 8 Apr 2021 11:10:51 +0800 Subject: [PATCH] Make getUid a method on UserHandle itself instead of static This commit addresses the API review feedback that getUid() will be better to make it be a method on UserHandle itself rather than a static method. Update as it is and update the corresponding usages. Fix: 184735865 Test: make update-api Test: atest FrameworksNetTests Test: atest CtsNetTestCasesLatestSdk Change-Id: I33844309224d84764704255d251fadc8940202ca --- framework/src/android/net/UidRange.java | 4 ++-- .../android/server/ConnectivityService.java | 2 +- .../server/connectivity/PermissionMonitor.java | 4 ++-- .../connectivity/PermissionMonitorTest.java | 18 +++++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/framework/src/android/net/UidRange.java b/framework/src/android/net/UidRange.java index bc67c745c9..bd332928f4 100644 --- a/framework/src/android/net/UidRange.java +++ b/framework/src/android/net/UidRange.java @@ -46,8 +46,8 @@ public final class UidRange implements Parcelable { /** Creates a UidRange for the specified user. */ public static UidRange createForUser(UserHandle user) { final UserHandle nextUser = UserHandle.of(user.getIdentifier() + 1); - final int start = UserHandle.getUid(user, 0 /* appId */); - final int end = UserHandle.getUid(nextUser, 0) - 1; + final int start = user.getUid(0 /* appId */); + final int end = nextUser.getUid(0 /* appId */) - 1; return new UidRange(start, end); } diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 5aa3e5be2a..420d8d0fa1 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -9790,7 +9790,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } for (final UserHandle ui : users) { // 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) { // Although this may seem like an error scenario, it is ok that uninstalled diff --git a/services/core/java/com/android/server/connectivity/PermissionMonitor.java b/services/core/java/com/android/server/connectivity/PermissionMonitor.java index 37116797d8..7837e6e812 100644 --- a/services/core/java/com/android/server/connectivity/PermissionMonitor.java +++ b/services/core/java/com/android/server/connectivity/PermissionMonitor.java @@ -286,7 +286,7 @@ public class PermissionMonitor { for (UserHandle user : users) { if (user == null) continue; - list.add(UserHandle.getUid(user, app.getKey())); + list.add(user.getUid(app.getKey())); } } try { @@ -555,7 +555,7 @@ public class PermissionMonitor { final UserHandle handle = UserHandle.of(userId); if (handle == null) continue; - final int uid = UserHandle.getUid(handle, appId); + final int uid = handle.getUid(appId); if (range.contains(uid)) { result.add(uid); } diff --git a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java b/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java index fec5ef3937..d7535a9581 100644 --- a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java +++ b/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java @@ -197,7 +197,7 @@ public class PermissionMonitorTest { } else { 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; } @@ -390,7 +390,7 @@ public class PermissionMonitorTest { public void expectPermission(Boolean permission, UserHandle[] users, int[] apps) { for (final UserHandle user : users) { for (final int app : apps) { - final int uid = UserHandle.getUid(user, app); + final int uid = user.getUid(app); if (!mApps.containsKey(uid)) { fail("uid " + uid + " does not exist."); } @@ -404,7 +404,7 @@ public class PermissionMonitorTest { public void expectNoPermission(UserHandle[] users, int[] apps) { for (final UserHandle user : users) { for (final int app : apps) { - final int uid = UserHandle.getUid(user, app); + final int uid = user.getUid(app); if (mApps.containsKey(uid)) { 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 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})); - mPermissionMonitor.onPackageAdded(MOCK_PACKAGE1, UserHandle.getUid(MOCK_USER1, MOCK_UID1)); + mPermissionMonitor.onPackageAdded(MOCK_PACKAGE1, MOCK_USER1.getUid(MOCK_UID1)); verify(mNetdService).firewallAddUidInterfaceRules(eq("tun0"), aryEq(new int[] {MOCK_UID1})); @@ -541,13 +541,13 @@ public class PermissionMonitorTest { mPermissionMonitor.onVpnUidRangesAdded("tun0", vpnRange, VPN_UID); // 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"), aryEq(new int[] {MOCK_UID1})); // Removed package should have its uid rules removed 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})); } @@ -557,13 +557,13 @@ public class PermissionMonitorTest { // called multiple times with the uid corresponding to each user. private void addPackageForUsers(UserHandle[] users, String packageName, int uid) { 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) { for (final UserHandle user : users) { - mPermissionMonitor.onPackageRemoved(packageName, UserHandle.getUid(user, uid)); + mPermissionMonitor.onPackageRemoved(packageName, user.getUid(uid)); } }