From 7e93db5bdaf30560f2258099ef62b46a0cc85312 Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Wed, 26 Oct 2016 11:22:06 -0700 Subject: [PATCH] [NAN-AWARE] Rename NAN to Aware ~Rename only (and any reformatting needed to pass lint) - no functional changes! Remove android.net.wifi.nan.STATE_CHANGED from manifest: redundant/remnant of an older configuration. (cherry-pick of commit a0edbf0ac82f6d6809ed70e4010141b70a044c7f) Bug: 32263750 Test: All unit tests and integration (sl4a) tests pass. Merged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614 Change-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc --- core/java/android/net/NetworkCapabilities.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index ebb9601a75..cbb6dfe75f 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -406,14 +406,14 @@ public final class NetworkCapabilities implements Parcelable { 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 MAX_TRANSPORT = TRANSPORT_WIFI_NAN; + private static final int MAX_TRANSPORT = TRANSPORT_WIFI_AWARE; /** * Adds the given transport type to this {@code NetworkCapability} instance. @@ -869,7 +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; + case TRANSPORT_WIFI_AWARE: transports += "WIFI_AWARE"; break; } if (++i < types.length) transports += "|"; }