commit 42f181ed4277890489be016939209952959d5416
author Jeff Davidson <jpd@google.com> Fri Oct 31 15:51:36 2014 -0700
committer Jeff Davidson <jpd@google.com> Fri Oct 31 16:42:54 2014 -0700
tree 65412706114ba9733817d165fb03525c4984365a
parent efad8ec6cb12e5658ee0288cc7e5aa755267aeb6

Propagate WifiConfiguration ephemeral bit to ScanResult.

Bug: 18206244
Change-Id: I82e8a359db32a84145716b43d8438767959a00b3

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

diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index c4d022f..5ff0e32 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -3242,6 +3242,12 @@
                     scanResult.isAutoJoinCandidate = result.isAutoJoinCandidate;
                 }
 
+                if (config.ephemeral) {
+                    // For an ephemeral Wi-Fi config, the ScanResult should be considered
+                    // untrusted.
+                    scanResult.untrusted = true;
+                }
+
                 // Add the scan result to this WifiConfiguration
                 config.scanResultCache.put(scanResult.BSSID, scanResult);
                 // Since we added a scan result to this configuration, re-attempt linking