| Révision | 3e27a2ae0e6fbbce187e7a6e9079c5f5975d926d (tree) |
|---|---|
| l'heure | 2018-02-24 06:15:57 |
| Auteur | android-build-team Robot <android-build-team-robot@goog...> |
| Commiter | android-build-team Robot |
Merge cherrypicks of [3654171] into oc-m5-release
Change-Id: I175b50cba5eb73028ec205f4ca9abacef63fcd80
media/libmedia/omx/1.0/WOmxNode.cpp (diff) media/libstagefright/omx/1.0/WOmxNode.cpp (diff)| @@ -151,8 +151,7 @@ status_t LWOmxNode::allocateSecureBuffer( | ||
| 151 | 151 | hidl_handle const& outNativeHandle) { |
| 152 | 152 | fnStatus = toStatusT(status); |
| 153 | 153 | *buffer = outBuffer; |
| 154 | - *native_handle = outNativeHandle.getNativeHandle() == nullptr ? | |
| 155 | - nullptr : NativeHandle::create( | |
| 154 | + *native_handle = NativeHandle::create( | |
| 156 | 155 | native_handle_clone(outNativeHandle), true); |
| 157 | 156 | })); |
| 158 | 157 | return transStatus == NO_ERROR ? fnStatus : transStatus; |
| @@ -154,8 +154,7 @@ status_t LWOmxNode::allocateSecureBuffer( | ||
| 154 | 154 | hidl_handle const& outNativeHandle) { |
| 155 | 155 | fnStatus = toStatusT(status); |
| 156 | 156 | *buffer = outBuffer; |
| 157 | - *native_handle = outNativeHandle.getNativeHandle() == nullptr ? | |
| 158 | - nullptr : NativeHandle::create( | |
| 157 | + *native_handle = NativeHandle::create( | |
| 159 | 158 | native_handle_clone(outNativeHandle), true); |
| 160 | 159 | })); |
| 161 | 160 | return transStatus == NO_ERROR ? fnStatus : transStatus; |
Android-x86
Fork