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

Commit 5dec1df2 authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge changes I193297e0,I43beb966

am: c729ff82

Change-Id: Ie35f8cfe6ab77d0547f38b3bdcaf8f57832c0354
parents 6dfb0ca3 c729ff82
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
@@ -418,8 +418,16 @@ public final class NetworkCapabilities implements Parcelable {
     */
    public static final int TRANSPORT_WIFI_AWARE = 5;

    private static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;
    private static final int MAX_TRANSPORT = TRANSPORT_WIFI_AWARE;
    /**
     * Indicates this network uses a LoWPAN transport.
     * @hide
     */
    public static final int TRANSPORT_LOWPAN = 6;

    /** @hide */
    public static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;
    /** @hide */
    public static final int MAX_TRANSPORT = TRANSPORT_LOWPAN;

    private static final String[] TRANSPORT_NAMES = {
        "CELLULAR",
@@ -427,7 +435,8 @@ public final class NetworkCapabilities implements Parcelable {
        "BLUETOOTH",
        "ETHERNET",
        "VPN",
        "WIFI_AWARE"
        "WIFI_AWARE",
        "LOWPAN"
    };

    /**