diff options
| author | 2022-08-01 17:51:57 +0000 | |
|---|---|---|
| committer | 2022-08-01 17:51:57 +0000 | |
| commit | 13dd5971c43142661b283877a88f162ec2b6a8ac (patch) | |
| tree | 6b323c696d5e6b0ac6db7ea05ad91c6e2ab974ed | |
| parent | 4a332f20da85f1991d032dd3fcac5d955b61c7cc (diff) | |
| parent | 8f42b2f8d613d3a2858280e7ace068b7bb002321 (diff) | |
Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689
Change-Id: Ie2118964e3072a9c3cf7b45a296b1aa4674084af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java index 336ef7ac78db..41822e77f953 100644 --- a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java @@ -1693,8 +1693,10 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { ((i != idx) || notifyCurrentIndex)) { TotalCaptureResult result = previewMap.valueAt(i).second; Long timestamp = result.get(CaptureResult.SENSOR_TIMESTAMP); - mCaptureResultHandler.onCaptureCompleted(timestamp, - initializeFilteredResults(result)); + if (mCaptureResultHandler != null) { + mCaptureResultHandler.onCaptureCompleted(timestamp, + initializeFilteredResults(result)); + } Log.w(TAG, "Preview frame drop with timestamp: " + previewMap.keyAt(i)); final long ident = Binder.clearCallingIdentity(); |