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

Commit 4a7e41a6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Expose VpnTransportInfo as module-lib API."

parents 45ec3191 d92d403e

core/api/module-lib-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -72,6 +72,14 @@ package android.net { 
    field @NonNull public final java.util.List<java.lang.String> underlyingIfaces;

  }



  public final class VpnTransportInfo implements android.os.Parcelable android.net.TransportInfo {

    ctor public VpnTransportInfo(int);

    method public int describeContents();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.net.VpnTransportInfo> CREATOR;

    field public final int type;

  }



}



package android.os {

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

+12 −2
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ 


package android.net;



import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.SparseArray;
@@ -26,7 +28,15 @@ import com.android.internal.util.MessageUtils; 


import java.util.Objects;



/** @hide */

/**

 * Container for VPN-specific transport information.

 *

 * @see android.net.TransportInfo

 * @see NetworkCapabilities#getTransportInfo()

 *

 * @hide

 */

@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_"});