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

[MS23] Remove UserHandle.getUserId dependencies

Browse Source 
Replaced with SystemApi.

Test: TH
Bug: 204830222
Change-Id: Ibc834489428c2036cd4ccd3284ba06c4c9e792b7
This commit is contained in:
Junyu Lai
2021-12-27 15:40:22 +00:00
parent 8b46180814
commit f81e323a23
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework-t/src/android/net/NetworkStatsAccess.java
View File

@@ -160,6 +160,8 @@ public final class NetworkStatsAccess {
*/ */
public static boolean isAccessibleToUser(int uid, int callerUid, public static boolean isAccessibleToUser(int uid, int callerUid,
@NetworkStatsAccess.Level int accessLevel) { @NetworkStatsAccess.Level int accessLevel) {
final int userId = UserHandle.getUserHandleForUid(uid).getIdentifier();
final int callerUserId = UserHandle.getUserHandleForUid(callerUid).getIdentifier();
switch (accessLevel) { switch (accessLevel) {
case NetworkStatsAccess.Level.DEVICE: case NetworkStatsAccess.Level.DEVICE:
// Device-level access - can access usage for any uid. // Device-level access - can access usage for any uid.
@@ -170,13 +172,13 @@ public final class NetworkStatsAccess {
// anonymized uids // anonymized uids
return uid == android.os.Process.SYSTEM_UID || uid == UID_REMOVED return uid == android.os.Process.SYSTEM_UID || uid == UID_REMOVED
|| uid == UID_TETHERING || uid == UID_ALL || uid == UID_TETHERING || uid == UID_ALL
|| UserHandle.getUserId(uid) == UserHandle.getUserId(callerUid); || userId == callerUserId;
case NetworkStatsAccess.Level.USER: case NetworkStatsAccess.Level.USER:
// User-level access - can access usage for any app running in the same user, along // User-level access - can access usage for any app running in the same user, along
// with some special uids (system, removed, or tethering). // with some special uids (system, removed, or tethering).
return uid == android.os.Process.SYSTEM_UID || uid == UID_REMOVED return uid == android.os.Process.SYSTEM_UID || uid == UID_REMOVED
|| uid == UID_TETHERING || uid == UID_TETHERING
|| UserHandle.getUserId(uid) == UserHandle.getUserId(callerUid); || userId == callerUserId;
case NetworkStatsAccess.Level.DEFAULT: case NetworkStatsAccess.Level.DEFAULT:
default: default:
// Default access level - can only access one's own usage. // Default access level - can only access one's own usage.