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

Merge "[NAN-AWARE] Rename NAN to Aware"

Browse Source 
am: 6c75254555

Change-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf
This commit is contained in:
Etan Cohen
2016-11-06 03:13:31 +00:00
committed by android-build-merger
parent bca2d211f6 6c75254555
commit 4ddc6321ef
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -419,14 +419,14 @@ 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. * Indicates this network uses a Wi-Fi Aware transport.
* *
* @hide PROPOSED_NAN_API * @hide PROPOSED_AWARE_API
*/ */
public static final int TRANSPORT_WIFI_NAN = 5; public static final int TRANSPORT_WIFI_AWARE = 5;
private static final int MIN_TRANSPORT = TRANSPORT_CELLULAR; private static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;
private static final int MAX_TRANSPORT = TRANSPORT_WIFI_NAN; private static final int MAX_TRANSPORT = TRANSPORT_WIFI_AWARE;
/** /**
* Adds the given transport type to this {@code NetworkCapability} instance. * Adds the given transport type to this {@code NetworkCapability} instance.
@@ -896,7 +896,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; case TRANSPORT_WIFI_AWARE: transports += "WIFI_AWARE"; break;
} }
if (++i < types.length) transports += "|"; if (++i < types.length) transports += "|";
} }