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

Commit d2c78f7c authored May 10, 2023 by Automerger Merge Worker

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 am: 42d6408f

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

Change-Id: Ifbae0f030154279dc814c3a0f08d134bfd7dfd1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 59076bf0 42d6408f

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