Remove usage of NetworkInfo

Remove usages of deprecated APIs

Bug: 8675309
Test: atest FrameworksVcnTests
Change-Id: Iaaef109d00c111da2396c3eec946cfc5035f415e
This commit is contained in:
Benedict Wong
2021-01-25 18:27:02 -08:00
parent f9095c3bc7
commit bb34057add

View File

@@ -24,7 +24,6 @@ import static com.android.server.VcnManagementService.VDBG;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.net.ConnectivityManager;
import android.net.InetAddresses;
import android.net.IpPrefix;
import android.net.IpSecManager;
@@ -36,8 +35,6 @@ import android.net.LinkProperties;
import android.net.Network;
import android.net.NetworkAgent;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
import android.net.RouteInfo;
import android.net.annotations.PolicyDirection;
import android.net.ipsec.ike.ChildSessionCallback;
@@ -54,7 +51,6 @@ import android.os.Handler;
import android.os.HandlerExecutor;
import android.os.Message;
import android.os.ParcelUuid;
import android.telephony.TelephonyManager;
import android.util.Slog;
import com.android.internal.annotations.VisibleForTesting;
@@ -668,7 +664,7 @@ public class VcnGatewayConnection extends StateMachine {
protected void teardownNetwork() {
if (mNetworkAgent != null) {
mNetworkAgent.sendNetworkInfo(buildNetworkInfo(false /* isConnected */));
mNetworkAgent.unregister();
mNetworkAgent = null;
}
}
@@ -815,20 +811,6 @@ public class VcnGatewayConnection extends StateMachine {
protected void processStateMsg(Message msg) {}
}
// TODO: Remove this when migrating to new NetworkAgent API
private static NetworkInfo buildNetworkInfo(boolean isConnected) {
NetworkInfo info =
new NetworkInfo(
ConnectivityManager.TYPE_MOBILE,
TelephonyManager.NETWORK_TYPE_UNKNOWN,
"MOBILE",
"VCN");
info.setDetailedState(
isConnected ? DetailedState.CONNECTED : DetailedState.DISCONNECTED, null, null);
return info;
}
@VisibleForTesting(visibility = Visibility.PRIVATE)
static NetworkCapabilities buildNetworkCapabilities(
@NonNull VcnGatewayConnectionConfig gatewayConnectionConfig) {