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

Commit 67bd78ad authored by Yin-Chia Yeh's avatar Yin-Chia Yeh
Browse files

Camera: fix NPE from bad requestID 

This avoid NPE exception and accompanying logspam from binder
callbacks.

Test: N/A
Bug: 135268793
Change-Id: I729f4905c94698c95733570abe92ca3ba9163cc5
parent ae092f2a

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -2337,6 +2337,12 @@ public class CameraDeviceImpl extends CameraDevice 
            final CaptureCallbackHolder holder =

            final CaptureCallbackHolder holder =

                    CameraDeviceImpl.this.mCaptureCallbackMap.get(requestId);

                    CameraDeviceImpl.this.mCaptureCallbackMap.get(requestId);





            if (holder == null) {

                Log.e(TAG, String.format("Receive capture error on unknown request ID %d",

                        requestId));

                return;

            }



            final CaptureRequest request = holder.getRequest(subsequenceId);

            final CaptureRequest request = holder.getRequest(subsequenceId);





            Runnable failureDispatch = null;

            Runnable failureDispatch = null;