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

Commit c729ff82 authored by Hugo Benichi's avatar Hugo Benichi Committed by Gerrit Code Review
Browse files

Merge changes I193297e0,I43beb966 

* changes:
  NetworkCapabilities: Added support for TRANSPORT_LOWPAN
  Connectivity metrics: serialize networkId, transports, ifname
parents 8330d521 5f915765

core/java/android/net/NetworkCapabilities.java

+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"

    };



    /**