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

Commit 6717b6d9 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Remove MessageUtils usage in VpnTransportInfo" am: 0255ab46 am:... 

Merge "Remove MessageUtils usage in VpnTransportInfo" am: 0255ab46 am: 16e62536 am: bdaef78b am: e1b447ae

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

Change-Id: Id5f5d79ce45d44f3d527a3af179e142b84c50027
parents 96ce9b5e e1b447ae

packages/Connectivity/framework/src/android/net/VpnTransportInfo.java

+1 −8
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ import android.annotation.NonNull; 
import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.SparseArray;



import com.android.internal.util.MessageUtils;



import java.util.Objects;
@@ -38,9 +35,6 @@ import java.util.Objects; 
 */

@SystemApi(client = MODULE_LIBRARIES)

public final class VpnTransportInfo implements TransportInfo, Parcelable {

    private static final SparseArray<String> sTypeToString =

            MessageUtils.findMessageNames(new Class[]{VpnManager.class}, new String[]{"TYPE_VPN_"});



    /** Type of this VPN. */

    public final int type;
@@ -63,8 +57,7 @@ public final class VpnTransportInfo implements TransportInfo, Parcelable { 


    @Override

    public String toString() {

        final String typeString = sTypeToString.get(type, "VPN_TYPE_???");

        return String.format("VpnTransportInfo{%s}", typeString);

        return String.format("VpnTransportInfo{type=%d}", type);

    }



    @Override