diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-01-31 00:28:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-31 00:28:46 +0000 |
| commit | 25f6df973096317d0d622d3b365225b779ec5cca (patch) | |
| tree | 70c77aa96ea51682f995524c13e9ef07e094224b /tests | |
| parent | 2eb2805d3d299a5819fa0324db71d0864efaa3f2 (diff) | |
| parent | 81b71447ffee22ff766440cb953b7121ff1e951b (diff) | |
Merge changes I1c3da844,I6ff7a104
* changes:
WifiScanningService: Process getAvailableChannels on main thread
WifiServiceImpl: Check for null pointer in updateSoftApCapability
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java index 1544b6d5b..137680c4b 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java @@ -3528,8 +3528,10 @@ public class WifiScanningServiceTest extends WifiBaseTest { doNothing().when(mWifiPermissionsUtil).enforceCanAccessScanResultsForWifiScanner( TEST_PACKAGE_NAME, TEST_FEATURE_ID, Binder.getCallingUid(), false, false); + mLooper.startAutoDispatch(); Bundle bundle = mWifiScanningServiceImpl.getAvailableChannels( WifiScanner.WIFI_BAND_24_GHZ, TEST_PACKAGE_NAME, TEST_FEATURE_ID); + mLooper.stopAutoDispatchAndIgnoreExceptions(); List<Integer> actual = bundle.getIntegerArrayList(GET_AVAILABLE_CHANNELS_EXTRA); List<Integer> expected = Arrays.asList(2400, 2450); |