commit f83a9660649e3f286aa0924b1c57838582d5a4db
author Yin-Chia Yeh <yinchiayeh@google.com> Mon Jun 17 14:44:35 2019 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Wed Sep 18 18:14:16 2019 +0000
tree 22d3787bab581536b61ee7c920a6dbf977ff818a
parent 01047d0372e71d9f9999f13549cf2bddfa5b6824

Camera: fix NPE from bad requestID

This avoid NPE exception and accompanying logspam from binder
callbacks.

Test: N/A
Bug: 141250131
Merged-In: I729f4905c94698c95733570abe92ca3ba9163cc5
Change-Id: I729f4905c94698c95733570abe92ca3ba9163cc5
(cherry picked from commit 67bd78ad73dc76086ca5c31f5b9e7ba424dee584)

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

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