diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-25 19:58:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 19:58:23 +0000 |
| commit | abf9e2b6190f95b1eb96e1199986d7b00f26a5b6 (patch) | |
| tree | b8bc30415b4e1fc5a5c7edb652d3b7966af480e5 /media | |
| parent | dbd6e0a9e4355b8d814fb16b70c1efde796de406 (diff) | |
| parent | e30dc38b0df66eaed56b3c37b45a68670808d6c9 (diff) | |
| download | frameworks_av-abf9e2b6190f95b1eb96e1199986d7b00f26a5b6.zip frameworks_av-abf9e2b6190f95b1eb96e1199986d7b00f26a5b6.tar.gz frameworks_av-abf9e2b6190f95b1eb96e1199986d7b00f26a5b6.tar.bz2 | |
am e30dc38b: am 7877cb80: Merge "Img_utils: Fix "unused" variables"
* commit 'e30dc38b0df66eaed56b3c37b45a68670808d6c9':
Img_utils: Fix "unused" variables
Diffstat (limited to 'media')
| -rw-r--r-- | media/img_utils/src/FileInput.cpp | 2 | ||||
| -rw-r--r-- | media/img_utils/src/FileOutput.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/img_utils/src/FileInput.cpp b/media/img_utils/src/FileInput.cpp index 498e715..4c85a51 100644 --- a/media/img_utils/src/FileInput.cpp +++ b/media/img_utils/src/FileInput.cpp @@ -78,7 +78,7 @@ status_t FileInput::close() { ret = BAD_VALUE; } mOpen = false; - return OK; + return ret; } } /*namespace img_utils*/ diff --git a/media/img_utils/src/FileOutput.cpp b/media/img_utils/src/FileOutput.cpp index ce763ff..0346762 100644 --- a/media/img_utils/src/FileOutput.cpp +++ b/media/img_utils/src/FileOutput.cpp @@ -72,7 +72,7 @@ status_t FileOutput::close() { ret = BAD_VALUE; } mOpen = false; - return OK; + return ret; } } /*namespace img_utils*/ |