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

Commit 5f7a7d75 authored by Avichal Rakesh's avatar Avichal Rakesh Committed by Android (Google) Code Review
Browse files

Merge changes from topics "calculate_pref_override_during_session_support",... 

Merge changes from topics "calculate_pref_override_during_session_support", "check_session_support_before_session_char" into main

* changes:
  Camera2: Send target SDK version to ICameraService#isSessionConfigurationWithParametersSupported
  Camera2: Document exception when SessionConfiguration is not supported
parents b8d1a3b0 d6bc5040

core/java/android/hardware/camera2/CameraDevice.java

+6 −3
Original line number Diff line number Diff line
@@ -1768,7 +1768,10 @@ public abstract class CameraDevice implements AutoCloseable { 
         * @param sessionConfig The session configuration for which characteristics are fetched.

         * @return CameraCharacteristics specific to a given session configuration.

         *

         * @throws IllegalArgumentException      if the session configuration is invalid

         * @throws IllegalArgumentException if the session configuration is invalid or if

         *                                  {@link #isSessionConfigurationSupported} returns

         *                                  {@code false} for the provided

         *                                  {@link SessionConfiguration}

         * @throws CameraAccessException    if the camera device is no longer connected or has

         *                                  encountered a fatal error

         *

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

+2 −2
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ public class CameraDeviceSetupImpl extends CameraDevice.CameraDeviceSetup { 
            }



            try {

                return cameraService.isSessionConfigurationWithParametersSupported(

                        mCameraId, config, mContext.getDeviceId(),

                return cameraService.isSessionConfigurationWithParametersSupported(mCameraId,

                        mTargetSdkVersion, config, mContext.getDeviceId(),

                        mCameraManager.getDevicePolicyFromContext(mContext));

            } catch (ServiceSpecificException e) {

                throw ExceptionUtils.throwAsPublicException(e);