| commit | f9e793fd364da7d7fc68098b5a7be9fe285c826c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Aug 17 00:55:02 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 17 00:55:02 2022 +0000 |
| tree | 8761b35261e1a253571a74deea44d7a71157c268 | |
| parent | 336046aab98ac5a4e983a7729ebe6a5d6cd3d652 [diff] | |
| parent | e98da51c506b88a16fa80f7a525148cb94804fae [diff] |
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 6292dfa6fa -s ours am: 44da7036d9 -s ours am: e98da51c50 -s ours am skip reason: Merged-In Ib339b0c7d4b5a1e1b2bb34da22755dd14100a08e with SHA-1 2f505b4695 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/2186751 Change-Id: Id688274a1293bc78e8693ede90fa1e5f14f21f1b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bcmdhd/wifi_hal/nan.cpp b/bcmdhd/wifi_hal/nan.cpp index 52f29e3..8b9bec4 100755 --- a/bcmdhd/wifi_hal/nan.cpp +++ b/bcmdhd/wifi_hal/nan.cpp
@@ -4413,7 +4413,8 @@ ALOGE("Disable NAN MAC transId= %d\n", id); mac_prim->setId(id); } else { - ALOGE("Invalid transId= %d cur= %d\n", id, mac_prim->getId()); + ALOGE("Invalid transId= %d cur= %d\n", id, + mac_prim ? mac_prim->getId() : -1); } cmd->setChreNan(0);