diff options
| author | 2024-03-18 23:03:33 +0000 | |
|---|---|---|
| committer | 2024-03-18 23:03:33 +0000 | |
| commit | c8ad186151a9968ac81fadc48ab3ed27164efae8 (patch) | |
| tree | 109e71214eeb83997df4a929f7bd648e2d0e8274 | |
| parent | 9fe168541cebc6bb7f55e7f4e9116c6bad841bde (diff) | |
| parent | 658799b7f7a34a58ab255981a95268b8ca02ab20 (diff) | |
Merge "Camera: Skip extension processing if session is not valid" into main
| -rw-r--r-- | core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java index db7055b1756d..7f9087baf668 100644 --- a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java +++ b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java @@ -1742,7 +1742,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { mCallbacks, result.getSequenceId()); } if ((!mSingleCapture) && (mPreviewProcessorType == - IPreviewExtenderImpl.PROCESSOR_TYPE_REQUEST_UPDATE_ONLY)) { + IPreviewExtenderImpl.PROCESSOR_TYPE_REQUEST_UPDATE_ONLY) + && mInitialized) { CaptureStageImpl captureStage = null; try { captureStage = mPreviewRequestUpdateProcessor.process( @@ -1765,8 +1766,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { } else { mRequestUpdatedNeeded = false; } - } else if (mPreviewProcessorType == - IPreviewExtenderImpl.PROCESSOR_TYPE_IMAGE_PROCESSOR) { + } else if ((mPreviewProcessorType == + IPreviewExtenderImpl.PROCESSOR_TYPE_IMAGE_PROCESSOR) && mInitialized) { int idx = mPendingResultMap.indexOfKey(timestamp); if ((idx >= 0) && (mPendingResultMap.get(timestamp).first == null)) { @@ -1813,7 +1814,7 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession { } else { // No special handling for PROCESSOR_TYPE_NONE } - if (notifyClient) { + if (notifyClient && mInitialized) { final long ident = Binder.clearCallingIdentity(); try { if (processStatus) { |