Merge changes from topic "am-cf8fbeaf7fea4af09983251a30a26261" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 4e08056185 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7dc53ec9e7 -s ours
diff --git a/core/jni/android_os_HwParcel.cpp b/core/jni/android_os_HwParcel.cpp
index 0e3c510..c786652 100644
--- a/core/jni/android_os_HwParcel.cpp
+++ b/core/jni/android_os_HwParcel.cpp
@@ -235,6 +235,10 @@
return mWasSent;
}
+void JHwParcel::addBlob(const sp<JHwBlob> &blob) {
+ mBlobs.emplace_back(blob);
+}
+
} // namespace android
////////////////////////////////////////////////////////////////////////////////
@@ -1059,6 +1063,7 @@
JHwParcel::GetNativeContext(env, thiz)->getParcel();
sp<JHwBlob> blob = JHwBlob::GetNativeContext(env, blobObj);
+ JHwParcel::GetNativeContext(env, thiz)->addBlob(blob);
status_t err = blob->writeToParcel(parcel);
if (err != OK) {
diff --git a/core/jni/android_os_HwParcel.h b/core/jni/android_os_HwParcel.h
index 2c26993..07d144a 100644
--- a/core/jni/android_os_HwParcel.h
+++ b/core/jni/android_os_HwParcel.h
@@ -17,14 +17,15 @@
#ifndef ANDROID_OS_HW_PARCEL_H
#define ANDROID_OS_HW_PARCEL_H
-#include "hwbinder/EphemeralStorage.h"
-
#include <android-base/macros.h>
#include <hwbinder/IBinder.h>
#include <hwbinder/Parcel.h>
#include <jni.h>
#include <utils/RefBase.h>
+#include "android_os_HwBlob.h"
+#include "hwbinder/EphemeralStorage.h"
+
namespace android {
struct JHwParcel : public RefBase {
@@ -44,6 +45,8 @@
EphemeralStorage *getStorage();
+ void addBlob(const sp<JHwBlob> &blob);
+
void setTransactCallback(::android::hardware::IBinder::TransactCallback cb);
void send();
@@ -60,6 +63,7 @@
::android::hardware::IBinder::TransactCallback mTransactCallback;
bool mWasSent;
+ std::vector<sp<JHwBlob>> mBlobs;
DISALLOW_COPY_AND_ASSIGN(JHwParcel);
};