commit fe96dde2986be5100aecb0f46db7b89089869615
author Yan Yan <evitayan@google.com> Mon Dec 05 23:00:01 2022 +0000
committer Yan Yan <evitayan@google.com> Sat Mar 11 03:29:10 2023 +0000
tree cd363fcc1d661c6a3153fa95f645623703b59988
parent 5d176320327af0bbcbb11adfd206be6749107042

Restriction changes of #simulateDataStall

This includes two restriction changes of simulateDataStall:
- Allow simulation on a network that has an underlying test
  network
- Allow simulation on networks created by the system server

This commit allows VCN and VPN to CTS test their abilities of
handling suspected data stall.

This commit is safe because #simulateDataStall is already protected
by two signature permissions MANAGE_TEST_NETWORKS and NETWORK_STACK,
and those permissions are granted to only preinstalled apps.

Bug: 263415068
Test: atest VcnManagerTest (new tests)
Change-Id: Ic0cdb66abb291fbf4a7545efe4114179e965d2b6

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 e32ea8f..a85f2e0 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -10635,6 +10635,18 @@
                         callback));
     }
 
+    private boolean hasUnderlyingTestNetworks(NetworkCapabilities nc) {
+        final List<Network> underlyingNetworks = nc.getUnderlyingNetworks();
+        if (underlyingNetworks == null) return false;
+
+        for (Network network : underlyingNetworks) {
+            if (getNetworkCapabilitiesInternal(network).hasTransport(TRANSPORT_TEST)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public void simulateDataStall(int detectionMethod, long timestampMillis,
             @NonNull Network network, @NonNull PersistableBundle extras) {
@@ -10645,14 +10657,18 @@
                 android.Manifest.permission.MANAGE_TEST_NETWORKS,
                 android.Manifest.permission.NETWORK_STACK);
         final NetworkCapabilities nc = getNetworkCapabilitiesInternal(network);
-        if (!nc.hasTransport(TRANSPORT_TEST)) {
-            throw new SecurityException("Data Stall simulation is only possible for test networks");
+        if (!nc.hasTransport(TRANSPORT_TEST) && !hasUnderlyingTestNetworks(nc)) {
+            throw new SecurityException(
+                    "Data Stall simulation is only possible for test networks or networks built on"
+                            + " top of test networks");
         }
 
         final NetworkAgentInfo nai = getNetworkAgentInfoForNetwork(network);
-        if (nai == null || nai.creatorUid != mDeps.getCallingUid()) {
-            throw new SecurityException("Data Stall simulation is only possible for network "
-                + "creators");
+        if (nai == null
+                || (nai.creatorUid != mDeps.getCallingUid()
+                        && nai.creatorUid != Process.SYSTEM_UID)) {
+            throw new SecurityException(
+                    "Data Stall simulation is only possible for network " + "creators");
         }
 
         // Instead of passing the data stall directly to the ConnectivityDiagnostics handler, treat