From 81b71447ffee22ff766440cb953b7121ff1e951b Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Thu, 30 Jan 2020 07:37:34 -0800 Subject: WifiScanningService: Process getAvailableChannels on main thread Ensure that we process the incoming API call in the wifi scanner service thead (and not in the caller's thread). Bug: 148571383 Test: atest com.android.server.wifi.scanner Change-Id: I1c3da844a3ec4256ea3e2e03e640fa55f690e8df --- .../src/com/android/server/wifi/scanner/WifiScanningServiceTest.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests') 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 actual = bundle.getIntegerArrayList(GET_AVAILABLE_CHANNELS_EXTRA); List expected = Arrays.asList(2400, 2450); -- cgit v1.2.3