OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c5c74f9) | patch
[NAN-AWARE] Rename NAN to Aware
authorEtan Cohen <etancohen@google.com>
Wed, 26 Oct 2016 18:22:06 +0000 (11:22 -0700)
committerEtan Cohen <etancohen@google.com>
Sat, 5 Nov 2016 16:41:38 +0000 (09:41 -0700)
commit0849ded00879dc05175c079011aa038c5ba0770a
tree19718427dfbe6a605d34817950923f7ecf8d3e7dtree | snapshot
parentc5c74f9f495e6501c38801ab65e985c8457df7e7commit | 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)

Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
Change-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc
31 files changed:
Android.mk diff | blob | history
core/java/android/app/SystemServiceRegistry.java diff | blob | history
core/java/android/content/Context.java diff | blob | history
core/java/android/content/pm/PackageManager.java diff | blob | history
core/java/android/net/NetworkCapabilities.java diff | blob | history
core/res/AndroidManifest.xml diff | blob | history
services/java/com/android/server/SystemServer.java diff | blob | history
wifi/java/android/net/wifi/WifiManager.java diff | blob | history
wifi/java/android/net/wifi/aware/ConfigRequest.aidl [moved from wifi/java/android/net/wifi/nan/ConfigRequest.aidl with 95% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/ConfigRequest.java [moved from wifi/java/android/net/wifi/nan/ConfigRequest.java with 96% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/IWifiAwareDiscoverySessionCallback.aidl [moved from wifi/java/android/net/wifi/nan/IWifiNanDiscoverySessionCallback.aidl with 88% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.aidl [moved from wifi/java/android/net/wifi/nan/IWifiNanEventCallback.aidl with 85% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl [moved from wifi/java/android/net/wifi/nan/IWifiNanManager.aidl with 71% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/LvBufferUtils.java [moved from wifi/java/android/net/wifi/nan/LvBufferUtils.java with 99% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/PublishConfig.aidl [moved from wifi/java/android/net/wifi/nan/PublishConfig.aidl with 95% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/PublishConfig.java [moved from wifi/java/android/net/wifi/nan/PublishConfig.java with 93% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/SubscribeConfig.aidl [moved from wifi/java/android/net/wifi/nan/SubscribeConfig.aidl with 95% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/SubscribeConfig.java [moved from wifi/java/android/net/wifi/nan/SubscribeConfig.java with 93% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/TlvBufferUtils.java [moved from wifi/java/android/net/wifi/nan/TlvBufferUtils.java with 99% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/WifiAwareAttachCallback.java [moved from wifi/java/android/net/wifi/nan/WifiNanAttachCallback.java with 50% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/WifiAwareCharacteristics.aidl [moved from wifi/java/android/net/wifi/nan/WifiNanCharacteristics.aidl with 90% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/WifiAwareCharacteristics.java [moved from wifi/java/android/net/wifi/nan/WifiNanCharacteristics.java with 73% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/WifiAwareDiscoveryBaseSession.java [moved from wifi/java/android/net/wifi/nan/WifiNanDiscoveryBaseSession.java with 70% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/WifiAwareDiscoverySessionCallback.java [moved from wifi/java/android/net/wifi/nan/WifiNanDiscoverySessionCallback.java with 66% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/WifiAwareIdentityChangedListener.java [moved from wifi/java/android/net/wifi/nan/WifiNanIdentityChangedListener.java with 75% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/WifiAwareManager.java [moved from wifi/java/android/net/wifi/nan/WifiNanManager.java with 76% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/WifiAwarePublishDiscoverySession.java [moved from wifi/java/android/net/wifi/nan/WifiNanPublishDiscoverySession.java with 65% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/WifiAwareSession.java [moved from wifi/java/android/net/wifi/nan/WifiNanSession.java with 66% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/WifiAwareSubscribeDiscoverySession.java [moved from wifi/java/android/net/wifi/nan/WifiNanSubscribeDiscoverySession.java with 66% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/WifiAwareUtils.java [moved from wifi/java/android/net/wifi/nan/WifiNanUtils.java with 94% similarity] diff | blob | history
wifi/java/android/net/wifi/aware/package.html [moved from wifi/java/android/net/wifi/nan/package.html with 50% similarity] diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help