LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NAN] Add transport type for NAN.

Browse Source 
am: 305ea28a43

Change-Id: I9e12a30de06481418fa2c322fbeef0ecde75f746
This commit is contained in:
Etan Cohen
2016-09-16 18:45:49 +00:00
committed by android-build-merger
parent 0890f0175a e7395027cf
commit c0077e3fe1
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/net/NetworkCapabilities.java
View File

@@ -405,8 +405,15 @@ public final class NetworkCapabilities implements Parcelable {
*/ */
public static final int TRANSPORT_VPN = 4; 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 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. * 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_BLUETOOTH: transports += "BLUETOOTH"; break;
case TRANSPORT_ETHERNET: transports += "ETHERNET"; break; case TRANSPORT_ETHERNET: transports += "ETHERNET"; break;
case TRANSPORT_VPN: transports += "VPN"; break; case TRANSPORT_VPN: transports += "VPN"; break;
case TRANSPORT_WIFI_NAN: transports += "WIFI_NAN"; break;
} }
if (++i < types.length) transports += "|"; if (++i < types.length) transports += "|";
} }