commit 438a656bb374e5840f144baf28854a4c67928c65
author Mengjie Xie <mengjie.xie@mediatek.com> Fri Nov 01 10:12:19 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 10:12:19 2019 -0700
tree 7651878ce5c1da6fabf9f1502df74e89fc3f0ccf
parent 0b578c697de9b086eca1476d9c88be7a41fb9c32
parent e32a1d7c90b62438679651a8a1b024455f45823e

mTraits is used without been locked
am: e32a1d7c90

Change-Id: If5efb0ed85f4d1efc02dad9c1b1797bda3bd8670

media/codec2/vndk/C2AllocatorIon.cpp

diff --git a/media/codec2/vndk/C2AllocatorIon.cpp b/media/codec2/vndk/C2AllocatorIon.cpp
index 752bc46..0470a31 100644
--- a/media/codec2/vndk/C2AllocatorIon.cpp
+++ b/media/codec2/vndk/C2AllocatorIon.cpp
@@ -600,7 +600,7 @@
     }
 
     std::shared_ptr<C2AllocationIon> alloc
-        = std::make_shared<C2AllocationIon>(dup(mIonFd), capacity, align, heapMask, flags, mTraits->id);
+        = std::make_shared<C2AllocationIon>(dup(mIonFd), capacity, align, heapMask, flags, getId());
     ret = alloc->status();
     if (ret == C2_OK) {
         *allocation = alloc;
@@ -622,7 +622,7 @@
     // TODO: get capacity and validate it
     const C2HandleIon *h = static_cast<const C2HandleIon*>(handle);
     std::shared_ptr<C2AllocationIon> alloc
-        = std::make_shared<C2AllocationIon>(dup(mIonFd), h->size(), h->bufferFd(), mTraits->id);
+        = std::make_shared<C2AllocationIon>(dup(mIonFd), h->size(), h->bufferFd(), getId());
     c2_status_t ret = alloc->status();
     if (ret == C2_OK) {
         *allocation = alloc;