diff options
| author | mspector@google.com <mspector@google.com> | 2016-02-19 12:10:48 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-03-01 15:25:30 -0800 |
| commit | a685aea781026471ad82f5729198c60bcb4f8fe9 (patch) | |
| tree | 8a34424a53150685406eabae6760e6ace6f4fe3b | |
| parent | 1a5ab71d6a43a53535f37648b09d22b741265bb2 (diff) | |
| download | frameworks_av-a685aea781026471ad82f5729198c60bcb4f8fe9.zip frameworks_av-a685aea781026471ad82f5729198c60bcb4f8fe9.tar.gz frameworks_av-a685aea781026471ad82f5729198c60bcb4f8fe9.tar.bz2 | |
Fixing safteynet logging bug introduced in ag/862848
We moved the safteynet logging into storeMetaDataInBuffers_l
Bug: 26324358
Change-Id: I2171742b53192ebb71d546bcb8970bb3c68f366f
| -rw-r--r-- | media/libmedia/IOMX.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/media/libmedia/IOMX.cpp b/media/libmedia/IOMX.cpp index 07f3697..97b7ff0 100644 --- a/media/libmedia/IOMX.cpp +++ b/media/libmedia/IOMX.cpp @@ -925,10 +925,6 @@ status_t BnOMX::onTransact( MetadataBufferType type = kMetadataBufferTypeInvalid; status_t err = storeMetaDataInBuffers(node, port_index, enable, &type); - if ((err != OK) && (type == kMetadataBufferTypeInvalid)) { - android_errorWriteLog(0x534e4554, "26324358"); - } - reply->writeInt32(type); reply->writeInt32(err); diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 94a213a..8735eff 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -519,6 +519,7 @@ status_t OMXNodeInstance::storeMetaDataInBuffers( status_t OMXNodeInstance::storeMetaDataInBuffers_l( OMX_U32 portIndex, OMX_BOOL enable, MetadataBufferType *type) { if (portIndex != kPortIndexInput && portIndex != kPortIndexOutput) { + android_errorWriteLog(0x534e4554, "26324358"); return BAD_VALUE; } |