Merge commit '4da98e32a7c53663b1af4d979b27df214a3d3b46' into HEAD
* commit '4da98e32a7c53663b1af4d979b27df214a3d3b46': (65 commits)
wifinative jni: check array length to prevent stack overflow
Do not send ANQP queries when no Hotspot 2.0 provider is configured
Add more capable Settings abstractions to accomodate IpManager
WCM: forced connectivity scan
Ignore disconnect messages that don't indicate the channel is dead
Wifi Metrics: dumpsys arg for clean output
WifiStateMachine: Switch to ACTION_LOCKED_BOOT_COMPLETED
Add a flag to indicate if a ScanData is for a scan for all channels
WSM: Fix roaming log message
QNS: currently connected network BSSID
Define and track Wifi scores to report Wifi metrics
WiFiMetrics: Count hidden & passpoint networks
WiFiMetrics: Add LastResortWatchdog success metric
WifiMetrics: add metric for alert reasons
Configure code coverage filter.
DO NOT MERGE: Remove spam logs for Wifi RTT
Some networks can not connect automatically.
Instrument wifi-service when EMMA_INSTRUMENT_FRAMEWORK is true.
SupplicantWifiScannerImpl: Restart PNO on settings change
SupplicantWifiScannerImpl: Ignore PNO stop failure
...
Conflicts:
service/java/com/android/server/wifi/SoftApManager.java
service/java/com/android/server/wifi/WifiConnectivityManager.java
service/java/com/android/server/wifi/WifiController.java
service/java/com/android/server/wifi/WifiCountryCode.java
service/java/com/android/server/wifi/WifiMetrics.java
service/java/com/android/server/wifi/WifiQualifiedNetworkSelector.java
service/java/com/android/server/wifi/WifiServiceImpl.java
service/java/com/android/server/wifi/WifiStateMachine.java
service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
Change-Id: I147828805fe97cf04d9d84650649edf2b28c15fa