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

Commit 5c390a23 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Skip extension processing if session is not valid" into main... 

Merge "Camera: Skip extension processing if session is not valid" into main am: c8ad1861 am: 4883dc24

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



Change-Id: I0f01d6940e24cae7f89dc7cdcb31f79b153880cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6a23c64 4883dc24

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

+5 −4
Original line number Diff line number Diff line
@@ -1757,7 +1757,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
                                mCallbacks, result.getSequenceId());

                    }

                    if ((!mSingleCapture) && (mPreviewProcessorType ==

                            IPreviewExtenderImpl.PROCESSOR_TYPE_REQUEST_UPDATE_ONLY)) {

                            IPreviewExtenderImpl.PROCESSOR_TYPE_REQUEST_UPDATE_ONLY)

                            && mInitialized) {

                        CaptureStageImpl captureStage = null;

                        try {

                            captureStage = mPreviewRequestUpdateProcessor.process(
@@ -1780,8 +1781,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
                        } else {

                            mRequestUpdatedNeeded = false;

                        }

                    } else if (mPreviewProcessorType ==

                            IPreviewExtenderImpl.PROCESSOR_TYPE_IMAGE_PROCESSOR) {

                    } else if ((mPreviewProcessorType ==

                            IPreviewExtenderImpl.PROCESSOR_TYPE_IMAGE_PROCESSOR) && mInitialized) {

                        int idx = mPendingResultMap.indexOfKey(timestamp);



                        if ((idx >= 0) && (mPendingResultMap.get(timestamp).first == null)) {
@@ -1828,7 +1829,7 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 
                    } else {

                        // No special handling for PROCESSOR_TYPE_NONE

                    }

                    if (notifyClient) {

                    if (notifyClient && mInitialized) {

                        final long ident = Binder.clearCallingIdentity();

                        try {

                            if (processStatus) {