summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authormspector@google.com <mspector@google.com>2016-02-19 12:10:48 -0800
committerThe Android Automerger <android-build@google.com>2016-02-26 16:56:00 -0800
commit1f76ce4e2c13d0347523e8c9a27077c820715f08 (patch)
tree1c47396aa681bafdb443f1767d9916ca3476d320 /media
parent57bf4973b57dc62e7171c1cb2e0854f9e21fd3e4 (diff)
downloadframeworks_av-1f76ce4e2c13d0347523e8c9a27077c820715f08.zip
frameworks_av-1f76ce4e2c13d0347523e8c9a27077c820715f08.tar.gz
frameworks_av-1f76ce4e2c13d0347523e8c9a27077c820715f08.tar.bz2
Fixing safteynet logging bug introduced in ag/862848
We moved the safteynet logging into storeMetaDataInBuffers_l Bug: 26324358 Change-Id: I2171742b53192ebb71d546bcb8970bb3c68f366f
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/IOMX.cpp4
-rw-r--r--media/libstagefright/omx/OMXNodeInstance.cpp1
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;
}