Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ee4bfbd authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4442369 from 85f8d2ec to pi-release 

Change-Id: I960cc38360372218f630aecd9a4c764b8eda247b
parents 330ada8f 85f8d2ec

CleanSpec.mk

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.hardware.blue 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware.bluetooth*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware.bluetooth*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware.bluetooth*)

$(call add-clean-step, rm -rf $(OUT)/soong/.intermediates/)

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/)

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/.intermediates/hardware/interfaces/)

$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore*" -print0 | xargs -0 rm -f)

tv/cec/1.0/default/HdmiCec.cpp

+11 −4
Original line number Diff line number Diff line
@@ -264,8 +264,7 @@ static_assert(HDMI_OPTION_SYSTEM_CEC_CONTROL == static_cast<int>(OptionKey::SYST 


sp<IHdmiCecCallback> HdmiCec::mCallback = nullptr;



HdmiCec::HdmiCec(hdmi_cec_device_t* device) : mDevice(device) {

}

HdmiCec::HdmiCec(hdmi_cec_device_t* device) : mDevice(device) {}



// Methods from ::android::hardware::tv::cec::V1_0::IHdmiCec follow.

Return<Result> HdmiCec::addLogicalAddress(CecLogicalAddress addr) {
@@ -319,8 +318,16 @@ Return<SendMessageResult> HdmiCec::sendMessage(const CecMessage& message) { 
}



Return<void> HdmiCec::setCallback(const sp<IHdmiCecCallback>& callback) {

    if (mCallback != nullptr) {

        mCallback->unlinkToDeath(this);

        mCallback = nullptr;

    }



    if (callback != nullptr) {

        mCallback = callback;

        mCallback->linkToDeath(this, 0 /*cookie*/);

        mDevice->register_event_callback(mDevice, eventCallback, nullptr);

    }

    return Void();

}

tv/cec/1.0/default/HdmiCec.h

+7 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ using ::android::hardware::hidl_vec; 
using ::android::hardware::hidl_string;

using ::android::sp;



struct HdmiCec : public IHdmiCec {

struct HdmiCec : public IHdmiCec, public hidl_death_recipient {

    HdmiCec(hdmi_cec_device_t* device);

    // Methods from ::android::hardware::tv::cec::V1_0::IHdmiCec follow.

    Return<Result> addLogicalAddress(CecLogicalAddress addr)  override;
@@ -87,6 +87,11 @@ struct HdmiCec : public IHdmiCec { 
        }

    }



    virtual void serviceDied(uint64_t /*cookie*/,

                             const wp<::android::hidl::base::V1_0::IBase>& /*who*/) {

        setCallback(nullptr);

    }



   private:

    static sp<IHdmiCecCallback> mCallback;

    const hdmi_cec_device_t* mDevice;