diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-02-03 18:48:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-03 18:48:38 +0000 |
| commit | 8189863774bd479f0060bbe1e4ce74dadcfc55c3 (patch) | |
| tree | 82955dbe3e2c88ae7425bef993b0d7c844727dff /camera | |
| parent | 3e7e574b682603dc7431fbfc377c2fb107d378f1 (diff) | |
| parent | 16e8d463bc5c8805ae6815c67875b16d177a9d8a (diff) | |
| download | frameworks_av-8189863774bd479f0060bbe1e4ce74dadcfc55c3.zip frameworks_av-8189863774bd479f0060bbe1e4ce74dadcfc55c3.tar.gz frameworks_av-8189863774bd479f0060bbe1e4ce74dadcfc55c3.tar.bz2 | |
am 16e8d463: Merge "camera2: fix various BpCameraDeviceUser methods to return correct result."
* commit '16e8d463bc5c8805ae6815c67875b16d177a9d8a':
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)) { |