From 744f214f4070b0b2ad312049e37a6994f2081a05 Mon Sep 17 00:00:00 2001 From: Ricky Niu Date: Tue, 31 Jan 2023 18:01:06 +0800 Subject: [PATCH 1/2] Add resetCb Add the resetCb to complete asynchronous Bug: 267252826 Test: Boot to home and function work Change-Id: I9d6624cbe15c86c63e28f8f176d7c560aed8446f --- usb/gadget/UsbGadget.cpp | 9 ++++++++- usb/gadget/UsbGadget.h | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/usb/gadget/UsbGadget.cpp b/usb/gadget/UsbGadget.cpp index d0e16ee5..7ee70460 100644 --- a/usb/gadget/UsbGadget.cpp +++ b/usb/gadget/UsbGadget.cpp @@ -336,11 +336,14 @@ static Status validateAndSetVidPid(int64_t functions) { return ret; } -ScopedAStatus UsbGadget::reset() { +ScopedAStatus UsbGadget::reset(const shared_ptr &callback, + int64_t in_transactionId) { ALOGI("USB Gadget reset"); if (!WriteStringToFile("none", PULLUP_PATH)) { ALOGI("Gadget cannot be pulled down"); + if (callback) + callback->resetCb(Status::ERROR, in_transactionId); return ScopedAStatus::fromServiceSpecificErrorWithMessage( -1, "Gadget cannot be pulled down"); } @@ -349,9 +352,13 @@ ScopedAStatus UsbGadget::reset() { if (!WriteStringToFile(kGadgetName, PULLUP_PATH)) { ALOGI("Gadget cannot be pulled up"); + if (callback) + callback->resetCb(Status::ERROR, in_transactionId); return ScopedAStatus::fromServiceSpecificErrorWithMessage( -1, "Gadget cannot be pulled up"); } + if (callback) + callback->resetCb(Status::SUCCESS, in_transactionId); return ScopedAStatus::ok(); } diff --git a/usb/gadget/UsbGadget.h b/usb/gadget/UsbGadget.h index d7e20a6c..59759308 100644 --- a/usb/gadget/UsbGadget.h +++ b/usb/gadget/UsbGadget.h @@ -107,7 +107,8 @@ struct UsbGadget : public BnUsbGadget { ScopedAStatus getCurrentUsbFunctions(const shared_ptr &callback, int64_t in_transactionId) override; - ScopedAStatus reset() override; + ScopedAStatus reset(const shared_ptr &callback, + int64_t in_transactionId) override; ScopedAStatus getUsbSpeed(const shared_ptr &callback, int64_t in_transactionId) override; From c42b38bdee2388c004b32571a13736da20bf17d8 Mon Sep 17 00:00:00 2001 From: neoyu Date: Wed, 8 Feb 2023 08:20:05 +0800 Subject: [PATCH 2/2] Support SecureElement HAL for HIDL Bug: 267525940 Test: manual Change-Id: I10334765bf8bda037a952c45f0316ed9e834489a --- device.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device.mk b/device.mk index d5789536..7e0a7b06 100644 --- a/device.mk +++ b/device.mk @@ -917,6 +917,8 @@ SUPPORT_MULTI_SIM := true SUPPORT_NR := true # Using IRadio 1.6 USE_RADIO_HAL_1_6 := true +# Support SecureElement HAL for HIDL +USE_SE_HIDL := true #$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk) #$(call inherit-product, vendor/google_devices/gs101/proprietary/device-vendor.mk)