commit d0a7e444a6af85ccaa03e52bcb82de7f66033cfb
author Samuel Tan <samueltan@google.com> Fri Jul 08 14:32:19 2016 -0700
committer Samuel Tan <samueltan@google.com> Fri Jul 08 14:37:17 2016 -0700
tree 8e1396a4ebf20542b19553b088feff514c174d5e
parent da2e11e7e8ba2cc022c9c74e659ada9f1f27382e

ScanDetail: set scan result passpoint flag in constructor

ScanDetail does not set the ScanResult.FLAG_PASSPOINT_NETWORK flag
for its |mScanResult| member in its constructor. This causes
problems when in WifiTracker, which uses this flag from the
ScanResult to determine whether or not to associate Passpoint configs
with Passpoint access points.

Fix this by setting this flag in the ScanDetail constructor.

BUG: 29550309
TEST: Manually verify that the "Available via $PROVIDER" subtext
      appears under the SSIDs of Passpoint networks, when we have
      the credentials for connecting to these passpoint networks
      installed, but are currently connected to a non-Passpoint
      network.

Change-Id: I1da2c0eff336331deae4dbd86f4c6afc3d456db9

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

diff --git a/service/java/com/android/server/wifi/ScanDetail.java b/service/java/com/android/server/wifi/ScanDetail.java
index 1a5a923..dc87a5b 100644
--- a/service/java/com/android/server/wifi/ScanDetail.java
+++ b/service/java/com/android/server/wifi/ScanDetail.java
@@ -59,6 +59,9 @@
         if (networkDetail.is80211McResponderSupport()) {
             mScanResult.setFlag(ScanResult.FLAG_80211mc_RESPONDER);
         }
+        if (networkDetail.isInterworking()) {
+            mScanResult.setFlag(ScanResult.FLAG_PASSPOINT_NETWORK);
+        }
         mMatches = null;
     }