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

Fill Opt-in uid count in ConnetivityStateSample

Browse source 
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.metrics.ConnectivitySampleMetricsTest \
  --update-device
Flag: EXEMPT controlled with kill switch
Bug: 419123367
Change-Id: I95376e30e160b4db00d018a0919be98b37d44e5e
This commit is contained in:
Junyu Lai 2025-05-27 13:28:20 +08:00
commit 5b061066c9
1 changed files with 51 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,6 +158,7 @@ import static com.android.net.module.util.PermissionUtils.hasAnyPermissionOf;
import static com.android.server.ConnectivityStatsLog.CONNECTIVITY_STATE_SAMPLE;
import static com.android.server.connectivity.ConnectivityFlags.CELLULAR_DATA_INACTIVITY_TIMEOUT;
import static com.android.server.connectivity.ConnectivityFlags.CLOSE_QUIC_CONNECTION;
import static com.android.server.connectivity.ConnectivityFlags.CONSTRAINED_DATA_SATELLITE_METRICS;
import static com.android.server.connectivity.ConnectivityFlags.DELAY_DESTROY_SOCKETS;
import static com.android.server.connectivity.ConnectivityFlags.INGRESS_TO_VPN_ADDRESS_FILTERING;
import static com.android.server.connectivity.ConnectivityFlags.NAMESPACE_TETHERING_BOOT;
@ -338,6 +339,7 @@ import com.android.metrics.NetworkDescription;
import com.android.metrics.NetworkList;
import com.android.metrics.NetworkRequestCount;
import com.android.metrics.RequestCountForType;
import com.android.metrics.SatelliteAccessInfo;
import com.android.modules.utils.BasicShellCommandHandler;
import com.android.modules.utils.build.SdkLevel;
import com.android.net.module.util.BaseNetdUnsolicitedEventListener;
@ -551,6 +553,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
private final boolean mQueueCallbacksForFrozenApps;
// Flag for early link properties update
private final boolean mSupportEarlyLinkPropertiesUpdateForVPN;
private final boolean mConstrainedDataSatelliteMetrics;
/**
* Uids ConnectivityService tracks blocked status of to send blocked status callbacks.
@ -1992,6 +1995,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
} else {
mSatelliteAccessController = null;
}
mConstrainedDataSatelliteMetrics = (mSatelliteAccessController != null)
&& mDeps.isFeatureNotChickenedOut(mContext, CONSTRAINED_DATA_SATELLITE_METRICS);
// To ensure uid state is synchronized with Network Policy, register for
// NetworkPolicyManagerService events must happen prior to NetworkPolicyManagerService
@ -2760,6 +2765,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
builder.setConnectionDurationPerTransports(sampleConnectionDuration(mNetworkAgentInfos));
builder.setNetworkRequestCount(sampleNetworkRequestCount(mNetworkRequests.values()));
builder.setNetworks(sampleNetworks(mNetworkAgentInfos));
if (mConstrainedDataSatelliteMetrics) {
builder.setSatelliteAccessInfo(sampleSatelliteAccessInfo(mSatelliteAccessController));
}
return builder.build();
}
@ -2859,6 +2867,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
return builder.build();
}
@NonNull
private static SatelliteAccessInfo sampleSatelliteAccessInfo(
@NonNull final SatelliteAccessController controller) {
final int optInUidCount = controller.getCachedOptInUidsCount();
return SatelliteAccessInfo.newBuilder().setOptinUidCount(optInUidCount).build();
}
@Override
public boolean isNetworkSupported(int networkType) {
enforceAccessPermission();