Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tuner JNI: Correct memcpy of C2DataIdInfo" am: 55a580b253

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536948

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida939b2ade050cfdfa85a4885c9534892541f923
This commit is contained in:
Treehugger Robot
2020-12-30 12:00:09 +00:00
committed by Automerger Merge Worker
parent acb16468cb 55a580b253
commit 575365367a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/jni/android_media_tv_Tuner.cpp
View File

@@ -291,8 +291,9 @@ MQ& Dvr::getDvrMQ() {
C2DataIdInfo::C2DataIdInfo(uint32_t index, uint64_t value) : C2Param(kParamSize, index) { C2DataIdInfo::C2DataIdInfo(uint32_t index, uint64_t value) : C2Param(kParamSize, index) {
CHECK(isGlobal()); CHECK(isGlobal());
CHECK_EQ(C2Param::INFO, kind()); CHECK_EQ(C2Param::INFO, kind());
DummyInfo info{value}; mInfo = StubInfo(value);
memcpy(this + 1, static_cast<C2Param *>(&info) + 1, kParamSize - sizeof(C2Param)); memcpy(static_cast<C2Param *>(this) + 1, static_cast<C2Param *>(&mInfo) + 1,
kParamSize - sizeof(C2Param));
} }
/////////////// MediaEvent /////////////////////// /////////////// MediaEvent ///////////////////////

5
media/jni/android_media_tv_Tuner.h
View File

@@ -250,8 +250,9 @@ class C2DataIdInfo : public C2Param {
public: public:
C2DataIdInfo(uint32_t index, uint64_t value); C2DataIdInfo(uint32_t index, uint64_t value);
private: private:
typedef C2GlobalParam<C2Info, C2Int64Value, 0> DummyInfo; typedef C2GlobalParam<C2Info, C2Int64Value, 0> StubInfo;
static const size_t kParamSize = sizeof(DummyInfo); StubInfo mInfo;
static const size_t kParamSize = sizeof(StubInfo);
}; };
} // namespace android } // namespace android