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

Commit b04eecfd 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

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

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

parents 179cad08 bce1bf4f

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

+1 −1

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

	if (mExtensionClientId >= 0) {		if (mExtensionClientId >= 0) {
	CameraExtensionCharacteristics.unregisterClient(mExtensionClientId);		CameraExtensionCharacteristics.unregisterClient(mExtensionClientId);
	if (mInitialized) {		if (mInitialized \|\| (mCaptureSession != null)) {
	notifyClose = true;		notifyClose = true;
	CameraExtensionCharacteristics.releaseSession();		CameraExtensionCharacteristics.releaseSession();
	}		}

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

+1 −1

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

	if (mExtensionClientId >= 0) {		if (mExtensionClientId >= 0) {
	CameraExtensionCharacteristics.unregisterClient(mExtensionClientId);		CameraExtensionCharacteristics.unregisterClient(mExtensionClientId);
	if (mInitialized) {		if (mInitialized \|\| (mCaptureSession != null)) {
	notifyClose = true;		notifyClose = true;
	CameraExtensionCharacteristics.releaseSession();		CameraExtensionCharacteristics.releaseSession();
	}		}