diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-04-09 20:07:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-04-09 20:07:42 +0000 |
| commit | bf7379d75a66caa2cf663e6bf31b5b963ce45aec (patch) | |
| tree | a87b98627222774923cfa98acf498021a5488e17 | |
| parent | 96568261816a45bd269652a5d59e5a6135286dde (diff) | |
| parent | 6dfefdefa1356f0c6867ec871838fb3a479f34d1 (diff) | |
| download | cts-sparse-6417141-L40200000547630027.tar.gz | |
Merge "Snap for 6381431 from 196e3f5ede0ab92851593f35e3d24f6fbaf70622 to android10-tests-release" into android10-tests-releasesparse-6417141-L40200000547630027
| -rw-r--r-- | apps/CameraITS/tests/scene0/test_metadata.py | 2 | ||||
| -rw-r--r-- | hostsidetests/statsd/src/android/cts/statsd/atom/ProcStateAtomTests.java | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/CameraITS/tests/scene0/test_metadata.py b/apps/CameraITS/tests/scene0/test_metadata.py index 4468c5da726..88c7eef720c 100644 --- a/apps/CameraITS/tests/scene0/test_metadata.py +++ b/apps/CameraITS/tests/scene0/test_metadata.py @@ -101,7 +101,7 @@ def main(): fl = md["android.lens.focalLength"] fov = 2 * math.degrees(math.atan(diag / (2 * fl))) print "Assert field of view: %.1f degrees" % fov - assert 30 <= fov <= 130 + assert 10 <= fov <= 130 if its.caps.lens_approx_calibrated(props): diopter_hyperfocal = props["android.lens.info.hyperfocalDistance"] diff --git a/hostsidetests/statsd/src/android/cts/statsd/atom/ProcStateAtomTests.java b/hostsidetests/statsd/src/android/cts/statsd/atom/ProcStateAtomTests.java index a4b67a5ea35..0d63eccb6aa 100644 --- a/hostsidetests/statsd/src/android/cts/statsd/atom/ProcStateAtomTests.java +++ b/hostsidetests/statsd/src/android/cts/statsd/atom/ProcStateAtomTests.java @@ -106,8 +106,8 @@ public class ProcStateAtomTests extends ProcStateTestCase { Thread.sleep(WAIT_TIME_FOR_CONFIG_UPDATE_MS); executeForegroundService(); - final int waitTime = SLEEP_OF_FOREGROUND_SERVICE + EXTRA_WAIT_TIME_MS; - Thread.sleep(waitTime + STATSD_REPORT_WAIT_TIME_MS); + final int waitTime = SLEEP_OF_FOREGROUND_SERVICE; + Thread.sleep(waitTime + STATSD_REPORT_WAIT_TIME_MS + EXTRA_WAIT_TIME_MS); List<EventMetricData> data = getEventMetricDataList(); popUntilFind(data, onStates, PROC_STATE_FUNCTION); // clear out initial proc states. @@ -148,8 +148,8 @@ public class ProcStateAtomTests extends ProcStateTestCase { Thread.sleep(WAIT_TIME_FOR_CONFIG_UPDATE_MS); executeBackgroundService(ACTION_BACKGROUND_SLEEP); - final int waitTime = SLEEP_OF_ACTION_BACKGROUND_SLEEP + EXTRA_WAIT_TIME_MS; - Thread.sleep(waitTime + STATSD_REPORT_WAIT_TIME_MS); + final int waitTime = SLEEP_OF_ACTION_BACKGROUND_SLEEP; + Thread.sleep(waitTime + STATSD_REPORT_WAIT_TIME_MS + EXTRA_WAIT_TIME_MS); List<EventMetricData> data = getEventMetricDataList(); popUntilFind(data, onStates, PROC_STATE_FUNCTION); // clear out initial proc states. @@ -170,8 +170,8 @@ public class ProcStateAtomTests extends ProcStateTestCase { Thread.sleep(WAIT_TIME_FOR_CONFIG_AND_SCREEN_MS); executeForegroundActivity(ACTION_SLEEP_WHILE_TOP); - final int waitTime = SLEEP_OF_ACTION_SLEEP_WHILE_TOP + EXTRA_WAIT_TIME_MS; - Thread.sleep(waitTime + STATSD_REPORT_WAIT_TIME_MS); + final int waitTime = SLEEP_OF_ACTION_SLEEP_WHILE_TOP; + Thread.sleep(waitTime + STATSD_REPORT_WAIT_TIME_MS + EXTRA_WAIT_TIME_MS); List<EventMetricData> data = getEventMetricDataList(); popUntilFind(data, onStates, PROC_STATE_FUNCTION); // clear out initial proc states. |