Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-09 22:21:11 +00:00
committed by Android (Google) Code Review
parent b0302b10b2 d8983d671e
commit bce1bf4fdc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java
View File

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

2
core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java
View File

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