Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 51cf32b4f3

Change-Id: If618d57c6444c874d1d6037c332cbae4c3cf01a6
This commit is contained in:
Yin-Chia Yeh
2019-09-18 14:00:20 -07:00
committed by android-build-merger
parent db0955b685 51cf32b4f3
commit 4a75a20232
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
View File

@@ -2338,6 +2338,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;