Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8cb139d authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Don't use @hide API - ConnectivityManager#getNetworkTypeName()" am: 15c869f6 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495900

Change-Id: Ia4177dae1104cc67ec8e0a1bf9d8765291afec1f
parents 1a2d80e2 15c869f6

services/core/java/com/android/server/net/LockdownVpnTracker.java

+4 −6
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.net;



import static android.net.ConnectivityManager.TYPE_NONE;

import static android.provider.Settings.ACTION_VPN_SETTINGS;



import static com.android.server.connectivity.NetworkNotificationManager.NOTIFICATION_CHANNEL_VPN;
@@ -27,7 +28,6 @@ import android.app.NotificationManager; 
import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;

import android.net.ConnectivityManager;

import android.net.LinkAddress;

import android.net.LinkProperties;

import android.net.NetworkInfo;
@@ -125,12 +125,11 @@ public class LockdownVpnTracker { 
        final boolean egressChanged = egressProp == null

                || !TextUtils.equals(mAcceptedEgressIface, egressProp.getInterfaceName());



        final String egressTypeName = (egressInfo == null) ?

                null : ConnectivityManager.getNetworkTypeName(egressInfo.getType());

        final int egressType = (egressInfo == null) ? TYPE_NONE : egressInfo.getType();

        final String egressIface = (egressProp == null) ?

                null : egressProp.getInterfaceName();

        Slog.d(TAG, "handleStateChanged: egress=" + egressTypeName +

                " " + mAcceptedEgressIface + "->" + egressIface);

        Slog.d(TAG, "handleStateChanged: egress=" + egressType

                + " " + mAcceptedEgressIface + "->" + egressIface);



        if (egressDisconnected || egressChanged) {

            mAcceptedEgressIface = null;
@@ -141,7 +140,6 @@ public class LockdownVpnTracker { 
            return;

        }



        final int egressType = egressInfo.getType();

        if (vpnInfo.getDetailedState() == DetailedState.FAILED) {

            EventLogTags.writeLockdownVpnError(egressType);

        }