commit 255d41dce1194b2edf3c4c1a5ece7f764fd40707
author Jan Nordqvist <jannq@google.com> Tue Sep 22 15:54:32 2015 -0700
committer Randy Pan <zpan@google.com> Thu Dec 10 16:06:50 2015 -0800
tree f95c1b20723c508836c229b14030e5dd09084b67
parent d0266d3b63ea48a1d8bac412f5564c2a909926d9

DO NOT MERGE Hotspot 2.0 relase 2 first cut.

CP mods to take a URL as a parameter, and new ScanInfo object.

Cherry-picked from 52eb29f0822f129f2b14bacec23dd492f2260ac0
Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635

Android.mk

diff --git a/Android.mk b/Android.mk
index ce01c20..f2bd387 100644
--- a/Android.mk
+++ b/Android.mk
@@ -482,6 +482,7 @@
 	frameworks/base/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl \
 	frameworks/base/wifi/java/android/net/wifi/WpsInfo.aidl \
 	frameworks/base/wifi/java/android/net/wifi/ScanResult.aidl \
+        frameworks/base/wifi/java/android/net/wifi/ScanInfo.aidl \
 	frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.aidl \
 	frameworks/base/wifi/java/android/net/wifi/WifiConfiguration.aidl \
 	frameworks/base/wifi/java/android/net/wifi/WifiInfo.aidl \