diff options
author | Etan Cohen <etancohen@google.com> | 2018-01-25 08:46:40 -0800 |
---|---|---|
committer | Etan Cohen <etancohen@google.com> | 2018-01-25 08:46:40 -0800 |
commit | cbb5e75675aa9640e4c49eff10074fa194f450a8 (patch) | |
tree | da56f0c9907be590eaf2b0153a88169a0ca13005 /tests | |
parent | 7eac1e20f0afc510535cd6de1024309f1adb9b4e (diff) | |
download | android_frameworks_opt_net_wifi-cbb5e75675aa9640e4c49eff10074fa194f450a8.tar.gz android_frameworks_opt_net_wifi-cbb5e75675aa9640e4c49eff10074fa194f450a8.tar.bz2 android_frameworks_opt_net_wifi-cbb5e75675aa9640e4c49eff10074fa194f450a8.zip |
[RTT] Run HDM status change listener on a local handler
Specify a local handler on which to run the HDM status change
listener. Otherwise (with null) the status listener is run synchronous/
blocking (inline) and is causing deadlock.
Bug: 72463371
Test: unit test, integration test
Change-Id: I20cfc4ffe05307b30623cdd435aaa7275290b406
Diffstat (limited to 'tests')
-rw-r--r-- | tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java | 2 | ||||
-rw-r--r-- | tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java b/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java index 3f64de972..6048e52d8 100644 --- a/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java +++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java @@ -88,7 +88,7 @@ public class RttNativeTest { when(mockRttController.rangeCancel(anyInt(), any(ArrayList.class))).thenReturn(status); mDut = new RttNative(mockRttServiceImpl, mockHalDeviceManager); - mDut.start(); + mDut.start(null); verify(mockHalDeviceManager).registerStatusListener(mHdmStatusListener.capture(), any()); verify(mockRttController).registerEventCallback(any()); verify(mockRttServiceImpl).enableIfPossible(); diff --git a/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java index 838d3796b..fc7112aaa 100644 --- a/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java @@ -207,7 +207,7 @@ public class RttServiceImplTest { BroadcastReceiver.class); verify(mockContext, times(2)).registerReceiver(bcastRxCaptor.capture(), any(IntentFilter.class)); - verify(mockNative).start(); + verify(mockNative).start(any()); mPowerBcastReceiver = bcastRxCaptor.getAllValues().get(0); mLocationModeReceiver = bcastRxCaptor.getAllValues().get(1); |