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

Merge "Don't use @hide API - ConnectivityManager#getNetworkTypeName()"

Browse Source
This commit is contained in:
Lucas Lin
2020-11-17 08:40:01 +00:00
committed by Gerrit Code Review
parent d4235a815c ff493c4f0a
commit 15c869f6ad
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/net/LockdownVpnTracker.java
View File

@@ -16,6 +16,7 @@
package com.android.server.net; package com.android.server.net;
import static android.net.ConnectivityManager.TYPE_NONE;
import static android.provider.Settings.ACTION_VPN_SETTINGS; import static android.provider.Settings.ACTION_VPN_SETTINGS;
import static com.android.server.connectivity.NetworkNotificationManager.NOTIFICATION_CHANNEL_VPN; import static com.android.server.connectivity.NetworkNotificationManager.NOTIFICATION_CHANNEL_VPN;
@@ -27,7 +28,6 @@ import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.LinkAddress; import android.net.LinkAddress;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.NetworkInfo; import android.net.NetworkInfo;
@@ -125,12 +125,11 @@ public class LockdownVpnTracker {
final boolean egressChanged = egressProp == null final boolean egressChanged = egressProp == null
|| !TextUtils.equals(mAcceptedEgressIface, egressProp.getInterfaceName()); || !TextUtils.equals(mAcceptedEgressIface, egressProp.getInterfaceName());
final String egressTypeName = (egressInfo == null) ? final int egressType = (egressInfo == null) ? TYPE_NONE : egressInfo.getType();
null : ConnectivityManager.getNetworkTypeName(egressInfo.getType());
final String egressIface = (egressProp == null) ? final String egressIface = (egressProp == null) ?
null : egressProp.getInterfaceName(); null : egressProp.getInterfaceName();
Slog.d(TAG, "handleStateChanged: egress=" + egressTypeName + Slog.d(TAG, "handleStateChanged: egress=" + egressType
" " + mAcceptedEgressIface + "->" + egressIface); + " " + mAcceptedEgressIface + "->" + egressIface);
if (egressDisconnected || egressChanged) { if (egressDisconnected || egressChanged) {
mAcceptedEgressIface = null; mAcceptedEgressIface = null;
@@ -141,7 +140,6 @@ public class LockdownVpnTracker {
return; return;
} }
final int egressType = egressInfo.getType();
if (vpnInfo.getDetailedState() == DetailedState.FAILED) { if (vpnInfo.getDetailedState() == DetailedState.FAILED) {
EventLogTags.writeLockdownVpnError(egressType); EventLogTags.writeLockdownVpnError(egressType);
} }