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

Commit 62005aa1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 7b84987a to master"

parents a3a489a5 207cd853

core/java/android/net/NetworkCapabilities.java

+9 −1
Original line number Diff line number Diff line
@@ -405,8 +405,15 @@ public final class NetworkCapabilities implements Parcelable { 
     */

    public static final int TRANSPORT_VPN = 4;



    /**

     * Indicates this network uses a Wi-Fi NAN transport.

     *

     * @hide PROPOSED_NAN_API

     */

    public static final int TRANSPORT_WIFI_NAN = 5;



    private static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;

    private static final int MAX_TRANSPORT = TRANSPORT_VPN;

    private static final int MAX_TRANSPORT = TRANSPORT_WIFI_NAN;



    /**

     * Adds the given transport type to this {@code NetworkCapability} instance.
@@ -862,6 +869,7 @@ public final class NetworkCapabilities implements Parcelable { 
                case TRANSPORT_BLUETOOTH:   transports += "BLUETOOTH"; break;

                case TRANSPORT_ETHERNET:    transports += "ETHERNET"; break;

                case TRANSPORT_VPN:         transports += "VPN"; break;

                case TRANSPORT_WIFI_NAN:    transports += "WIFI_NAN"; break;

            }

            if (++i < types.length) transports += "|";

        }