commit f6b1396150ed55fa9829e31f11533cd65c61d914
author Eino-Ville Talvala <etalvala@google.com> Tue Feb 03 18:55:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 03 18:55:44 2015 +0000
tree 06247c9de5d10f56ecbfc8091b7d5cc8149f14f4
parent 3097dafa3ee60440c10b5bf9ed4d355fee1c1ae5
parent 8189863774bd479f0060bbe1e4ce74dadcfc55c3

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.

camera/camera2/ICameraDeviceUser.cpp

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 @@
             }
         }
 
-	if ((res != NO_ERROR) || (resFrameNumber != NO_ERROR)) {
+	if ((res < NO_ERROR) || (resFrameNumber != NO_ERROR)) {
             res = FAILED_TRANSACTION;
         }
         return res;
@@ -147,7 +147,7 @@
                 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 @@
         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 @@
         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)) {