tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use -Werror in hardware/interfaces/audio" am: 7a4422d2a5

Browse source 
am: ae9fb022a3

Change-Id: Id07c0fd2c0735961a79c6559ac014a7321b95c1d
This commit is contained in:
Chih-Hung Hsieh 2017-11-28 19:06:59 +00:00 committed by android-build-merger
commit 5d8244ee3f
5 changed files with 7 additions and 5 deletions
Show stats 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 \
StreamOut.cpp \
LOCAL_CFLAGS := -Wall -Werror
LOCAL_SHARED_LIBRARIES := \
libbase \
libcutils \
@ -65,6 +67,8 @@ LOCAL_PROPRIETARY_MODULE := true
LOCAL_SRC_FILES := \
service.cpp
LOCAL_CFLAGS := -Wall -Werror
LOCAL_SHARED_LIBRARIES := \
libhidlbase \
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);
mStatus.retval = Result::OK;
uint64_t read = 0;
if (readResult >= 0) {
mStatus.reply.read = readResult;
if (!mDataMQ->write(&mBuffer[0], readResult)) {
@ -326,7 +325,7 @@ Return<void> StreamIn::prepareForReading(uint32_t frameSize,
ThreadInfo threadInfo = {0, 0};
// 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(),
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};
// 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(),
StatusMQ::Descriptor(), threadInfo);

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

@ -1,5 +1,6 @@
cc_library_shared {
name: "android.hardware.audio.effect@2.0-impl",
defaults: ["hidl_defaults"],
vendor: true,
relative_install_path: "hw",
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) {
uint32_t halCmd = EFFECT_FEATURE_AUX_CHANNELS;
uint32_t halResult[alignedSizeIn<uint32_t>(sizeof(uint32_t) + sizeof(channel_config_t))];
memset(halResult, 0, sizeof(halResult));
uint32_t halResultSize = 0;
EffectAuxChannelsConfig result;
Result retval = getCurrentConfigImpl(
EFFECT_FEATURE_AUX_CHANNELS,