Merge "CameraITS: relax test_lock_burst" into marshmallow-cts-dev
am: 22f9911a8a
* commit '22f9911a8a254be5fbdf3ba268f8d2ca8e137dbd':
CameraITS: relax test_lock_burst
Change-Id: I9e2546e9f6c649e05d7c44e0298702d92a3a7e12
diff --git a/apps/CameraITS/tests/scene1/test_locked_burst.py b/apps/CameraITS/tests/scene1/test_locked_burst.py
index 6552c73..daefb6b 100644
--- a/apps/CameraITS/tests/scene1/test_locked_burst.py
+++ b/apps/CameraITS/tests/scene1/test_locked_burst.py
@@ -32,7 +32,7 @@
NAME = os.path.basename(__file__).split(".")[0]
BURST_LEN = 8
- SPREAD_THRESH_MANUAL_SENSOR = 0.005
+ SPREAD_THRESH_MANUAL_SENSOR = 0.01
SPREAD_THRESH = 0.03
FPS_MAX_DIFF = 2.0
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 43a8207..011cb29 100644
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -903,7 +903,7 @@
\n\n4. Run the full ITS test suite on all possible camera Ids.
(cd CameraITS; python tools/run_all_tests.py). Once all
of the tests have been run, the \'PASS\' button will be enabled if all of the tests have
- succeeded. Please note that these tests can take 20+ minutes to run.
+ succeeded. Please note that these tests can take more than 2 hours to run on some devices.
</string>
<string name="no_camera_manager">
No camera manager exists! This test device is in a bad state.
@@ -1781,7 +1781,7 @@
<string name="provisioning_byod_location_mode_disable_instruction">
This test verifies that the location updates can be disabled for the managed profile apps.\n
1. Press the go button to go to the location settings page, set the location switch disabled.\n
- 2. Move your position a little bit, verify that no location updates toast come up and that the timeout message show up after around 15 seconds.
+ 2. Move your position a little bit, verify that no location updates toast come up and that the timeout message show up after around 15 seconds.
Please wait until the timeout or location updates toast message shows up before going back to the cts-verifier tests.\n
3. Go back to the cts-verifier tests using the back button, then mark the test accordingly.\n
</string>