diff options
| author | 2023-05-09 22:45:49 +0000 | |
|---|---|---|
| committer | 2023-05-09 22:45:49 +0000 | |
| commit | b04eecfd159bd6f12abce0b89489c0eac95d2d40 (patch) | |
| tree | ee50d43f4182e328f5b388836eac64a44ff26c61 | |
| parent | 179cad08103c1bcd5002ed32e7987b8a26f76a23 (diff) | |
| parent | bce1bf4fdc1ad147f31b40fb4c9df7cd06a84629 (diff) | |
Merge "Camera: Always release the extension session after configuration" into udc-dev am: bce1bf4fdc
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>
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java | 2 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java index 10753faace98..e787779d0f57 100644 --- a/core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraAdvancedExtensionSessionImpl.java @@ -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(); } diff --git a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java index 48f18c9d2387..8e7c7e0cfca8 100644 --- a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java @@ -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(); } |