diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-03-20 21:58:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-20 21:58:46 +0000 |
| commit | a56bb9f13ed91e28deae52587a51c46f66e11369 (patch) | |
| tree | b3f19ac50398fd16204685f834307ebc9afd671d | |
| parent | 7d2a8881c0e6614e57190c516377b6971142e137 (diff) | |
| parent | 652a29054273e48b541ec950c799f3f6f5b9934b (diff) | |
| download | cts-android-cts-8.0_r8.tar.gz | |
Merge "Snap for 4666545 from d1cc1c0a9a343a54e0e01949d8f996b1b90356c1 to oreo-cts-release" into oreo-cts-releaseandroid-cts-8.0_r8
| -rw-r--r-- | apps/CameraITS/tests/scene1/test_dng_noise_model.py | 4 | ||||
| -rwxr-xr-x | hostsidetests/theme/assets/26/280dpi.zip | bin | 6612687 -> 7157539 bytes |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/CameraITS/tests/scene1/test_dng_noise_model.py b/apps/CameraITS/tests/scene1/test_dng_noise_model.py index 02bce79be42..73808cbd78d 100644 --- a/apps/CameraITS/tests/scene1/test_dng_noise_model.py +++ b/apps/CameraITS/tests/scene1/test_dng_noise_model.py @@ -102,8 +102,8 @@ def main(): # Pass/fail check. for ch in range(4): - diffs = [var_measured[ch][i] - var_expected[ch][i] - for i in range(NUM_STEPS)] + diffs = [abs(var_measured[ch][i] - var_expected[ch][i]) + for i in range(len(sensitivities))] print "Diffs (%s):"%(["R","GR","GB","B"][ch]), diffs for i,diff in enumerate(diffs): thresh = max(DIFF_THRESH, FRAC_THRESH * var_expected[ch][i]) diff --git a/hostsidetests/theme/assets/26/280dpi.zip b/hostsidetests/theme/assets/26/280dpi.zip Binary files differindex c2e2ed0c27a..d5260d91179 100755 --- a/hostsidetests/theme/assets/26/280dpi.zip +++ b/hostsidetests/theme/assets/26/280dpi.zip |