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

Commit d8983d67 authored Mar 15, 2023 by Emilian Peev

Camera: Always release the extension session after configuration

Since both the session 'onConfigured' callback and the
initialization session callback run within the same Handler
thread, it is possible for the 'onSuccess' callback to fail
to execute if there is another thread the releases the
extension session and quits the thread.
Ensure that the extension session is released also when we
have a valid capture session.

Bug: 270276341
Test: atest -c -d
cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java

Change-Id: I03fd9b2859ae8919ca89c823fed973853030bc5f

parent 370fbcc5

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -542,7 +542,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();
		}