Merge "Merge "Camera: Skip extension processing if session is not valid" into... (65f13a35) · Commits · e / os / android_frameworks_base

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -1757,7 +1757,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(
		@@ -1780,8 +1781,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)) {
		@@ -1828,7 +1829,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) {