commit fee09ec6cd1c8fb43cbb502012eb98a4e1d02435
author android-build-team Robot <android-build-team-robot@google.com> Fri Feb 23 18:42:09 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Feb 23 18:42:09 2018 +0000
tree f031ff9c0a2a1f0daf721fc2f9862dc14739326f
parent e9af8cd1c8e642640e2bf4d1f32ea9779cdb40c0
parent 41f050307eb2ebdd75b2d569482e5e444c500144

Merge cherrypicks of [3652403] into oc-m3-release

Change-Id: I38b14a18697f804277bd78c69c8a4b1749c71d4d

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;