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

Merge "HDMI Connection Fuzzer Fix" into main am: 3d3dab4875 am: c542085763

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

Change-Id: I8cdd89aa4f4840199ebb4de9f802b4946163abc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-12-12 13:14:51 +00:00
committed by Automerger Merge Worker
parent 0b29fb526a c542085763
commit fef2bd5bad
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tv/hdmi/connection/aidl/default/HdmiConnectionMock.cpp
View File

@@ -15,12 +15,11 @@
*/ */
#define LOG_TAG "android.hardware.tv.hdmi.connection" #define LOG_TAG "android.hardware.tv.hdmi.connection"
#include "HdmiConnectionMock.h"
#include <android-base/logging.h> #include <android-base/logging.h>
#include <fcntl.h> #include <fcntl.h>
#include <utils/Log.h> #include <utils/Log.h>
#include "HdmiConnectionMock.h"
using ndk::ScopedAStatus; using ndk::ScopedAStatus;
namespace android { namespace android {
@@ -34,6 +33,7 @@ void HdmiConnectionMock::serviceDied(void* cookie) {
ALOGE("HdmiConnectionMock died"); ALOGE("HdmiConnectionMock died");
auto hdmi = static_cast<HdmiConnectionMock*>(cookie); auto hdmi = static_cast<HdmiConnectionMock*>(cookie);
hdmi->mHdmiThreadRun = false; hdmi->mHdmiThreadRun = false;
pthread_join(hdmi->mThreadId, NULL);
} }
ScopedAStatus HdmiConnectionMock::getPortInfo(std::vector<HdmiPortInfo>* _aidl_return) { ScopedAStatus HdmiConnectionMock::getPortInfo(std::vector<HdmiPortInfo>* _aidl_return) {
@@ -55,12 +55,15 @@ ScopedAStatus HdmiConnectionMock::isConnected(int32_t portId, bool* _aidl_return
ScopedAStatus HdmiConnectionMock::setCallback( ScopedAStatus HdmiConnectionMock::setCallback(
const std::shared_ptr<IHdmiConnectionCallback>& callback) { const std::shared_ptr<IHdmiConnectionCallback>& callback) {
if (mCallback != nullptr) { if (mCallback != nullptr) {
stopThread();
mCallback = nullptr; mCallback = nullptr;
} }
if (callback != nullptr) { if (callback != nullptr) {
mCallback = callback; mCallback = callback;
AIBinder_linkToDeath(this->asBinder().get(), mDeathRecipient.get(), 0 /* cookie */); mDeathRecipient =
ndk::ScopedAIBinder_DeathRecipient(AIBinder_DeathRecipient_new(serviceDied));
AIBinder_linkToDeath(callback->asBinder().get(), mDeathRecipient.get(), this /* cookie */);
mInputFile = open(HDMI_MSG_IN_FIFO, O_RDWR | O_CLOEXEC); mInputFile = open(HDMI_MSG_IN_FIFO, O_RDWR | O_CLOEXEC);
pthread_create(&mThreadId, NULL, __threadLoop, this); pthread_create(&mThreadId, NULL, __threadLoop, this);
@@ -153,7 +156,7 @@ void HdmiConnectionMock::threadLoop() {
int r = -1; int r = -1;
// Open the input pipe // Open the input pipe
while (mInputFile < 0) { while (mHdmiThreadRun && mInputFile < 0) {
usleep(1000 * 1000); usleep(1000 * 1000);
mInputFile = open(HDMI_MSG_IN_FIFO, O_RDONLY | O_CLOEXEC); mInputFile = open(HDMI_MSG_IN_FIFO, O_RDONLY | O_CLOEXEC);
} }
@@ -193,7 +196,21 @@ HdmiConnectionMock::HdmiConnectionMock() {
.physicalAddress = mPhysicalAddress}; .physicalAddress = mPhysicalAddress};
mPortConnectionStatus[0] = false; mPortConnectionStatus[0] = false;
mHpdSignal[0] = HpdSignal::HDMI_HPD_PHYSICAL; mHpdSignal[0] = HpdSignal::HDMI_HPD_PHYSICAL;
mDeathRecipient = ndk::ScopedAIBinder_DeathRecipient(AIBinder_DeathRecipient_new(serviceDied)); mDeathRecipient = ndk::ScopedAIBinder_DeathRecipient(nullptr);
}
void HdmiConnectionMock::stopThread() {
if (mCallback != nullptr) {
ALOGE("[halimp_aidl] HdmiConnectionMock shutting down.");
mCallback = nullptr;
mDeathRecipient = ndk::ScopedAIBinder_DeathRecipient(nullptr);
mHdmiThreadRun = false;
pthread_join(mThreadId, NULL);
}
}
HdmiConnectionMock::~HdmiConnectionMock() {
stopThread();
} }
} // namespace implementation } // namespace implementation

3
tv/hdmi/connection/aidl/default/HdmiConnectionMock.h
View File

@@ -41,7 +41,7 @@ using ::aidl::android::hardware::tv::hdmi::connection::Result;
struct HdmiConnectionMock : public BnHdmiConnection { struct HdmiConnectionMock : public BnHdmiConnection {
HdmiConnectionMock(); HdmiConnectionMock();
~HdmiConnectionMock();
::ndk::ScopedAStatus getPortInfo(std::vector<HdmiPortInfo>* _aidl_return) override; ::ndk::ScopedAStatus getPortInfo(std::vector<HdmiPortInfo>* _aidl_return) override;
::ndk::ScopedAStatus isConnected(int32_t portId, bool* _aidl_return) override; ::ndk::ScopedAStatus isConnected(int32_t portId, bool* _aidl_return) override;
::ndk::ScopedAStatus setCallback( ::ndk::ScopedAStatus setCallback(
@@ -56,6 +56,7 @@ struct HdmiConnectionMock : public BnHdmiConnection {
void threadLoop(); void threadLoop();
int readMessageFromFifo(unsigned char* buf, int msgCount); int readMessageFromFifo(unsigned char* buf, int msgCount);
void handleHotplugMessage(unsigned char* msgBuf); void handleHotplugMessage(unsigned char* msgBuf);
void stopThread();
private: private:
static void serviceDied(void* cookie); static void serviceDied(void* cookie);