joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert canSeeAllowedUids for ownerUid

Browse source 
aosp/2405720 allowed network owner uid to see allowed uids
But this breaked old cts.
This CL reverts the behavior for network owner uid.

Bug: 312093253
Bug: 313025186
Bug: 312196228
Test: TH
Change-Id: Iaa732d22f67ecce7678e68bb8b20cec526116dc9
This commit is contained in:
Motomu Utsumi 2023-12-01 00:45:14 +09:00
commit eb4a1968ef
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) {
return Process.SYSTEM_UID == uid
|| netOwnerUid == uid
|| checkAnyPermissionOf(mContext, pid, uid,
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.getSsid());
assertNull(redactedNormal.getUnderlyingNetworks());
// Owner UID is allowed to see the subscription IDs.
assertEquals(2, redactedNormal.getSubscriptionIds().size());
assertEquals(0, redactedNormal.getSubscriptionIds().size());
assertEquals(WifiInfo.DEFAULT_MAC_ADDRESS,
((WifiInfo) redactedNormal.getTransportInfo()).getBSSID());
assertEquals(rssi, ((WifiInfo) redactedNormal.getTransportInfo()).getRssi());