Merge "Clean up flag network_metric_monitor" into main (7ae378b0) · Commits · e / os / android_frameworks_base

core/java/android/net/vcn/flags.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -15,10 +15,3 @@ flag {
		description: "Feature flag for adjustable safe mode timeout"
		bug: "317406085"
		}
		No newline at end of file

		flag{
		name: "network_metric_monitor"
		namespace: "vcn"
		description: "Feature flag for enabling network metric monitor"
		bug: "282996138"
		}
		No newline at end of file

services/core/java/com/android/server/vcn/VcnContext.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -70,10 +70,6 @@ public class VcnContext {
		return mIsInTestMode;
		}

		public boolean isFlagNetworkMetricMonitorEnabled() {
		return mFeatureFlags.networkMetricMonitor();
		}

		public boolean isFlagIpSecTransformStateEnabled() {
		// TODO: b/328844044: Ideally this code should gate the behavior by checking the
		// android.net.platform.flags.ipsec_transform_state flag but that flag is not accessible

services/core/java/com/android/server/vcn/VcnGatewayConnection.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -1913,7 +1913,6 @@ public class VcnGatewayConnection extends StateMachine {
		mIpSecManager.applyTunnelModeTransform(tunnelIface, direction, transform);

		if (direction == IpSecManager.DIRECTION_IN
		&& mVcnContext.isFlagNetworkMetricMonitorEnabled()
		&& mVcnContext.isFlagIpSecTransformStateEnabled()) {
		mUnderlyingNetworkController.updateInboundTransform(mUnderlying, transform);
		}

services/core/java/com/android/server/vcn/routeselection/NetworkMetricMonitor.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -62,12 +62,6 @@ public abstract class NetworkMetricMonitor implements AutoCloseable {
		@Nullable PersistableBundleWrapper carrierConfig,
		@NonNull NetworkMetricMonitorCallback callback)
		throws IllegalAccessException {
		if (!vcnContext.isFlagNetworkMetricMonitorEnabled()) {
		// Caller error
		logWtf("networkMetricMonitor flag disabled");
		throw new IllegalAccessException("networkMetricMonitor flag disabled");
		}

		mVcnContext = Objects.requireNonNull(vcnContext, "Missing vcnContext");
		mNetwork = Objects.requireNonNull(network, "Missing network");
		mCallback = Objects.requireNonNull(callback, "Missing callback");

services/core/java/com/android/server/vcn/routeselection/UnderlyingNetworkController.java

+5 −10

Original line number	Diff line number	Diff line
		@@ -204,8 +204,7 @@ public class UnderlyingNetworkController {
		List<NetworkCallback> oldCellCallbacks = new ArrayList<>(mCellBringupCallbacks);
		mCellBringupCallbacks.clear();

		if (mVcnContext.isFlagNetworkMetricMonitorEnabled()
		&& mVcnContext.isFlagIpSecTransformStateEnabled()) {
		if (mVcnContext.isFlagIpSecTransformStateEnabled()) {
		for (UnderlyingNetworkEvaluator evaluator : mUnderlyingNetworkRecords.values()) {
		evaluator.close();
		}
		@@ -431,8 +430,7 @@ public class UnderlyingNetworkController {
		.getAllSubIdsInGroup(mSubscriptionGroup)
		.equals(newSnapshot.getAllSubIdsInGroup(mSubscriptionGroup))) {

		if (mVcnContext.isFlagNetworkMetricMonitorEnabled()
		&& mVcnContext.isFlagIpSecTransformStateEnabled()) {
		if (mVcnContext.isFlagIpSecTransformStateEnabled()) {
		reevaluateNetworks();
		}
		return;
		@@ -447,8 +445,7 @@ public class UnderlyingNetworkController {
		*/
		public void updateInboundTransform(
		@NonNull UnderlyingNetworkRecord currentNetwork, @NonNull IpSecTransform transform) {
		if (!mVcnContext.isFlagNetworkMetricMonitorEnabled()
		\|\| !mVcnContext.isFlagIpSecTransformStateEnabled()) {
		if (!mVcnContext.isFlagIpSecTransformStateEnabled()) {
		logWtf("#updateInboundTransform: unexpected call; flags missing");
		return;
		}
		@@ -575,8 +572,7 @@ public class UnderlyingNetworkController {

		@Override
		public void onLost(@NonNull Network network) {
		if (mVcnContext.isFlagNetworkMetricMonitorEnabled()
		&& mVcnContext.isFlagIpSecTransformStateEnabled()) {
		if (mVcnContext.isFlagIpSecTransformStateEnabled()) {
		mUnderlyingNetworkRecords.get(network).close();
		}

		@@ -652,8 +648,7 @@ public class UnderlyingNetworkController {
		class NetworkEvaluatorCallbackImpl implements NetworkEvaluatorCallback {
		@Override
		public void onEvaluationResultChanged() {
		if (!mVcnContext.isFlagNetworkMetricMonitorEnabled()
		\|\| !mVcnContext.isFlagIpSecTransformStateEnabled()) {
		if (!mVcnContext.isFlagIpSecTransformStateEnabled()) {
		logWtf("#onEvaluationResultChanged: unexpected call; flags missing");
		return;
		}