ITS: correct first_api_level for Android T
bug: 230281988
Change-Id: I5e5aebdbe158dd89996f7c2b6b39e0654eeaa597
diff --git a/apps/CameraITS/tests/scene2_a/test_auto_flash.py b/apps/CameraITS/tests/scene2_a/test_auto_flash.py
index c6d0633..d9b233a 100644
--- a/apps/CameraITS/tests/scene2_a/test_auto_flash.py
+++ b/apps/CameraITS/tests/scene2_a/test_auto_flash.py
@@ -29,7 +29,6 @@
4: 'ON_AUTO_FLASH_REDEYE', 5: 'ON_EXTERNAL_FLASH'}
AE_STATES = {0: 'INACTIVE', 1: 'SEARCHING', 2: 'CONVERGED', 3: 'LOCKED',
4: 'FLASH_REQUIRED', 5: 'PRECAPTURE'}
-_FLASH_CHECK_FIRST_API_LEVEL = 32
_GRAD_DELTA_ATOL = 100 # gradiant for tablets as screen aborbs energy
_MEAN_DELTA_ATOL = 100 # mean used for reflective charts
_NUM_FRAMES = 8
@@ -68,7 +67,7 @@
first_api_level = its_session_utils.get_first_api_level(self.dut.serial)
camera_properties_utils.skip_unless(
camera_properties_utils.flash(props) and
- first_api_level >= _FLASH_CHECK_FIRST_API_LEVEL)
+ first_api_level >= its_session_utils.ANDROID13_API_LEVEL)
# establish connection with lighting controller
arduino_serial_port = lighting_control_utils.lighting_control(
diff --git a/apps/CameraITS/tests/scene4/test_video_aspect_ratio_and_crop.py b/apps/CameraITS/tests/scene4/test_video_aspect_ratio_and_crop.py
index 1ffab54..619aa11 100644
--- a/apps/CameraITS/tests/scene4/test_video_aspect_ratio_and_crop.py
+++ b/apps/CameraITS/tests/scene4/test_video_aspect_ratio_and_crop.py
@@ -26,7 +26,6 @@
import opencv_processing_utils
import image_fov_utils
-_ANDROID13_API_LEVEL = 32
_NAME = os.path.splitext(os.path.basename(__file__))[0]
_VIDEO_RECORDING_DURATION_SECONDS = 3
_FOV_PERCENT_RTOL = 0.15 # Relative tolerance on circle FoV % to expected.
@@ -135,7 +134,7 @@
# Check SKIP conditions.
first_api_level = its_session_utils.get_first_api_level(self.dut.serial)
camera_properties_utils.skip_unless(
- first_api_level >= _ANDROID13_API_LEVEL)
+ first_api_level >= its_session_utils.ANDROID13_API_LEVEL)
# Load scene.
its_session_utils.load_scene(cam, props, self.scene,
diff --git a/apps/CameraITS/tests/sensor_fusion/test_video_stabilization.py b/apps/CameraITS/tests/sensor_fusion/test_video_stabilization.py
index 92d1ff1..7bc4c1f 100644
--- a/apps/CameraITS/tests/sensor_fusion/test_video_stabilization.py
+++ b/apps/CameraITS/tests/sensor_fusion/test_video_stabilization.py
@@ -29,7 +29,6 @@
import its_session_utils
import sensor_fusion_utils
-_ANDROID13_API_LEVEL = 32
_ARDUINO_ANGLES = (10, 25) # degrees
_ARDUINO_MOVE_TIME = 0.30 # seconds
_ARDUINO_SERVO_SPEED = 10
@@ -142,7 +141,7 @@
props = cam.override_with_hidden_physical_camera_props(props)
first_api_level = its_session_utils.get_first_api_level(self.dut.serial)
camera_properties_utils.skip_unless(
- first_api_level >= _ANDROID13_API_LEVEL)
+ first_api_level >= its_session_utils.ANDROID13_API_LEVEL)
# Raise error if not FRONT or REAR facing camera
facing = props['android.lens.facing']
diff --git a/apps/CameraITS/utils/its_session_utils.py b/apps/CameraITS/utils/its_session_utils.py
index c514740..b72af5a 100644
--- a/apps/CameraITS/utils/its_session_utils.py
+++ b/apps/CameraITS/utils/its_session_utils.py
@@ -35,6 +35,7 @@
import image_processing_utils
import opencv_processing_utils
+ANDROID13_API_LEVEL = 33
LOAD_SCENE_DELAY_SEC = 3
SUB_CAMERA_SEPARATOR = '.'
_VALIDATE_LIGHTING_PATCH_H = 0.05
