| commit | 336c45c95d15715843ff9dc0da259ac4919ada31 | [log] [tgz] |
|---|---|---|
| author | Gabriel Biren <gbiren@google.com> | Tue Oct 18 18:30:12 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 18 18:30:12 2022 +0000 |
| tree | d711b56fcd09dbc18e8d2465baf01f238e96f828 | |
| parent | a55c51a8e1670fa6d4316e0e0cfdc855060b1455 [diff] | |
| parent | fc9f86a1571df1643e31f8b102c123065b41681e [diff] |
Merge "Add a null pointer check for wifi_chip in configureChipToSupportIfaceTypeInternal." am: 46417dd857 am: eb25ad2692 am: fc9f86a157 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2256003 Change-Id: I474e0c383db003edf0a046f41810bf1b5fb0f1de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp index e6e61cf..02f8209 100644 --- a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp +++ b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp
@@ -66,7 +66,7 @@ bool configureChipToSupportIfaceTypeInternal(const sp<IWifiChip>& wifi_chip, IfaceType type, ChipModeId* configured_mode_id) { - if (!configured_mode_id) { + if (!configured_mode_id || !wifi_chip.get()) { return false; } const auto& status_and_modes = HIDL_INVOKE(wifi_chip, getAvailableModes);