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

Commit 28610bb8 authored May 09, 2023 by Treehugger Robot Committed by Automerger Merge Worker May 09, 2023

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

Merge "Camera: Always release the extension session after configuration" into udc-dev am: bce1bf4f am: b04eecfd

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

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

parents 1a0f61d6 b04eecfd

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