Camera: Futher increase performance measure timeout to 40s
Test: Run scene 2_c
Bug: 221459825
Change-Id: I2b2d0b238fb9470a86ede9aef4d474773d7216ab
diff --git a/apps/CameraITS/utils/its_session_utils.py b/apps/CameraITS/utils/its_session_utils.py
index b8df46d..cac2291 100644
--- a/apps/CameraITS/utils/its_session_utils.py
+++ b/apps/CameraITS/utils/its_session_utils.py
@@ -82,9 +82,12 @@
# Seconds timeout on each socket operation.
SOCK_TIMEOUT = 20.0
+ # Seconds timeout on performance measurement socket operation
+ SOCK_TIMEOUT_FOR_PERF_MEASURE = 40.0
+
# Additional timeout in seconds when ITS service is doing more complicated
# operations, for example: issuing warmup requests before actual capture.
- EXTRA_SOCK_TIMEOUT = 10.0
+ EXTRA_SOCK_TIMEOUT = 5.0
PACKAGE = 'com.android.cts.verifier.camera.its'
INTENT_START = 'com.android.cts.verifier.camera.its.START'
@@ -1138,7 +1141,7 @@
cmd['cameraId'] = self._camera_id
self.sock.send(json.dumps(cmd).encode() + '\n'.encode())
- timeout = self.SOCK_TIMEOUT + self.EXTRA_SOCK_TIMEOUT
+ timeout = self.SOCK_TIMEOUT_FOR_PERF_MEASURE
self.sock.settimeout(timeout)
data, _ = self.__read_response_from_socket()
self.sock.settimeout(self.SOCK_TIMEOUT)
@@ -1158,7 +1161,7 @@
cmd['cameraId'] = self._camera_id
self.sock.send(json.dumps(cmd).encode() + '\n'.encode())
- timeout = self.SOCK_TIMEOUT + self.EXTRA_SOCK_TIMEOUT
+ timeout = self.SOCK_TIMEOUT_FOR_PERF_MEASURE
self.sock.settimeout(timeout)
data, _ = self.__read_response_from_socket()
self.sock.settimeout(self.SOCK_TIMEOUT)
