diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-23 21:15:57 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-23 21:15:57 +0000 |
| commit | 3e27a2ae0e6fbbce187e7a6e9079c5f5975d926d (patch) | |
| tree | f031ff9c0a2a1f0daf721fc2f9862dc14739326f | |
| parent | be327c9fc9de911196aad40ef690154f4feb68d1 (diff) | |
| parent | 858895a3649cbbaa98ad179d0f4163daaf4352d8 (diff) | |
| download | av-oreo-m5-release.tar.gz | |
Merge cherrypicks of [3654171] into oc-m5-releaseandroid-8.1.0_r22oreo-m5-release
Change-Id: I175b50cba5eb73028ec205f4ca9abacef63fcd80
| -rw-r--r-- | media/libmedia/omx/1.0/WOmxNode.cpp | 3 | ||||
| -rw-r--r-- | media/libstagefright/omx/1.0/WOmxNode.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/media/libmedia/omx/1.0/WOmxNode.cpp b/media/libmedia/omx/1.0/WOmxNode.cpp index 2cd8b760d1..0b40e8d467 100644 --- a/media/libmedia/omx/1.0/WOmxNode.cpp +++ b/media/libmedia/omx/1.0/WOmxNode.cpp @@ -151,8 +151,7 @@ status_t LWOmxNode::allocateSecureBuffer( hidl_handle const& outNativeHandle) { fnStatus = toStatusT(status); *buffer = outBuffer; - *native_handle = outNativeHandle.getNativeHandle() == nullptr ? - nullptr : NativeHandle::create( + *native_handle = NativeHandle::create( native_handle_clone(outNativeHandle), true); })); return transStatus == NO_ERROR ? fnStatus : transStatus; diff --git a/media/libstagefright/omx/1.0/WOmxNode.cpp b/media/libstagefright/omx/1.0/WOmxNode.cpp index 1dc7c7b6f0..9f822839a6 100644 --- a/media/libstagefright/omx/1.0/WOmxNode.cpp +++ b/media/libstagefright/omx/1.0/WOmxNode.cpp @@ -154,8 +154,7 @@ status_t LWOmxNode::allocateSecureBuffer( hidl_handle const& outNativeHandle) { fnStatus = toStatusT(status); *buffer = outBuffer; - *native_handle = outNativeHandle.getNativeHandle() == nullptr ? - nullptr : NativeHandle::create( + *native_handle = NativeHandle::create( native_handle_clone(outNativeHandle), true); })); return transStatus == NO_ERROR ? fnStatus : transStatus; |