Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81898637 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am 16e8d463: Merge "camera2: fix various BpCameraDeviceUser methods to return correct result." 

* commit '16e8d463':
  camera2: fix various BpCameraDeviceUser methods to return correct result.
parents 3e7e574b 16e8d463

camera/camera2/ICameraDeviceUser.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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)) {