diff options
Diffstat (limited to 'service/java/com/android/server/wifi/WifiNetworkFactory.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNetworkFactory.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/WifiNetworkFactory.java b/service/java/com/android/server/wifi/WifiNetworkFactory.java index 1bd93c635..5f327e553 100644 --- a/service/java/com/android/server/wifi/WifiNetworkFactory.java +++ b/service/java/com/android/server/wifi/WifiNetworkFactory.java @@ -226,7 +226,15 @@ public class WifiNetworkFactory extends NetworkFactory { approvedScanResult = findUserApprovedAccessPointForActiveRequestFromActiveMatchedScanResults(); } - if (approvedScanResult == null) { + if (approvedScanResult != null + && !mWifiConfigManager.wasEphemeralNetworkDeleted( + ScanResultUtil.createQuotedSSID(approvedScanResult.SSID))) { + Log.v(TAG, "Approved access point found in matching scan results. " + + "Triggering connect " + approvedScanResult); + handleConnectToNetworkUserSelectionInternal( + ScanResultUtil.createNetworkFromScanResult(approvedScanResult)); + // TODO (b/122658039): Post notification. + } else { if (mVerboseLoggingEnabled) { Log.v(TAG, "No approved access points found in matching scan results. " + "Sending match callback"); @@ -234,12 +242,6 @@ public class WifiNetworkFactory extends NetworkFactory { sendNetworkRequestMatchCallbacksForActiveRequest(matchedScanResults); // Didn't find an approved match, schedule the next scan. scheduleNextPeriodicScan(); - } else { - Log.v(TAG, "Approved access point found in matching scan results. " - + "Triggering connect " + approvedScanResult); - handleConnectToNetworkUserSelectionInternal( - ScanResultUtil.createNetworkFromScanResult(approvedScanResult)); - // TODO (b/122658039): Post notification. } } |