0413327d741fe7246f9d5bf508da6f6b6a6a7476 - SHIFTPHONES/android_frameworks_base

commit	0413327d741fe7246f9d5bf508da6f6b6a6a7476	[log] [tgz]
author	Etan Cohen <etancohen@google.com>	Wed Oct 26 11:22:06 2016 -0700
committer	Etan Cohen <etancohen@google.com>	Fri Nov 04 15:42:08 2016 -0700
tree	e9db0bfba2a1240ecf7223082de4654b402c2a85
parent	5963fd864be3e88a87d488ad18ba9ed512c250cb [diff]

[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 a61b9fb569153917a650f1d48efa20ba8846a9f3)
(cherry-pick of commit b061f21e7e59a99834e163e2baa1c82229e419a6)

Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Change-Id: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614

Android.mk[diff]
core/java/android/app/SystemServiceRegistry.java[diff]
core/java/android/content/Context.java[diff]
core/java/android/content/pm/PackageManager.java[diff]
core/java/android/net/NetworkCapabilities.java[diff]
core/res/AndroidManifest.xml[diff]
services/java/com/android/server/SystemServer.java[diff]
wifi/java/android/net/wifi/WifiManager.java[diff]
wifi/java/android/net/wifi/aware/ConfigRequest.aidl[Renamed from wifi/java/android/net/wifi/nan/ConfigRequest.aidl - diff]
wifi/java/android/net/wifi/aware/ConfigRequest.java[Renamed from wifi/java/android/net/wifi/nan/ConfigRequest.java - diff]
wifi/java/android/net/wifi/aware/IWifiAwareDiscoverySessionCallback.aidl[Renamed from wifi/java/android/net/wifi/nan/IWifiNanDiscoverySessionCallback.aidl - diff]
wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.aidl[Renamed from wifi/java/android/net/wifi/nan/IWifiNanEventCallback.aidl - diff]
wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl[Renamed from wifi/java/android/net/wifi/nan/IWifiNanManager.aidl - diff]
wifi/java/android/net/wifi/aware/LvBufferUtils.java[Renamed from wifi/java/android/net/wifi/nan/LvBufferUtils.java - diff]
wifi/java/android/net/wifi/aware/PublishConfig.aidl[Renamed from wifi/java/android/net/wifi/nan/PublishConfig.aidl - diff]
wifi/java/android/net/wifi/aware/PublishConfig.java[Renamed from wifi/java/android/net/wifi/nan/PublishConfig.java - diff]
wifi/java/android/net/wifi/aware/SubscribeConfig.aidl[Renamed from wifi/java/android/net/wifi/nan/SubscribeConfig.aidl - diff]
wifi/java/android/net/wifi/aware/SubscribeConfig.java[Renamed from wifi/java/android/net/wifi/nan/SubscribeConfig.java - diff]
wifi/java/android/net/wifi/aware/TlvBufferUtils.java[Renamed from wifi/java/android/net/wifi/nan/TlvBufferUtils.java - diff]
wifi/java/android/net/wifi/aware/WifiAwareAttachCallback.java[Added - diff]
wifi/java/android/net/wifi/aware/WifiAwareCharacteristics.aidl[Renamed from wifi/java/android/net/wifi/nan/WifiNanCharacteristics.aidl - diff]
wifi/java/android/net/wifi/aware/WifiAwareCharacteristics.java[Renamed from wifi/java/android/net/wifi/nan/WifiNanCharacteristics.java - diff]
wifi/java/android/net/wifi/aware/WifiAwareDiscoveryBaseSession.java[Renamed from wifi/java/android/net/wifi/nan/WifiNanDiscoveryBaseSession.java - diff]
wifi/java/android/net/wifi/aware/WifiAwareDiscoverySessionCallback.java[Renamed from wifi/java/android/net/wifi/nan/WifiNanDiscoverySessionCallback.java - diff]
wifi/java/android/net/wifi/aware/WifiAwareIdentityChangedListener.java[Renamed from wifi/java/android/net/wifi/nan/WifiNanIdentityChangedListener.java - diff]
wifi/java/android/net/wifi/aware/WifiAwareManager.java[Renamed from wifi/java/android/net/wifi/nan/WifiNanManager.java - diff]
wifi/java/android/net/wifi/aware/WifiAwarePublishDiscoverySession.java[Renamed from wifi/java/android/net/wifi/nan/WifiNanPublishDiscoverySession.java - diff]
wifi/java/android/net/wifi/aware/WifiAwareSession.java[Renamed from wifi/java/android/net/wifi/nan/WifiNanSession.java - diff]
wifi/java/android/net/wifi/aware/WifiAwareSubscribeDiscoverySession.java[Renamed from wifi/java/android/net/wifi/nan/WifiNanSubscribeDiscoverySession.java - diff]
wifi/java/android/net/wifi/aware/WifiAwareUtils.java[Renamed from wifi/java/android/net/wifi/nan/WifiNanUtils.java - diff]
wifi/java/android/net/wifi/aware/package.html[Added - diff]
wifi/java/android/net/wifi/nan/WifiNanAttachCallback.java[Deleted - diff]
wifi/java/android/net/wifi/nan/package.html[Deleted - diff]

33 files changed

tree: e9db0bfba2a1240ecf7223082de4654b402c2a85