diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 07:07:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 07:07:13 +0000 |
| commit | 8b7d6d5c24277e5fd94912e6f30b2ac3e1011c89 (patch) | |
| tree | 6ba907e026232fc68730c76aaa227eba4705eb63 | |
| parent | 9f31c318e42e99a7f575fc40c4c26135797227b4 (diff) | |
| parent | c5bd4191e2952427f8d8f3c313beaaa6d8542edd (diff) | |
Merge "[WifiTrackerLib] Ignore broadcast passpoint wificonfig in Saved Networks" into rvc-dev am: 69416dd547 am: c5bd4191e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/11714198
Change-Id: If631b10b2b9f21da59986fe43fca1ba19d6296d5
| -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 = |