commit 4382c93af4f79786ece40ebedc12f77d1aeb80ca
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Oct 13 16:31:25 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 13 16:31:26 2016 +0000
tree 67f403989e9e3cbede472e6efa6cfc47b7002006
parent a2c3c8bbe47826e6f941d4ad7a2fa4be76da1503
parent affb7a1ef39dba5ec6febdf7fafc76cc52db9aca

Merge "Do not send ANQP queries when no Hotspot 2.0 provider is configured" into nyc-mr1-dev

service/java/com/android/server/wifi/WifiConfigManager.java

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 94879a0..4a27fef 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -2457,20 +2457,8 @@
     }
 
     private Map<HomeSP, PasspointMatch> matchPasspointNetworks(ScanDetail scanDetail) {
+        // Nothing to do if no Hotspot 2.0 provider is configured.
         if (!mMOManager.isConfigured()) {
-            if (mEnableOsuQueries) {
-                NetworkDetail networkDetail = scanDetail.getNetworkDetail();
-                List<Constants.ANQPElementType> querySet =
-                        ANQPFactory.buildQueryList(networkDetail, false, true);
-
-                if (networkDetail.queriable(querySet)) {
-                    querySet = mAnqpCache.initiate(networkDetail, querySet);
-                    if (querySet != null) {
-                        mSupplicantBridge.startANQP(scanDetail, querySet);
-                    }
-                    updateAnqpCache(scanDetail, networkDetail.getANQPElements());
-                }
-            }
             return null;
         }
         NetworkDetail networkDetail = scanDetail.getNetworkDetail();