camera2: Fix null check in PictureCallback.

Bug: 17636586
Change-Id: Ieddc106e14c97dc78405821e83e346d626127e2c

diff --git a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
index 73edaee..317947f 100644 (file)
--- 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)) {