diff options
| author | 2021-12-27 15:40:22 +0000 | |
|---|---|---|
| committer | 2021-12-30 10:00:19 +0000 | |
| commit | 5c7508e2acd1d07e95ea493ff4ed0bb0a37ce349 (patch) | |
| tree | 75aac2b8542b75bae42d7f2b2ed337b2b6f1abff | |
| parent | 7c4090fdb5777ddb3110b81cd7f19f271e6de677 (diff) | |
[MS23] Remove UserHandle.getUserId dependencies
Replaced with SystemApi.
Test: TH
Bug: 204830222
Change-Id: Ibc834489428c2036cd4ccd3284ba06c4c9e792b7
| -rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java index 779fdf94a0eb..8980bbcbab51 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java +++ b/packages/ConnectivityT/framework-t/src/android/net/NetworkStatsAccess.java @@ -160,6 +160,8 @@ public final class NetworkStatsAccess { */ public static boolean isAccessibleToUser(int uid, int callerUid, @NetworkStatsAccess.Level int accessLevel) { + final int userId = UserHandle.getUserHandleForUid(uid).getIdentifier(); + final int callerUserId = UserHandle.getUserHandleForUid(callerUid).getIdentifier(); switch (accessLevel) { case NetworkStatsAccess.Level.DEVICE: // Device-level access - can access usage for any uid. @@ -170,13 +172,13 @@ public final class NetworkStatsAccess { // anonymized uids return uid == android.os.Process.SYSTEM_UID || uid == UID_REMOVED || uid == UID_TETHERING || uid == UID_ALL - || UserHandle.getUserId(uid) == UserHandle.getUserId(callerUid); + || userId == callerUserId; case NetworkStatsAccess.Level.USER: // User-level access - can access usage for any app running in the same user, along // with some special uids (system, removed, or tethering). return uid == android.os.Process.SYSTEM_UID || uid == UID_REMOVED || uid == UID_TETHERING - || UserHandle.getUserId(uid) == UserHandle.getUserId(callerUid); + || userId == callerUserId; case NetworkStatsAccess.Level.DEFAULT: default: // Default access level - can only access one's own usage. |