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

Commit 3b93a85b authored by Yin-Chia Yeh's avatar Yin-Chia Yeh
Browse files

Camera: fix NPE in buffer error callback 

Check if the error stream has been removed first.
Also move some code in submitCaptureRequest so that access to
mConfiguredOutputs is within scope of mInterfaceLock, which
matches all other places accessing mConfiguredOutputs in the file.

Test: Camera CTS
Bug: 140374093, 140527066
Change-Id: I84921eb3a555f67a006548865f34502ab978e33b
parent 4096a806

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+32 −24
Original line number Diff line number Diff line
@@ -1026,6 +1026,9 @@ public class CameraDeviceImpl extends CameraDevice 
        // callback is valid

        executor = checkExecutor(executor, callback);



        synchronized(mInterfaceLock) {

            checkIfCameraClosedOrInError();



            // Make sure that there all requests have at least 1 surface; all surfaces are non-null;

            // the surface isn't a physical stream surface for reprocessing request

            for (CaptureRequest request : requestList) {
@@ -1052,8 +1055,6 @@ public class CameraDeviceImpl extends CameraDevice 
                }

            }



        synchronized(mInterfaceLock) {

            checkIfCameraClosedOrInError();

            if (repeating) {

                stopRepeating();

            }
@@ -2343,14 +2344,21 @@ public class CameraDeviceImpl extends CameraDevice 
            if (errorCode == ERROR_CAMERA_BUFFER) {

                // Because 1 stream id could map to multiple surfaces, we need to specify both

                // streamId and surfaceId.

                List<Surface> surfaces =

                        mConfiguredOutputs.get(resultExtras.getErrorStreamId()).getSurfaces();

                for (Surface surface : surfaces) {

                OutputConfiguration config = mConfiguredOutputs.get(

                        resultExtras.getErrorStreamId());

                if (config == null) {

                    Log.v(TAG, String.format(

                            "Stream %d has been removed. Skipping buffer lost callback",

                            resultExtras.getErrorStreamId()));

                    return;

                }

                for (Surface surface : config.getSurfaces()) {

                    if (!request.containsTarget(surface)) {

                        continue;

                    }

                    if (DEBUG) {

                        Log.v(TAG, String.format("Lost output buffer reported for frame %d, target %s",

                        Log.v(TAG, String.format(

                                "Lost output buffer reported for frame %d, target %s",

                                frameNumber, surface));

                    }

                    failureDispatch = new Runnable() {