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

Commit 305ea28a authored by Etan Cohen's avatar Etan Cohen
Browse files

[NAN] Add transport type for NAN. 

Add TRANSPORT_WIFI_NAN - specifies a peer-to-peer Wi-Fi NAN data
connectivity request.

While NAN uses Wi-Fi L1 PHY and part of the MAC - it is a different
protocol and constitutes a different transport.

(cherry-pick of commit 7b84987a)
(cherry-pick of commit bd9fdbe0)

Bug: 26564277
Change-Id: I975ebc72d8f97a592d18038b3d6465b7a40efa75
parent 21ba3d95

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

        }