diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 06:40:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-03 06:40:50 +0000 |
| commit | 69416dd547b00d612ef5795f07de09fcacfb67fc (patch) | |
| tree | fcd49752d1f5a74344c82562ec0dac68c15f3d98 | |
| parent | 7406fac7e4550b239dfa2a6f53b83a79042a5e1b (diff) | |
| parent | cd74c391a3f63aca29b861e2b6c43ac2ed55913d (diff) | |
Merge "[WifiTrackerLib] Ignore broadcast passpoint wificonfig in Saved Networks" into rvc-dev
| -rw-r--r-- | libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java | 3 | ||||
| -rw-r--r-- | libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java | 1 |
2 files changed, 1 insertions, 3 deletions
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 = |