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

Merge "Revert canSeeAllowedUids for ownerUid" into main am: 6f95ab2558

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2854709

Change-Id: I3817c625263b68b926bbfab3c1dd810ad6ee08de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Motomu Utsumi 2023-12-06 06:27:37 +00:00 • committed by Automerger Merge Worker
commit fbbcef0a66
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());