diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-15 11:23:59 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-15 11:23:59 +0000 |
| commit | 411e458e59c8c6361e5ef902e4c4b90185b6cfa7 (patch) | |
| tree | af683c1adfbb6fd411e92c8fddb89c40c94fe94a | |
| parent | 25db3ee833a1cd24642b6cf67367545e132e9396 (diff) | |
| parent | d726faae5a8ff642b35a16cef4aa603d5c997990 (diff) | |
Snap for 9609174 from d726faae5a8ff642b35a16cef4aa603d5c997990 to t-keystone-qcom-release
Change-Id: I4e8dd8e2228f4c27eae10175e12883848505df73
| -rw-r--r-- | usb/gadget/1.1/default/UsbGadget.cpp | 2 | ||||
| -rw-r--r-- | usb/gadget/1.2/default/UsbGadget.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/usb/gadget/1.1/default/UsbGadget.cpp b/usb/gadget/1.1/default/UsbGadget.cpp index 36d865dc2e..0d0b4032d4 100644 --- a/usb/gadget/1.1/default/UsbGadget.cpp +++ b/usb/gadget/1.1/default/UsbGadget.cpp @@ -46,6 +46,8 @@ void currentFunctionsAppliedCallback(bool functionsApplied, void* payload) { } Return<void> UsbGadget::getCurrentUsbFunctions(const sp<V1_0::IUsbGadgetCallback>& callback) { + if (!callback) return Void(); + Return<void> ret = callback->getCurrentUsbFunctionsCb( mCurrentUsbFunctions, mCurrentUsbFunctionsApplied ? Status::FUNCTIONS_APPLIED : Status::FUNCTIONS_NOT_APPLIED); diff --git a/usb/gadget/1.2/default/UsbGadget.cpp b/usb/gadget/1.2/default/UsbGadget.cpp index 8dd229e0fd..a59e983f69 100644 --- a/usb/gadget/1.2/default/UsbGadget.cpp +++ b/usb/gadget/1.2/default/UsbGadget.cpp @@ -46,6 +46,8 @@ void currentFunctionsAppliedCallback(bool functionsApplied, void* payload) { } Return<void> UsbGadget::getCurrentUsbFunctions(const sp<V1_0::IUsbGadgetCallback>& callback) { + if (!callback) return Void(); + Return<void> ret = callback->getCurrentUsbFunctionsCb( mCurrentUsbFunctions, mCurrentUsbFunctionsApplied ? Status::FUNCTIONS_APPLIED : Status::FUNCTIONS_NOT_APPLIED); |