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

Commit b4e87c11 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android Git Automerger
Browse files

am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev 

* commit '4754428da2cc3e1224fc6f227ac831fee90c8b96':
  camera2: Fix null check in PictureCallback.
parents bd5ccc1b 4b6b2104

core/java/android/hardware/camera2/legacy/RequestThreadManager.java

+3 −3
Original line number Diff line number Diff line
@@ -195,12 +195,12 @@ public class RequestThreadManager { 
        public void onPictureTaken(byte[] data, Camera camera) {

            Log.i(TAG, "Received jpeg.");

            Pair<RequestHolder, Long> captureInfo = mCaptureCollector.jpegProduced();

            RequestHolder holder = captureInfo.first;

            long timestamp = captureInfo.second;

            if (holder == null) {

            if (captureInfo == null || captureInfo.first == null) {

                Log.e(TAG, "Dropping jpeg frame.");

                return;

            }

            RequestHolder holder = captureInfo.first;

            long timestamp = captureInfo.second;

            for (Surface s : holder.getHolderTargets()) {

                try {

                    if (LegacyCameraDevice.containsSurfaceId(s, mJpegSurfaceIds)) {