From 67bd78ad73dc76086ca5c31f5b9e7ba424dee584 Mon Sep 17 00:00:00 2001 From: Yin-Chia Yeh Date: Mon, 17 Jun 2019 14:44:35 -0700 Subject: [PATCH] Camera: fix NPE from bad requestID This avoid NPE exception and accompanying logspam from binder callbacks. Test: N/A Bug: 135268793 Change-Id: I729f4905c94698c95733570abe92ca3ba9163cc5 --- .../android/hardware/camera2/impl/CameraDeviceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java index cc8c182b867e2..68857da940d59 100644 --- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java @@ -2337,6 +2337,12 @@ public class CameraDeviceImpl extends CameraDevice final CaptureCallbackHolder holder = 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); Runnable failureDispatch = null;