Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove usage of NetworkInfo"

Browse Source
This commit is contained in:
Benedict Wong
2021-01-26 06:49:32 +00:00
committed by Gerrit Code Review
parent cba3b81738 bb34057add
commit bd65203feb
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/vcn/VcnGatewayConnection.java
View File

@@ -24,7 +24,6 @@ import static com.android.server.VcnManagementService.VDBG;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.net.ConnectivityManager;
import android.net.InetAddresses; import android.net.InetAddresses;
import android.net.IpPrefix; import android.net.IpPrefix;
import android.net.IpSecManager; import android.net.IpSecManager;
@@ -36,8 +35,6 @@ import android.net.LinkProperties;
import android.net.Network; import android.net.Network;
import android.net.NetworkAgent; import android.net.NetworkAgent;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.annotations.PolicyDirection; import android.net.annotations.PolicyDirection;
import android.net.ipsec.ike.ChildSessionCallback; import android.net.ipsec.ike.ChildSessionCallback;
@@ -54,7 +51,6 @@ import android.os.Handler;
import android.os.HandlerExecutor; import android.os.HandlerExecutor;
import android.os.Message; import android.os.Message;
import android.os.ParcelUuid; import android.os.ParcelUuid;
import android.telephony.TelephonyManager;
import android.util.Slog; import android.util.Slog;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
@@ -668,7 +664,7 @@ public class VcnGatewayConnection extends StateMachine {
protected void teardownNetwork() { protected void teardownNetwork() {
if (mNetworkAgent != null) { if (mNetworkAgent != null) {
mNetworkAgent.sendNetworkInfo(buildNetworkInfo(false /* isConnected */)); mNetworkAgent.unregister();
mNetworkAgent = null; mNetworkAgent = null;
} }
} }
@@ -815,20 +811,6 @@ public class VcnGatewayConnection extends StateMachine {
protected void processStateMsg(Message msg) {} 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) @VisibleForTesting(visibility = Visibility.PRIVATE)
static NetworkCapabilities buildNetworkCapabilities( static NetworkCapabilities buildNetworkCapabilities(
@NonNull VcnGatewayConnectionConfig gatewayConnectionConfig) { @NonNull VcnGatewayConnectionConfig gatewayConnectionConfig) {