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

Camera: fix NPE from bad requestID

Browse Source 
This avoid NPE exception and accompanying logspam from binder
callbacks.

Test: N/A
Bug: 135268793
Change-Id: I729f4905c94698c95733570abe92ca3ba9163cc5
This commit is contained in:
Yin-Chia Yeh
2019-06-17 14:44:35 -07:00
parent ae092f2a4f
commit 67bd78ad73
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

@@ -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;