commit 1cb0ccb5b9ce176949fcd09460d58680d9f3382e
author Sungtak Lee <taklee@google.com> Wed Sep 05 14:47:36 2018 -0700
committer Sungtak Lee <taklee@google.com> Thu Sep 06 10:40:41 2018 -0700
tree b9f66d972b8ff198a7e096f75e21810248ece398
parent d4a9ce4ba72280b7f3833446925f0bf6e42e1112

bufferpool2.0: apply hidl interface update

Bug: 112203066
Change-Id: I2f797f72c34d923f4b9efa5cf6eefad468458233

media/bufferpool/2.0/Accessor.cpp

diff --git a/media/bufferpool/2.0/Accessor.cpp b/media/bufferpool/2.0/Accessor.cpp
index 3fd41f0..c1b62f8 100644
--- a/media/bufferpool/2.0/Accessor.cpp
+++ b/media/bufferpool/2.0/Accessor.cpp
@@ -117,15 +117,21 @@
 Return<void> Accessor::connect(connect_cb _hidl_cb) {
     sp<Connection> connection;
     ConnectionId connectionId;
-    const QueueDescriptor* fmqDesc;
+    const StatusDescriptor* fmqDesc;
 
     ResultStatus status = connect(&connection, &connectionId, &fmqDesc, false);
     if (status == ResultStatus::OK) {
-        _hidl_cb(status, connection, connectionId, *fmqDesc);
+        _hidl_cb(status, connection, connectionId, *fmqDesc,
+                 android::hardware::MQDescriptorSync<BufferInvalidationMessage>(
+                         std::vector<android::hardware::GrantorDescriptor>(),
+                         nullptr /* nhandle */, 0 /* size */));
     } else {
         _hidl_cb(status, nullptr, -1LL,
                  android::hardware::MQDescriptorSync<BufferStatusMessage>(
                          std::vector<android::hardware::GrantorDescriptor>(),
+                         nullptr /* nhandle */, 0 /* size */),
+                 android::hardware::MQDescriptorSync<BufferInvalidationMessage>(
+                         std::vector<android::hardware::GrantorDescriptor>(),
                          nullptr /* nhandle */, 0 /* size */));
     }
     return Void();
@@ -162,7 +168,7 @@
 
 ResultStatus Accessor::connect(
         sp<Connection> *connection, ConnectionId *pConnectionId,
-        const QueueDescriptor** fmqDescPtr, bool local) {
+        const StatusDescriptor** fmqDescPtr, bool local) {
     if (mImpl) {
         ResultStatus status = mImpl->connect(this, connection, pConnectionId, fmqDescPtr);
         if (!local && status == ResultStatus::OK) {