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

Revert "Add SkipNativeNetworkCreation flag in NetworkAgentConfig"

Browse source 
This reverts commit fef111ce47.

Reason for revert: Replaced by early native network creation

Change-Id: I692f716d8651badf6d0037e55a2385d0fb0049d1
This commit is contained in:
Junyu Lai 2025-02-26 01:30:20 -08:00 • committed by Gerrit Code Review
commit b04a8048a1
2 changed files with 27 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

99
framework/src/android/net/NetworkAgentConfig.java
View file

@ -272,27 +272,6 @@ public final class NetworkAgentConfig implements Parcelable {
return mVpnRequiresValidation;
}
/**
* Whether the native network creation should be skipped.
*
* If set, the native network and routes should be maintained by the caller.
*
* @hide
*/
private boolean mSkipNativeNetworkCreation = false;
/**
* @return Whether the native network creation should be skipped.
* @hide
*/
// TODO: Expose API when ready.
// @FlaggedApi(Flags.FLAG_TETHERING_NETWORK_AGENT)
// @SystemApi(client = MODULE_LIBRARIES) when ready.
public boolean shouldSkipNativeNetworkCreation() {
return mSkipNativeNetworkCreation;
}
/** @hide */
public NetworkAgentConfig() {
}
@ -314,7 +293,6 @@ public final class NetworkAgentConfig implements Parcelable {
mLegacyExtraInfo = nac.mLegacyExtraInfo;
excludeLocalRouteVpn = nac.excludeLocalRouteVpn;
mVpnRequiresValidation = nac.mVpnRequiresValidation;
mSkipNativeNetworkCreation = nac.mSkipNativeNetworkCreation;
}
}
@ -505,26 +483,6 @@ public final class NetworkAgentConfig implements Parcelable {
return this;
}
/**
* Sets the native network creation should be skipped.
*
* @return this builder, to facilitate chaining.
* @hide
*/
@NonNull
// TODO: Expose API when ready.
// @FlaggedApi(Flags.FLAG_TETHERING_NETWORK_AGENT)
// @SystemApi(client = MODULE_LIBRARIES) when ready.
public Builder setSkipNativeNetworkCreation(boolean skipNativeNetworkCreation) {
if (!SdkLevel.isAtLeastV()) {
// Local agents are supported starting on U on TVs and on V on everything else.
// Thus, only support this flag on V+.
throw new UnsupportedOperationException("Method is not supported");
}
mConfig.mSkipNativeNetworkCreation = skipNativeNetworkCreation;
return this;
}
/**
* Returns the constructed {@link NetworkAgentConfig} object.
*/
@ -552,8 +510,7 @@ public final class NetworkAgentConfig implements Parcelable {
&& Objects.equals(legacySubTypeName, that.legacySubTypeName)
&& Objects.equals(mLegacyExtraInfo, that.mLegacyExtraInfo)
&& excludeLocalRouteVpn == that.excludeLocalRouteVpn
&& mVpnRequiresValidation == that.mVpnRequiresValidation
&& mSkipNativeNetworkCreation == that.mSkipNativeNetworkCreation;
&& mVpnRequiresValidation == that.mVpnRequiresValidation;
}
@Override
@ -561,8 +518,7 @@ public final class NetworkAgentConfig implements Parcelable {
return Objects.hash(allowBypass, explicitlySelected, acceptUnvalidated,
acceptPartialConnectivity, provisioningNotificationDisabled, subscriberId,
skip464xlat, legacyType, legacySubType, legacyTypeName, legacySubTypeName,
mLegacyExtraInfo, excludeLocalRouteVpn, mVpnRequiresValidation,
mSkipNativeNetworkCreation);
mLegacyExtraInfo, excludeLocalRouteVpn, mVpnRequiresValidation);
}
@Override
@ -583,7 +539,6 @@ public final class NetworkAgentConfig implements Parcelable {
+ ", legacyExtraInfo = '" + mLegacyExtraInfo + '\''
+ ", excludeLocalRouteVpn = '" + excludeLocalRouteVpn + '\''
+ ", vpnRequiresValidation = '" + mVpnRequiresValidation + '\''
+ ", skipNativeNetworkCreation = '" + mSkipNativeNetworkCreation + '\''
+ "}";
}
@ -608,35 +563,33 @@ public final class NetworkAgentConfig implements Parcelable {
out.writeString(mLegacyExtraInfo);
out.writeInt(excludeLocalRouteVpn ? 1 : 0);
out.writeInt(mVpnRequiresValidation ? 1 : 0);
out.writeInt(mSkipNativeNetworkCreation ? 1 : 0);
}
public static final @NonNull Creator<NetworkAgentConfig> CREATOR =
new Creator<NetworkAgentConfig>() {
@Override
public NetworkAgentConfig createFromParcel(Parcel in) {
NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig();
networkAgentConfig.allowBypass = in.readInt() != 0;
networkAgentConfig.explicitlySelected = in.readInt() != 0;
networkAgentConfig.acceptUnvalidated = in.readInt() != 0;
networkAgentConfig.acceptPartialConnectivity = in.readInt() != 0;
networkAgentConfig.subscriberId = in.readString();
networkAgentConfig.provisioningNotificationDisabled = in.readInt() != 0;
networkAgentConfig.skip464xlat = in.readInt() != 0;
networkAgentConfig.legacyType = in.readInt();
networkAgentConfig.legacyTypeName = in.readString();
networkAgentConfig.legacySubType = in.readInt();
networkAgentConfig.legacySubTypeName = in.readString();
networkAgentConfig.mLegacyExtraInfo = in.readString();
networkAgentConfig.excludeLocalRouteVpn = in.readInt() != 0;
networkAgentConfig.mVpnRequiresValidation = in.readInt() != 0;
networkAgentConfig.mSkipNativeNetworkCreation = in.readInt() != 0;
return networkAgentConfig;
}
@Override
public NetworkAgentConfig createFromParcel(Parcel in) {
NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig();
networkAgentConfig.allowBypass = in.readInt() != 0;
networkAgentConfig.explicitlySelected = in.readInt() != 0;
networkAgentConfig.acceptUnvalidated = in.readInt() != 0;
networkAgentConfig.acceptPartialConnectivity = in.readInt() != 0;
networkAgentConfig.subscriberId = in.readString();
networkAgentConfig.provisioningNotificationDisabled = in.readInt() != 0;
networkAgentConfig.skip464xlat = in.readInt() != 0;
networkAgentConfig.legacyType = in.readInt();
networkAgentConfig.legacyTypeName = in.readString();
networkAgentConfig.legacySubType = in.readInt();
networkAgentConfig.legacySubTypeName = in.readString();
networkAgentConfig.mLegacyExtraInfo = in.readString();
networkAgentConfig.excludeLocalRouteVpn = in.readInt() != 0;
networkAgentConfig.mVpnRequiresValidation = in.readInt() != 0;
return networkAgentConfig;
}
@Override
public NetworkAgentConfig[] newArray(int size) {
return new NetworkAgentConfig[size];
}
};
@Override
public NetworkAgentConfig[] newArray(int size) {
return new NetworkAgentConfig[size];
}
};
}

10
tests/common/java/android/net/NetworkAgentConfigTest.kt
View file

@ -20,7 +20,6 @@ import androidx.test.filters.SmallTest
import androidx.test.runner.AndroidJUnit4
import com.android.modules.utils.build.SdkLevel.isAtLeastS
import com.android.modules.utils.build.SdkLevel.isAtLeastT
import com.android.modules.utils.build.SdkLevel.isAtLeastV
import com.android.testutils.ConnectivityModuleTest
import com.android.testutils.assertParcelingIsLossless
import org.junit.Assert.assertEquals
@ -48,9 +47,6 @@ class NetworkAgentConfigTest {
setLocalRoutesExcludedForVpn(true)
setVpnRequiresValidation(true)
}
if (isAtLeastV()) {
setSkipNativeNetworkCreation(true)
}
}.build()
assertParcelingIsLossless(config)
}
@ -75,9 +71,6 @@ class NetworkAgentConfigTest {
setLocalRoutesExcludedForVpn(true)
setVpnRequiresValidation(true)
}
if (isAtLeastV()) {
setSkipNativeNetworkCreation(true)
}
}.build()
assertTrue(config.isExplicitlySelected())
@ -86,9 +79,6 @@ class NetworkAgentConfigTest {
assertFalse(config.isPartialConnectivityAcceptable())
assertTrue(config.isUnvalidatedConnectivityAcceptable())
assertEquals("TEST_NETWORK", config.getLegacyTypeName())
if (isAtLeastV()) {
assertTrue(config.shouldSkipNativeNetworkCreation())
}
if (isAtLeastT()) {
assertTrue(config.areLocalRoutesExcludedForVpn())
assertTrue(config.isVpnValidationRequired())