commit 33329d2ac7d3ba798f87d63611a9d7e5200b5e19
author Daniel Xie <dxie@google.com> Sat Sep 12 06:29:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Sep 12 06:29:03 2015 +0000
tree 14ed9a256061c6f66d7b039fdc8ac2193797522d
parent 7a05951fabe7fda2e35b38311d68fd623d052bf6
parent 14b1c468863faa8d12739c611020fa5625b3266f

am 14b1c468: am 6934f5fe: am d79a1aea: am c0c68f25: am c282df3c: Merge "Adjust 480p ratio range in CameraVideoActivity.java." into kitkat-cts-dev

* commit '14b1c468863faa8d12739c611020fa5625b3266f':
  Adjust 480p ratio range in CameraVideoActivity.java.

apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java
index 3239363..0a397e8 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java
@@ -563,7 +563,7 @@
         if (matchedSize == null) {
             for (int i = mPreviewSizes.size() - 1; i >= 0; i--) {
                 if (Math.abs((float)mPreviewSizes.get(i).width * recordSize.height /
-                        mPreviewSizes.get(i).height / recordSize.width - 1) < 0.1) {
+                        mPreviewSizes.get(i).height / recordSize.width - 1) < 0.12) {
                     matchedSize = mCamera.new Size(mPreviewSizes.get(i).width,
                             mPreviewSizes.get(i).height);
                     break;