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

Commit 2d289c33 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Remove VpnType usage in VpnTransportInfo" am: 3ce3d9f3 am: 6d573604... 

Merge "Remove VpnType usage in VpnTransportInfo" am: 3ce3d9f3 am: 6d573604 am: 2fb1c664 am: 8297717c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9a3f49bf6fcb79e6f88e122e3960adb89a9f59e
parents 55762baf 8297717c

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

+2 −2
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ public final class VpnTransportInfo implements TransportInfo, Parcelable { 
            MessageUtils.findMessageNames(new Class[]{VpnManager.class}, new String[]{"TYPE_VPN_"});



    /** Type of this VPN. */

    @VpnManager.VpnType public final int type;

    public final int type;



    public VpnTransportInfo(@VpnManager.VpnType int type) {

    public VpnTransportInfo(int type) {

        this.type = type;

    }