diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-09-25 11:48:27 -0700 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2014-09-25 11:48:27 -0700 |
| commit | 2c3d7c5f68993531a4f5f91c1335cac8ca448e17 (patch) | |
| tree | 58700452db10dbdb566c9bafb0b26dd34c6a2523 | |
| parent | 0fd198ad89ec9c600bb1761b10d938146c28bb98 (diff) | |
| download | frameworks_base-2c3d7c5f68993531a4f5f91c1335cac8ca448e17.zip frameworks_base-2c3d7c5f68993531a4f5f91c1335cac8ca448e17.tar.gz frameworks_base-2c3d7c5f68993531a4f5f91c1335cac8ca448e17.tar.bz2 | |
camera2: Fix null check in PictureCallback.
Bug: 17636586
Change-Id: Ieddc106e14c97dc78405821e83e346d626127e2c
| -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)) { |