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

Commit 8f42b2f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Avoid NPE when extension results are not supported" into tm-d1-dev

parents 530bbf8d 671d613b

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();