| commit | fc9f86a1571df1643e31f8b102c123065b41681e | [log] [tgz] |
|---|---|---|
| author | Gabriel Biren <gbiren@google.com> | Tue Oct 18 17:58:22 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 18 17:58:22 2022 +0000 |
| tree | 4864a7a5d4ec7747042c41ca9ce65406a38436dd | |
| parent | 6a37a5c5e58e32e15131c66597749ef0c080f442 [diff] | |
| parent | eb25ad26927873b3da86ff8731d41ce0dc2a803a [diff] |
Merge "Add a null pointer check for wifi_chip in configureChipToSupportIfaceTypeInternal." am: 46417dd857 am: eb25ad2692 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2256003 Change-Id: I472e4d1394b8b1de94547da0d01334f1eb514bff 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);