commit 3c4d6a47ddb9db17e5c3a7f8373a09d77c252550
author Jesse Hall <jessehall@google.com> Thu May 30 11:41:15 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 30 11:41:15 2013 -0700
tree 1f32c7bf5f9e7c1157d547a9931176a399427c37
parent 5607b2e9b9ffe1525ab740467a5e2856cab11b14
parent 45eb58e3fbc552d364119f436d252b77f5f20ac1

am 45eb58e3: Merge "Loosen tolerance slightly in EncodeDecode and DecodeEditEncode tests" into jb-mr2-dev

* commit '45eb58e3fbc552d364119f436d252b77f5f20ac1':
  Loosen tolerance slightly in EncodeDecode and DecodeEditEncode tests

tests/tests/media/src/android/media/cts/DecodeEditEncodeTest.java

diff --git a/tests/tests/media/src/android/media/cts/DecodeEditEncodeTest.java b/tests/tests/media/src/android/media/cts/DecodeEditEncodeTest.java
index c0c21d1..be2dc54 100644
--- a/tests/tests/media/src/android/media/cts/DecodeEditEncodeTest.java
+++ b/tests/tests/media/src/android/media/cts/DecodeEditEncodeTest.java
@@ -802,7 +802,7 @@
      * mLargestColorDelta.
      */
     boolean isColorClose(int actual, int expected) {
-        final int MAX_DELTA = 7;
+        final int MAX_DELTA = 8;
         int delta = Math.abs(actual - expected);
         if (delta > mLargestColorDelta) {
             mLargestColorDelta = delta;

tests/tests/media/src/android/media/cts/EncodeDecodeTest.java

diff --git a/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java b/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java
index ddcd4b9..d788102 100644
--- a/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java
+++ b/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java
@@ -1117,7 +1117,7 @@
      * mLargestColorDelta.
      */
     boolean isColorClose(int actual, int expected) {
-        final int MAX_DELTA = 7;
+        final int MAX_DELTA = 8;
         int delta = Math.abs(actual - expected);
         if (delta > mLargestColorDelta) {
             mLargestColorDelta = delta;