diff options
| -rw-r--r-- | core/java/android/hardware/camera2/legacy/RequestThreadManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java index 73edaee..317947f 100644 --- a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java +++ b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java @@ -195,12 +195,12 @@ public class RequestThreadManager { public void onPictureTaken(byte[] data, Camera camera) { Log.i(TAG, "Received jpeg."); Pair<RequestHolder, Long> captureInfo = mCaptureCollector.jpegProduced(); - RequestHolder holder = captureInfo.first; - long timestamp = captureInfo.second; - if (holder == null) { + if (captureInfo == null || captureInfo.first == null) { Log.e(TAG, "Dropping jpeg frame."); return; } + RequestHolder holder = captureInfo.first; + long timestamp = captureInfo.second; for (Surface s : holder.getHolderTargets()) { try { if (LegacyCameraDevice.containsSurfaceId(s, mJpegSurfaceIds)) { |