Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d3ab8bd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Avoid NPE when extension results are not supported" into... 

Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev am: 8f42b2f8 am: 5c002a64 am: 3d698aab

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19451689



Change-Id: I3d36b6323c6434f0ad0351a7026c8b4b51568b67
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76715731 3d698aab

core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java

+4 −2
Original line number Diff line number Diff line
@@ -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);

                    if (mCaptureResultHandler != null) {

                        mCaptureResultHandler.onCaptureCompleted(timestamp,

                                initializeFilteredResults(result));

                    }



                    Log.w(TAG, "Preview frame drop with timestamp: " + previewMap.keyAt(i));

                    final long ident = Binder.clearCallingIdentity();