Merge "ir impl point fixes" am: d63448070c am: 7a84dfc801 am: 7755f76d94
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2278696
Change-Id: Ia9e87b2bf4aefd6225d93fa77b81746cefd580f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/ir/aidl/default/main.cpp b/ir/aidl/default/main.cpp
index 7b6dda5..92376fc 100644
--- a/ir/aidl/default/main.cpp
+++ b/ir/aidl/default/main.cpp
@@ -36,7 +36,7 @@
::ndk::ScopedAStatus getCarrierFreqs(std::vector<ConsumerIrFreqRange>* _aidl_return) override;
::ndk::ScopedAStatus transmit(int32_t in_carrierFreqHz,
const std::vector<int32_t>& in_pattern) override;
- consumerir_device_t *mDevice;
+ consumerir_device_t *mDevice = nullptr;
};
ConsumerIr::ConsumerIr() {
@@ -49,7 +49,10 @@
}
ret = hw_module->methods->open(hw_module, CONSUMERIR_TRANSMITTER, (hw_device_t **) &mDevice);
if (ret < 0) {
+ // note - may want to make this a fatal error - otherwise the service will crash when it's used
ALOGE("Can't open consumer IR transmitter, error: %d", ret);
+ // in case it's modified
+ mDevice = nullptr;
}
}