Merge changes from topic "aidl_audio_effect_6"
* changes:
AIDL effect: Add all aosp effects default implementation
AIDL effect: Add all aosp effect parameters definition
diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index 7ddf87a..2b5a0d5 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -228,7 +228,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="true">
+ <hal format="aidl" optional="true" updatable-via-apex="true">
<name>android.hardware.drm</name>
<version>1</version>
<interface>
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;
}
}