From cd74c391a3f63aca29b861e2b6c43ac2ed55913d Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Tue, 2 Jun 2020 19:44:04 -0700 Subject: [WifiTrackerLib] Ignore broadcast passpoint wificonfig in Saved Networks Ignore WifiConfigurations for passpoint that are broadcasted through CONFIGURED_NETWORKS_CHANGED in the Saved Networks Page, since this will be mistakenly interpreted as an added saved network. Bug: 158043510 Test: manual visual verification of Saved Networks Page not showing the broadcasted passpoint wificonfig as a saved network. Change-Id: Icfd746c86bee3c7b06252f79977e5ba87ea30b6e --- .../src/com/android/wifitrackerlib/SavedNetworkTracker.java | 3 +-- .../src/com/android/wifitrackerlib/WifiPickerTracker.java | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'libs') diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java index c6b5454b0..df931f878 100644 --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java @@ -143,7 +143,6 @@ public class SavedNetworkTracker extends BaseWifiTracker { @WorkerThread @Override protected void handleScanResultsAvailableAction(@Nullable Intent intent) { - //TODO(b/70983952): Add PasspointWifiEntry and update their scans here. checkNotNull(intent, "Intent cannot be null!"); conditionallyUpdateScanResults(intent.getBooleanExtra(WifiManager.EXTRA_RESULTS_UPDATED, true /* defaultValue */)); @@ -158,7 +157,7 @@ public class SavedNetworkTracker extends BaseWifiTracker { final WifiConfiguration config = (WifiConfiguration) intent.getExtra(WifiManager.EXTRA_WIFI_CONFIGURATION); - if (config != null) { + if (config != null && !config.isPasspoint()) { updateStandardWifiEntryConfig( config, (Integer) intent.getExtra(WifiManager.EXTRA_CHANGE_REASON)); } else { diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java index 734779a2d..170dd4ecd 100644 --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java @@ -218,7 +218,6 @@ public class WifiPickerTracker extends BaseWifiTracker { @WorkerThread @Override protected void handleConfiguredNetworksChangedAction(@NonNull Intent intent) { - // TODO(b/70983952): Handle Passpoint configurations here checkNotNull(intent, "Intent cannot be null!"); final WifiConfiguration config = -- cgit v1.2.3