Merge "Camera: fix NPE from bad requestID" into qt-qpr1-dev

am: 51cf32b4f3

Change-Id: If618d57c6444c874d1d6037c332cbae4c3cf01a6

1 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
index 06ced7c68467..f42228935579 100644
--- a/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
+++ b/core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
@@ -2338,6 +2338,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;