commit 3e27a2ae0e6fbbce187e7a6e9079c5f5975d926d
author android-build-team Robot <android-build-team-robot@google.com> Fri Feb 23 21:15:57 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Feb 23 21:15:57 2018 +0000
tree f031ff9c0a2a1f0daf721fc2f9862dc14739326f
parent be327c9fc9de911196aad40ef690154f4feb68d1
parent 858895a3649cbbaa98ad179d0f4163daaf4352d8

Merge cherrypicks of [3654171] into oc-m5-release

Change-Id: I175b50cba5eb73028ec205f4ca9abacef63fcd80

media/libmedia/omx/1.0/WOmxNode.cpp

diff --git a/media/libmedia/omx/1.0/WOmxNode.cpp b/media/libmedia/omx/1.0/WOmxNode.cpp
index 2cd8b76..0b40e8d 100644
--- a/media/libmedia/omx/1.0/WOmxNode.cpp
+++ b/media/libmedia/omx/1.0/WOmxNode.cpp
@@ -151,8 +151,7 @@
                     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;

media/libstagefright/omx/1.0/WOmxNode.cpp

diff --git a/media/libstagefright/omx/1.0/WOmxNode.cpp b/media/libstagefright/omx/1.0/WOmxNode.cpp
index 1dc7c7b..9f82283 100644
--- a/media/libstagefright/omx/1.0/WOmxNode.cpp
+++ b/media/libstagefright/omx/1.0/WOmxNode.cpp
@@ -154,8 +154,7 @@
                     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;