diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-30 12:23:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-30 12:23:14 +0000 |
| commit | 2895b2d9005b93d1ba480cf7042ed2810199d883 (patch) | |
| tree | a345177e9425692726ef29d4a1dcf5d920d53efe /media/jni | |
| parent | 1f07b60a756cce795332bfbbd1f87dac4916055e (diff) | |
| parent | 575365367abdc6590b536a2ca215c05334c8d484 (diff) | |
Merge "Tuner JNI: Correct memcpy of C2DataIdInfo" am: 55a580b253 am: 575365367a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536948
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I046a2ed3bbaece122a563031cd8309021f2401a7
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_tv_Tuner.cpp | 5 | ||||
| -rw-r--r-- | media/jni/android_media_tv_Tuner.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp index 749f4d195952..04f50114a1e5 100644 --- a/media/jni/android_media_tv_Tuner.cpp +++ b/media/jni/android_media_tv_Tuner.cpp @@ -291,8 +291,9 @@ MQ& Dvr::getDvrMQ() { C2DataIdInfo::C2DataIdInfo(uint32_t index, uint64_t value) : C2Param(kParamSize, index) { CHECK(isGlobal()); CHECK_EQ(C2Param::INFO, kind()); - DummyInfo info{value}; - memcpy(this + 1, static_cast<C2Param *>(&info) + 1, kParamSize - sizeof(C2Param)); + mInfo = StubInfo(value); + memcpy(static_cast<C2Param *>(this) + 1, static_cast<C2Param *>(&mInfo) + 1, + kParamSize - sizeof(C2Param)); } /////////////// MediaEvent /////////////////////// diff --git a/media/jni/android_media_tv_Tuner.h b/media/jni/android_media_tv_Tuner.h index 83e9db796363..fd2995917475 100644 --- a/media/jni/android_media_tv_Tuner.h +++ b/media/jni/android_media_tv_Tuner.h @@ -250,8 +250,9 @@ class C2DataIdInfo : public C2Param { public: C2DataIdInfo(uint32_t index, uint64_t value); private: - typedef C2GlobalParam<C2Info, C2Int64Value, 0> DummyInfo; - static const size_t kParamSize = sizeof(DummyInfo); + typedef C2GlobalParam<C2Info, C2Int64Value, 0> StubInfo; + StubInfo mInfo; + static const size_t kParamSize = sizeof(StubInfo); }; } // namespace android |