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

Commit 248334cb authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

Merge "Camera: fix wrong vector size bug" am: 5d03729b 

am: dad308b4

Change-Id: I20984eefe33ab8633dd491bb9ab433958f15925f
parents eeec0d41 dad308b4

camera/ICameraClient.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -192,12 +192,14 @@ status_t BnCameraClient::onTransact( 
            timestamps.reserve(n);

            timestamps.reserve(n);

            handles.reserve(n);

            handles.reserve(n);

            for (uint32_t i = 0; i < n; i++) {

            for (uint32_t i = 0; i < n; i++) {

                res = data.readInt64(&timestamps[i]);

                nsecs_t t;

                res = data.readInt64(&t);

                if (res != OK) {

                if (res != OK) {

                    ALOGE("%s: Failed to read timestamp[%d]: %s (%d)",

                    ALOGE("%s: Failed to read timestamp[%d]: %s (%d)",

                            __FUNCTION__, i, strerror(-res), res);

                            __FUNCTION__, i, strerror(-res), res);

                    return BAD_VALUE;

                    return BAD_VALUE;

                }

                }

                timestamps.push_back(t);

            }

            }

            for (uint32_t i = 0; i < n; i++) {

            for (uint32_t i = 0; i < n; i++) {

                native_handle_t* handle = data.readNativeHandle();

                native_handle_t* handle = data.readNativeHandle();

camera/ICameraRecordingProxyListener.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -146,12 +146,14 @@ status_t BnCameraRecordingProxyListener::onTransact( 
            timestamps.reserve(n);

            timestamps.reserve(n);

            handles.reserve(n);

            handles.reserve(n);

            for (uint32_t i = 0; i < n; i++) {

            for (uint32_t i = 0; i < n; i++) {

                res = data.readInt64(&timestamps[i]);

                nsecs_t t;

                res = data.readInt64(&t);

                if (res != OK) {

                if (res != OK) {

                    ALOGE("%s: Failed to read timestamp[%d]: %s (%d)",

                    ALOGE("%s: Failed to read timestamp[%d]: %s (%d)",

                            __FUNCTION__, i, strerror(-res), res);

                            __FUNCTION__, i, strerror(-res), res);

                    return BAD_VALUE;

                    return BAD_VALUE;

                }

                }

                timestamps.push_back(t);

            }

            }

            for (uint32_t i = 0; i < n; i++) {

            for (uint32_t i = 0; i < n; i++) {

                native_handle_t* handle = data.readNativeHandle();

                native_handle_t* handle = data.readNativeHandle();