Commit 014620f1 authored by Eric Laurent's avatar Eric Laurent
Browse files

SoundTrigger: fix binder call status reporting.

Bug: 24677430.
Change-Id: Ife9b10e2d1acdb51099b21551e8c191fff7f75b4
parent 4802c0c5
...@@ -60,11 +60,13 @@ public: ...@@ -60,11 +60,13 @@ public:
data.writeInterfaceToken(ISoundTrigger::getInterfaceDescriptor()); data.writeInterfaceToken(ISoundTrigger::getInterfaceDescriptor());
data.writeStrongBinder(IInterface::asBinder(modelMemory)); data.writeStrongBinder(IInterface::asBinder(modelMemory));
status_t status = remote()->transact(LOAD_SOUND_MODEL, data, &reply); status_t status = remote()->transact(LOAD_SOUND_MODEL, data, &reply);
if (status != NO_ERROR || if (status != NO_ERROR) {
(status = (status_t)reply.readInt32()) != NO_ERROR) {
return status; return status;
} }
reply.read(handle, sizeof(sound_model_handle_t)); status = (status_t)reply.readInt32();
if (status == NO_ERROR) {
reply.read(handle, sizeof(sound_model_handle_t));
}
return status; return status;
} }
...@@ -74,7 +76,7 @@ public: ...@@ -74,7 +76,7 @@ public:
data.writeInterfaceToken(ISoundTrigger::getInterfaceDescriptor()); data.writeInterfaceToken(ISoundTrigger::getInterfaceDescriptor());
data.write(&handle, sizeof(sound_model_handle_t)); data.write(&handle, sizeof(sound_model_handle_t));
status_t status = remote()->transact(UNLOAD_SOUND_MODEL, data, &reply); status_t status = remote()->transact(UNLOAD_SOUND_MODEL, data, &reply);
if (status != NO_ERROR) { if (status == NO_ERROR) {
status = (status_t)reply.readInt32(); status = (status_t)reply.readInt32();
} }
return status; return status;
...@@ -93,7 +95,7 @@ public: ...@@ -93,7 +95,7 @@ public:
} }
data.writeStrongBinder(IInterface::asBinder(dataMemory)); data.writeStrongBinder(IInterface::asBinder(dataMemory));
status_t status = remote()->transact(START_RECOGNITION, data, &reply); status_t status = remote()->transact(START_RECOGNITION, data, &reply);
if (status != NO_ERROR) { if (status == NO_ERROR) {
status = (status_t)reply.readInt32(); status = (status_t)reply.readInt32();
} }
return status; return status;
...@@ -105,7 +107,7 @@ public: ...@@ -105,7 +107,7 @@ public:
data.writeInterfaceToken(ISoundTrigger::getInterfaceDescriptor()); data.writeInterfaceToken(ISoundTrigger::getInterfaceDescriptor());
data.write(&handle, sizeof(sound_model_handle_t)); data.write(&handle, sizeof(sound_model_handle_t));
status_t status = remote()->transact(STOP_RECOGNITION, data, &reply); status_t status = remote()->transact(STOP_RECOGNITION, data, &reply);
if (status != NO_ERROR) { if (status == NO_ERROR) {
status = (status_t)reply.readInt32(); status = (status_t)reply.readInt32();
} }
return status; return status;
......
...@@ -85,8 +85,11 @@ public: ...@@ -85,8 +85,11 @@ public:
data.writeInterfaceToken(ISoundTriggerHwService::getInterfaceDescriptor()); data.writeInterfaceToken(ISoundTriggerHwService::getInterfaceDescriptor());
data.write(&handle, sizeof(sound_trigger_module_handle_t)); data.write(&handle, sizeof(sound_trigger_module_handle_t));
data.writeStrongBinder(IInterface::asBinder(client)); data.writeStrongBinder(IInterface::asBinder(client));
remote()->transact(ATTACH, data, &reply); status_t status = remote()->transact(ATTACH, data, &reply);
status_t status = reply.readInt32(); if (status != NO_ERROR) {
return status;
}
status = reply.readInt32();
if (reply.readInt32() != 0) { if (reply.readInt32() != 0) {
module = interface_cast<ISoundTrigger>(reply.readStrongBinder()); module = interface_cast<ISoundTrigger>(reply.readStrongBinder());
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment