Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use -Werror in hardware/interfaces/audio"

Browse Source
This commit is contained in:
Treehugger Robot
2017-11-28 18:50:14 +00:00
committed by Gerrit Code Review
parent 5261c278b9 b38c1aebc1
commit 7a4422d2a5
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
audio/2.0/default/Android.mk
View File

@@ -30,6 +30,8 @@ LOCAL_SRC_FILES := \
StreamIn.cpp \ StreamIn.cpp \
StreamOut.cpp \ StreamOut.cpp \
LOCAL_CFLAGS := -Wall -Werror
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libbase \ libbase \
libcutils \ libcutils \
@@ -65,6 +67,8 @@ LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
service.cpp service.cpp
LOCAL_CFLAGS := -Wall -Werror
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libhidlbase \ libhidlbase \
libhidltransport \ libhidltransport \

3
audio/2.0/default/StreamIn.cpp
View File

@@ -87,7 +87,6 @@ void ReadThread::doRead() {
} }
ssize_t readResult = mStream->read(mStream, &mBuffer[0], requestedToRead); ssize_t readResult = mStream->read(mStream, &mBuffer[0], requestedToRead);
mStatus.retval = Result::OK; mStatus.retval = Result::OK;
uint64_t read = 0;
if (readResult >= 0) { if (readResult >= 0) {
mStatus.reply.read = readResult; mStatus.reply.read = readResult;
if (!mDataMQ->write(&mBuffer[0], readResult)) { if (!mDataMQ->write(&mBuffer[0], readResult)) {
@@ -326,7 +325,7 @@ Return<void> StreamIn::prepareForReading(uint32_t frameSize,
ThreadInfo threadInfo = {0, 0}; ThreadInfo threadInfo = {0, 0};
// Wrap the _hidl_cb to return an error // Wrap the _hidl_cb to return an error
auto sendError = [this, &threadInfo, &_hidl_cb](Result result) { auto sendError = [&threadInfo, &_hidl_cb](Result result) {
_hidl_cb(result, CommandMQ::Descriptor(), DataMQ::Descriptor(), _hidl_cb(result, CommandMQ::Descriptor(), DataMQ::Descriptor(),
StatusMQ::Descriptor(), threadInfo); StatusMQ::Descriptor(), threadInfo);

2
audio/2.0/default/StreamOut.cpp
View File

@@ -302,7 +302,7 @@ Return<void> StreamOut::prepareForWriting(uint32_t frameSize,
ThreadInfo threadInfo = {0, 0}; ThreadInfo threadInfo = {0, 0};
// Wrap the _hidl_cb to return an error // Wrap the _hidl_cb to return an error
auto sendError = [this, &threadInfo, &_hidl_cb](Result result) { auto sendError = [&threadInfo, &_hidl_cb](Result result) {
_hidl_cb(result, CommandMQ::Descriptor(), DataMQ::Descriptor(), _hidl_cb(result, CommandMQ::Descriptor(), DataMQ::Descriptor(),
StatusMQ::Descriptor(), threadInfo); StatusMQ::Descriptor(), threadInfo);

1
audio/effect/2.0/default/Android.bp
View File

@@ -1,5 +1,6 @@
cc_library_shared { cc_library_shared {
name: "android.hardware.audio.effect@2.0-impl", name: "android.hardware.audio.effect@2.0-impl",
defaults: ["hidl_defaults"],
vendor: true, vendor: true,
relative_install_path: "hw", relative_install_path: "hw",
srcs: [ srcs: [

2
audio/effect/2.0/default/Effect.cpp
View File

@@ -610,10 +610,8 @@ Return<void> Effect::getSupportedAuxChannelsConfigs(
} }
Return<void> Effect::getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) { Return<void> Effect::getAuxChannelsConfig(getAuxChannelsConfig_cb _hidl_cb) {
uint32_t halCmd = EFFECT_FEATURE_AUX_CHANNELS;
uint32_t halResult[alignedSizeIn<uint32_t>(sizeof(uint32_t) + sizeof(channel_config_t))]; uint32_t halResult[alignedSizeIn<uint32_t>(sizeof(uint32_t) + sizeof(channel_config_t))];
memset(halResult, 0, sizeof(halResult)); memset(halResult, 0, sizeof(halResult));
uint32_t halResultSize = 0;
EffectAuxChannelsConfig result; EffectAuxChannelsConfig result;
Result retval = getCurrentConfigImpl( Result retval = getCurrentConfigImpl(
EFFECT_FEATURE_AUX_CHANNELS, EFFECT_FEATURE_AUX_CHANNELS,