Merge "Clean up flag ipsec_transform_state" into main (6221ee33) · Commits · e / os / android_frameworks_base

core/java/android/net/flags.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -4,13 +4,6 @@ container: "system"
		# This file contains aconfig flags used from platform code
		# Flags used for module APIs must be in aconfig files under each modules

		flag {
		name: "ipsec_transform_state"
		namespace: "core_networking_ipsec"
		description: "The flag controls the access for getIpSecTransformState and IpSecTransformState"
		bug: "308011229"
		}

		flag {
		name: "powered_off_finding_platform"
		namespace: "nearby"

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.server.vcn;

		import android.annotation.NonNull;
		import android.content.Context;
		import android.net.IpSecTransformState;
		import android.net.vcn.FeatureFlags;
		import android.net.vcn.FeatureFlagsImpl;
		import android.os.Looper;
		@@ -70,19 +69,6 @@ public class VcnContext {
		return mIsInTestMode;
		}

		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
		// right now. We should either update the code when the flag is accessible or remove the
		// legacy behavior after VIC SDK finalization
		try {
		new IpSecTransformState.Builder();
		return true;
		} catch (Exception e) {
		return false;
		}
		}

		@NonNull
		public FeatureFlags getFeatureFlags() {
		return mFeatureFlags;

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -1912,8 +1912,7 @@ public class VcnGatewayConnection extends StateMachine {
		// Transforms do not need to be persisted; the IkeSession will keep them alive
		mIpSecManager.applyTunnelModeTransform(tunnelIface, direction, transform);

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

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -148,12 +148,6 @@ public class IpSecPacketLossDetector extends NetworkMetricMonitor {

		Objects.requireNonNull(deps, "Missing deps");

		if (!vcnContext.isFlagIpSecTransformStateEnabled()) {
		// Caller error
		logWtf("ipsecTransformState flag disabled");
		throw new IllegalAccessException("ipsecTransformState flag disabled");
		}

		mHandler = new Handler(getVcnContext().getLooper());

		mPowerManager = getVcnContext().getContext().getSystemService(PowerManager.class);

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

+4 −22

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

		if (mVcnContext.isFlagIpSecTransformStateEnabled()) {
		for (UnderlyingNetworkEvaluator evaluator : mUnderlyingNetworkRecords.values()) {
		evaluator.close();
		}
		}

		mUnderlyingNetworkRecords.clear();

		@@ -429,10 +427,7 @@ public class UnderlyingNetworkController {
		if (oldSnapshot
		.getAllSubIdsInGroup(mSubscriptionGroup)
		.equals(newSnapshot.getAllSubIdsInGroup(mSubscriptionGroup))) {

		if (mVcnContext.isFlagIpSecTransformStateEnabled()) {
		reevaluateNetworks();
		}
		return;
		}
		registerOrUpdateNetworkRequests();
		@@ -445,11 +440,6 @@ public class UnderlyingNetworkController {
		*/
		public void updateInboundTransform(
		@NonNull UnderlyingNetworkRecord currentNetwork, @NonNull IpSecTransform transform) {
		if (!mVcnContext.isFlagIpSecTransformStateEnabled()) {
		logWtf("#updateInboundTransform: unexpected call; flags missing");
		return;
		}

		Objects.requireNonNull(currentNetwork, "currentNetwork is null");
		Objects.requireNonNull(transform, "transform is null");

		@@ -572,10 +562,7 @@ public class UnderlyingNetworkController {

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

		mUnderlyingNetworkRecords.remove(network);

		reevaluateNetworks();
		@@ -648,11 +635,6 @@ public class UnderlyingNetworkController {
		class NetworkEvaluatorCallbackImpl implements NetworkEvaluatorCallback {
		@Override
		public void onEvaluationResultChanged() {
		if (!mVcnContext.isFlagIpSecTransformStateEnabled()) {
		logWtf("#onEvaluationResultChanged: unexpected call; flags missing");
		return;
		}

		mVcnContext.ensureRunningOnLooperThread();
		reevaluateNetworks();
		}