diff options
| author | Ningyuan Wang <nywang@google.com> | 2017-03-28 16:21:33 -0700 |
|---|---|---|
| committer | Ningyuan Wang <nywang@google.com> | 2017-03-28 16:45:25 -0700 |
| commit | 8a9a103245ecfaf2c596603ccef884b870509566 (patch) | |
| tree | c770fd3d5175c1db87695852de0212110f56bd20 /service/java/com/android/server/wifi/scanner | |
| parent | bb2fdf553e6580923e1dc3e6ac90ca777c5d7226 (diff) | |
| download | android_frameworks_opt_net_wifi-8a9a103245ecfaf2c596603ccef884b870509566.tar.gz android_frameworks_opt_net_wifi-8a9a103245ecfaf2c596603ccef884b870509566.tar.bz2 android_frameworks_opt_net_wifi-8a9a103245ecfaf2c596603ccef884b870509566.zip | |
Fix hidden network list comparision for scan merging
This fixes the case where we reject the scan merging
because we think a null hidden network list and an empty hidden
network list is practically different.
Bug: 36697185
Test: compile, unit tests, integration test
Change-Id: Ib0185f3ad962805b1939d2d108f82506eccf5940
Diffstat (limited to 'service/java/com/android/server/wifi/scanner')
| -rw-r--r-- | service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java index 535866d7e..b766db3a6 100644 --- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java @@ -48,6 +48,7 @@ import android.util.Pair; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.IBatteryStats; +import com.android.internal.util.ArrayUtils; import com.android.internal.util.AsyncChannel; import com.android.internal.util.Protocol; import com.android.internal.util.State; @@ -738,8 +739,8 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { return false; } - if (settings.hiddenNetworks != null) { - if (mActiveScanSettings.hiddenNetworks == null) { + if (!ArrayUtils.isEmpty(settings.hiddenNetworks)) { + if (ArrayUtils.isEmpty(mActiveScanSettings.hiddenNetworks)) { return false; } List<WifiNative.HiddenNetwork> activeHiddenNetworks = new ArrayList<>(); |