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

Restriction changes of #simulateDataStall

Browse source 
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
This commit is contained in:
Yan Yan 2022-12-05 23:00:01 +00:00
commit fe96dde298
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
service/src/com/android/server/ConnectivityService.java
View file

@ -10635,6 +10635,18 @@ public class ConnectivityService extends IConnectivityManager.Stub
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 @@ public class ConnectivityService extends IConnectivityManager.Stub
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