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

Commit 42d6408f authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Camera: Always release the extension session after... 

Merge "Merge "Camera: Always release the extension session after configuration" into udc-dev am: bce1bf4f am: b04eecfd am: 28610bb8" into udc-qpr-dev-plus-aosp
parents 8a782e72 30e660f2

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

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ public final class CameraAdvancedExtensionSessionImpl extends CameraExtensionSes 


            if (mExtensionClientId >= 0) {

                CameraExtensionCharacteristics.unregisterClient(mExtensionClientId);

                if (mInitialized) {

                if (mInitialized || (mCaptureSession != null)) {

                    notifyClose = true;

                    CameraExtensionCharacteristics.releaseSession();

                }

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

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { 


            if (mExtensionClientId >= 0) {

                CameraExtensionCharacteristics.unregisterClient(mExtensionClientId);

                if (mInitialized) {

                if (mInitialized || (mCaptureSession != null)) {

                    notifyClose = true;

                    CameraExtensionCharacteristics.releaseSession();

                }