commit 6f95ab255861dacede2758f7dfd67a3eebc33601
author Motomu Utsumi <motomuman@google.com> Wed Dec 06 05:53:00 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 06 05:53:00 2023 +0000
tree a8794354cbd1b772d391d521f7fd038b40a2ddbe
parent 2f67e0f2d4ae43450a906964bd4dc24c9ed018ad
parent eb4a1968ef83242665b6487091e4cf2cd95a642f

Merge "Revert canSeeAllowedUids for ownerUid" into main

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 9268da5..5f67246 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -2655,7 +2655,6 @@
 
     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);
     }

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 58f6d58..02d3823 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 @@
             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());