commit 38198418bd1434f2c0f4b542fe7e35a384b20fc0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Nov 04 23:10:51 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 04 23:10:51 2024 +0000
tree dda4737585a67b3d75451e96a6cc4b9156265d40
parent 275bc4e0629812b2bef939c78475c64a58939d90
parent b8a4e87c6a7b3c0c5c5422f63819bbe036a8e103

Merge "Fix audio control device to context test" into main

usb/OWNERS

diff --git a/usb/OWNERS b/usb/OWNERS
index 3611b4d..647d626 100644
--- a/usb/OWNERS
+++ b/usb/OWNERS
@@ -1,8 +1,8 @@
 # Bug component: 175220
 
-aprasath@google.com
-kumarashishg@google.com
-sarup@google.com
 anothermark@google.com
+febinthattil@google.com
+aprasath@google.com
 albertccwang@google.com
 badhri@google.com
+kumarashishg@google.com
\ No newline at end of file

wifi/aidl/default/aidl_callback_util.h

diff --git a/wifi/aidl/default/aidl_callback_util.h b/wifi/aidl/default/aidl_callback_util.h
index f8ba53b..2419db9 100644
--- a/wifi/aidl/default/aidl_callback_util.h
+++ b/wifi/aidl/default/aidl_callback_util.h
@@ -45,6 +45,11 @@
     ~AidlCallbackHandler() { invalidate(); }
 
     bool addCallback(const std::shared_ptr<CallbackType>& cb) {
+        if (cb == nullptr) {
+            LOG(ERROR) << "Unable to register a null callback";
+            return false;
+        }
+
         std::unique_lock<std::mutex> lk(callback_handler_lock_);
         void* cbPtr = reinterpret_cast<void*>(cb->asBinder().get());
         const auto& cbPosition = findCbInSet(cbPtr);