From eb4a1968ef83242665b6487091e4cf2cd95a642f Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Fri, 1 Dec 2023 00:45:14 +0900 Subject: [PATCH] Revert canSeeAllowedUids for ownerUid 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 --- service/src/com/android/server/ConnectivityService.java | 1 - tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 9268da5630..5f6724660f 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -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); } diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 58f6d58ad0..02d3823643 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -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());