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

Merge "audio: Fix handling of a thread exit command with a bad cookie" into main am: 759fb98667

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2908743

Change-Id: Ib53b2daa933ae42bd64b49e139e9a3ce2057162c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-01-13 01:35:34 +00:00
committed by Automerger Merge Worker
parent 0e66031666 759fb98667
commit 0ad71fd5fc
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
audio/aidl/default/Stream.cpp
View File

@@ -180,17 +180,20 @@ StreamInWorkerLogic::Status StreamInWorkerLogic::cycle() {
StreamDescriptor::Reply reply{}; StreamDescriptor::Reply reply{};
reply.status = STATUS_BAD_VALUE; reply.status = STATUS_BAD_VALUE;
switch (command.getTag()) { switch (command.getTag()) {
case Tag::halReservedExit: case Tag::halReservedExit: {
if (const int32_t cookie = command.get<Tag::halReservedExit>(); const int32_t cookie = command.get<Tag::halReservedExit>();
cookie == (mContext->getInternalCommandCookie() ^ getTid())) { if (cookie == (mContext->getInternalCommandCookie() ^ getTid())) {
mDriver->shutdown(); mDriver->shutdown();
setClosed(); setClosed();
// This is an internal command, no need to reply.
return Status::EXIT;
} else { } else {
LOG(WARNING) << __func__ << ": EXIT command has a bad cookie: " << cookie; LOG(WARNING) << __func__ << ": EXIT command has a bad cookie: " << cookie;
} }
break; if (cookie != 0) { // This is an internal command, no need to reply.
return Status::EXIT;
} else {
break;
}
}
case Tag::getStatus: case Tag::getStatus:
populateReply(&reply, mIsConnected); populateReply(&reply, mIsConnected);
break; break;
@@ -400,17 +403,20 @@ StreamOutWorkerLogic::Status StreamOutWorkerLogic::cycle() {
reply.status = STATUS_BAD_VALUE; reply.status = STATUS_BAD_VALUE;
using Tag = StreamDescriptor::Command::Tag; using Tag = StreamDescriptor::Command::Tag;
switch (command.getTag()) { switch (command.getTag()) {
case Tag::halReservedExit: case Tag::halReservedExit: {
if (const int32_t cookie = command.get<Tag::halReservedExit>(); const int32_t cookie = command.get<Tag::halReservedExit>();
cookie == (mContext->getInternalCommandCookie() ^ getTid())) { if (cookie == (mContext->getInternalCommandCookie() ^ getTid())) {
mDriver->shutdown(); mDriver->shutdown();
setClosed(); setClosed();
// This is an internal command, no need to reply.
return Status::EXIT;
} else { } else {
LOG(WARNING) << __func__ << ": EXIT command has a bad cookie: " << cookie; LOG(WARNING) << __func__ << ": EXIT command has a bad cookie: " << cookie;
} }
break; if (cookie != 0) { // This is an internal command, no need to reply.
return Status::EXIT;
} else {
break;
}
}
case Tag::getStatus: case Tag::getStatus:
populateReply(&reply, mIsConnected); populateReply(&reply, mIsConnected);
break; break;

2
audio/aidl/default/include/core-impl/Stream.h
View File

@@ -90,7 +90,7 @@ class StreamContext {
std::weak_ptr<sounddose::StreamDataProcessorInterface> streamDataProcessor, std::weak_ptr<sounddose::StreamDataProcessorInterface> streamDataProcessor,
DebugParameters debugParameters) DebugParameters debugParameters)
: mCommandMQ(std::move(commandMQ)), : mCommandMQ(std::move(commandMQ)),
mInternalCommandCookie(std::rand()), mInternalCommandCookie(std::rand() | 1 /* make sure it's not 0 */),
mReplyMQ(std::move(replyMQ)), mReplyMQ(std::move(replyMQ)),
mFormat(format), mFormat(format),
mChannelLayout(channelLayout), mChannelLayout(channelLayout),