diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-02-03 18:55:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-03 18:55:44 +0000 |
| commit | f6b1396150ed55fa9829e31f11533cd65c61d914 (patch) | |
| tree | 06247c9de5d10f56ecbfc8091b7d5cc8149f14f4 /camera | |
| parent | 3097dafa3ee60440c10b5bf9ed4d355fee1c1ae5 (diff) | |
| parent | 8189863774bd479f0060bbe1e4ce74dadcfc55c3 (diff) | |
| download | frameworks_av-f6b1396150ed55fa9829e31f11533cd65c61d914.zip frameworks_av-f6b1396150ed55fa9829e31f11533cd65c61d914.tar.gz frameworks_av-f6b1396150ed55fa9829e31f11533cd65c61d914.tar.bz2 | |
am 81898637: am 16e8d463: Merge "camera2: fix various BpCameraDeviceUser methods to return correct result."
* commit '8189863774bd479f0060bbe1e4ce74dadcfc55c3':
camera2: fix various BpCameraDeviceUser methods to return correct result.
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/camera2/ICameraDeviceUser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/camera/camera2/ICameraDeviceUser.cpp b/camera/camera2/ICameraDeviceUser.cpp index 35345d2..277b5db 100644 --- a/camera/camera2/ICameraDeviceUser.cpp +++ b/camera/camera2/ICameraDeviceUser.cpp @@ -107,7 +107,7 @@ public: } } - if ((res != NO_ERROR) || (resFrameNumber != NO_ERROR)) { + if ((res < NO_ERROR) || (resFrameNumber != NO_ERROR)) { res = FAILED_TRANSACTION; } return res; @@ -147,7 +147,7 @@ public: resFrameNumber = reply.readInt64(lastFrameNumber); } } - if ((res != NO_ERROR) || (resFrameNumber != NO_ERROR)) { + if ((res < NO_ERROR) || (resFrameNumber != NO_ERROR)) { res = FAILED_TRANSACTION; } return res; @@ -167,7 +167,7 @@ public: status_t resFrameNumber = BAD_VALUE; if (reply.readInt32() != 0) { if (lastFrameNumber != NULL) { - res = reply.readInt64(lastFrameNumber); + resFrameNumber = reply.readInt64(lastFrameNumber); } } if ((res != NO_ERROR) || (resFrameNumber != NO_ERROR)) { @@ -296,7 +296,7 @@ public: status_t resFrameNumber = BAD_VALUE; if (reply.readInt32() != 0) { if (lastFrameNumber != NULL) { - res = reply.readInt64(lastFrameNumber); + resFrameNumber = reply.readInt64(lastFrameNumber); } } if ((res != NO_ERROR) || (resFrameNumber != NO_ERROR)) { |