Merge "[NAN-AWARE] Rename NAN to Aware" (65710071) · Commits · e / os / android_frameworks_base

Android.mk

+6 −6

Original line number	Diff line number	Diff line
		@@ -456,9 +456,9 @@ LOCAL_SRC_FILES += \
		telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
		telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
		wifi/java/android/net/wifi/IWifiManager.aidl \
		wifi/java/android/net/wifi/nan/IWifiNanEventCallback.aidl \
		wifi/java/android/net/wifi/nan/IWifiNanManager.aidl \
		wifi/java/android/net/wifi/nan/IWifiNanDiscoverySessionCallback.aidl \
		wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.aidl \
		wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl \
		wifi/java/android/net/wifi/aware/IWifiAwareDiscoverySessionCallback.aidl \
		wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
		wifi/java/android/net/wifi/IWifiScanner.aidl \
		wifi/java/android/net/wifi/IRttManager.aidl \
		@@ -548,9 +548,9 @@ aidl_files := \
		frameworks/base/media/java/android/media/tv/TvTrackInfo.aidl \
		frameworks/base/media/java/android/media/browse/MediaBrowser.aidl \
		frameworks/base/wifi/java/android/net/wifi/ScanSettings.aidl \
		frameworks/base/wifi/java/android/net/wifi/nan/ConfigRequest.aidl \
		frameworks/base/wifi/java/android/net/wifi/nan/PublishConfig.aidl \
		frameworks/base/wifi/java/android/net/wifi/nan/SubscribeConfig.aidl \
		frameworks/base/wifi/java/android/net/wifi/aware/ConfigRequest.aidl \
		frameworks/base/wifi/java/android/net/wifi/aware/PublishConfig.aidl \
		frameworks/base/wifi/java/android/net/wifi/aware/SubscribeConfig.aidl \
		frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pInfo.aidl \
		frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pDeviceList.aidl \
		frameworks/base/wifi/java/android/net/wifi/p2p/WifiP2pConfig.aidl \

core/java/android/app/SystemServiceRegistry.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -84,8 +84,8 @@ import android.net.wifi.IWifiScanner;
		import android.net.wifi.RttManager;
		import android.net.wifi.WifiManager;
		import android.net.wifi.WifiScanner;
		import android.net.wifi.nan.IWifiNanManager;
		import android.net.wifi.nan.WifiNanManager;
		import android.net.wifi.aware.IWifiAwareManager;
		import android.net.wifi.aware.WifiAwareManager;
		import android.net.wifi.p2p.IWifiP2pManager;
		import android.net.wifi.p2p.WifiP2pManager;
		import android.nfc.NfcManager;
		@@ -514,16 +514,16 @@ final class SystemServiceRegistry {
		return new WifiP2pManager(service);
		}});

		registerService(Context.WIFI_NAN_SERVICE, WifiNanManager.class,
		new CachedServiceFetcher<WifiNanManager>() {
		registerService(Context.WIFI_AWARE_SERVICE, WifiAwareManager.class,
		new CachedServiceFetcher<WifiAwareManager>() {
		@Override
		public WifiNanManager createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(Context.WIFI_NAN_SERVICE);
		IWifiNanManager service = IWifiNanManager.Stub.asInterface(b);
		public WifiAwareManager createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(Context.WIFI_AWARE_SERVICE);
		IWifiAwareManager service = IWifiAwareManager.Stub.asInterface(b);
		if (service == null) {
		return null;
		}
		return new WifiNanManager(ctx.getOuterContext(), service);
		return new WifiAwareManager(ctx.getOuterContext(), service);
		}});

		registerService(Context.WIFI_SCANNING_SERVICE, WifiScanner.class,

core/java/android/content/Context.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -2667,7 +2667,7 @@ public abstract class Context {
		NETWORK_STATS_SERVICE,
		//@hide: NETWORK_POLICY_SERVICE,
		WIFI_SERVICE,
		WIFI_NAN_SERVICE,
		WIFI_AWARE_SERVICE,
		WIFI_P2P_SERVICE,
		WIFI_SCANNING_SERVICE,
		//@hide: WIFI_RTT_SERVICE,
		@@ -3139,14 +3139,14 @@ public abstract class Context {

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.net.wifi.nan.WifiNanManager} for handling management of
		* Wi-Fi NAN.
		* {@link android.net.wifi.aware.WifiAwareManager} for handling management of
		* Wi-Fi Aware.
		*
		* @see #getSystemService
		* @see android.net.wifi.nan.WifiNanManager
		* @hide PROPOSED_NAN_API
		* @see android.net.wifi.aware.WifiAwareManager
		* @hide PROPOSED_AWARE_API
		*/
		public static final String WIFI_NAN_SERVICE = "wifinan";
		public static final String WIFI_AWARE_SERVICE = "wifiaware";

		/**
		* Use with {@link #getSystemService} to retrieve a {@link

core/java/android/content/pm/PackageManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -2040,12 +2040,12 @@ public abstract class PackageManager {

		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The device supports Wi-Fi NAN.
		* {@link #hasSystemFeature}: The device supports Wi-Fi Aware.
		*
		* @hide PROPOSED_NAN_API
		* @hide PROPOSED_AWARE_API
		*/
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_WIFI_NAN = "android.hardware.wifi.nan";
		public static final String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware";

		/**
		* Feature for {@link #getSystemAvailableFeatures} and

core/java/android/net/NetworkCapabilities.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -419,14 +419,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.
		@@ -896,7 +896,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 += "\|";
		}