diff options
author | Wally Yau <wyau@google.com> | 2017-11-08 21:41:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-11-08 21:41:45 +0000 |
commit | c8145123db18b7f10bbc5d269fe0948049098f58 (patch) | |
tree | fa0083a92db8c8b98d365fd19ec11b7fc64705a0 /tv | |
parent | 907e62ca5975eda3153639622b4cd56be3f9d4b0 (diff) | |
parent | 108a72a20a72ef96ce1fc046493ea1c0ac8afce7 (diff) | |
download | android_hardware_interfaces-c8145123db18b7f10bbc5d269fe0948049098f58.tar.gz android_hardware_interfaces-c8145123db18b7f10bbc5d269fe0948049098f58.tar.bz2 android_hardware_interfaces-c8145123db18b7f10bbc5d269fe0948049098f58.zip |
Merge "hdmi_cec: deal with the framework side went away."
Diffstat (limited to 'tv')
-rw-r--r-- | tv/cec/1.0/default/HdmiCec.cpp | 15 | ||||
-rw-r--r-- | tv/cec/1.0/default/HdmiCec.h | 9 |
2 files changed, 18 insertions, 6 deletions
diff --git a/tv/cec/1.0/default/HdmiCec.cpp b/tv/cec/1.0/default/HdmiCec.cpp index ebe26816b..171bdfe04 100644 --- a/tv/cec/1.0/default/HdmiCec.cpp +++ b/tv/cec/1.0/default/HdmiCec.cpp @@ -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) { - mCallback = callback; - mDevice->register_event_callback(mDevice, eventCallback, nullptr); + 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(); } diff --git a/tv/cec/1.0/default/HdmiCec.h b/tv/cec/1.0/default/HdmiCec.h index 34a3bb081..0133abc08 100644 --- a/tv/cec/1.0/default/HdmiCec.h +++ b/tv/cec/1.0/default/HdmiCec.h @@ -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,7 +87,12 @@ struct HdmiCec : public IHdmiCec { } } -private: + 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; }; |