| commit | 2d3ab8bd840d5a7d996defccc90058cf7a2b43cb | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Aug 01 18:03:39 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 01 18:03:39 2022 +0000 |
| tree | 1a501610b17dc822203cbb2d5a6bb47c1093d507 | |
| parent | 76715731c22d5cf7f934de19cb758092dd7b3e42 [diff] | |
| parent | 3d698aabaa14902a7da30f47ede26dbd35bd7b8e [diff] |
Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8d6 am: 5c002a64a5 am: 3d698aabaa Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689 Change-Id: I3d36b6323c6434f0ad0351a7026c8b4b51568b67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java index 336ef7a..41822e7 100644 --- a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java
@@ -1693,8 +1693,10 @@ ((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();