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

Commit 51a6ca48 authored by Etan Cohen's avatar Etan Cohen
Browse files

reolve merge conflicts of 4e3d8276 to nyc-mr1-dev-plus-aosp 

Change-Id: Idb6cca34536fdbb94876d5cde0b2309462840da1
parents 8e9917b9 4e3d8276

core/java/android/net/NetworkCapabilities.java

+9 −1
Original line number Diff line number Diff line
@@ -418,8 +418,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.
@@ -889,6 +896,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 += "|";

        }