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

Merge "Revert canSeeAllowedUids for ownerUid" into main

Browse Source
This commit is contained in:
Motomu Utsumi
2023-12-06 05:53:00 +00:00
committed by Gerrit Code Review
parent 2f67e0f2d4 eb4a1968ef
commit 6f95ab2558
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
service/src/com/android/server/ConnectivityService.java
View File

@@ -2655,7 +2655,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
private boolean canSeeAllowedUids(final int pid, final int uid, final int netOwnerUid) { private boolean canSeeAllowedUids(final int pid, final int uid, final int netOwnerUid) {
return Process.SYSTEM_UID == uid return Process.SYSTEM_UID == uid
|| netOwnerUid == uid
|| checkAnyPermissionOf(mContext, pid, uid, || checkAnyPermissionOf(mContext, pid, uid,
android.Manifest.permission.NETWORK_FACTORY); android.Manifest.permission.NETWORK_FACTORY);
} }

3
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -801,8 +801,7 @@ public class ConnectivityManagerTest {
assertNull(redactedNormal.getUids()); assertNull(redactedNormal.getUids());
assertNull(redactedNormal.getSsid()); assertNull(redactedNormal.getSsid());
assertNull(redactedNormal.getUnderlyingNetworks()); assertNull(redactedNormal.getUnderlyingNetworks());
// Owner UID is allowed to see the subscription IDs. assertEquals(0, redactedNormal.getSubscriptionIds().size());
assertEquals(2, redactedNormal.getSubscriptionIds().size());
assertEquals(WifiInfo.DEFAULT_MAC_ADDRESS, assertEquals(WifiInfo.DEFAULT_MAC_ADDRESS,
((WifiInfo) redactedNormal.getTransportInfo()).getBSSID()); ((WifiInfo) redactedNormal.getTransportInfo()).getBSSID());
assertEquals(rssi, ((WifiInfo) redactedNormal.getTransportInfo()).getRssi()); assertEquals(rssi, ((WifiInfo) redactedNormal.getTransportInfo()).getRssi());