commit c2aaa54357eef9ec0df3101998edeb8dcdfdd9da
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Sep 15 21:34:45 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 15 21:34:45 2015 +0000
tree eed1720d1f9198bb45bf648749bf520541453695
parent 03f41fc7262cbe04a6b5a88cb487dcd648287e99
parent ff0c4ab667ca92fed830c98604bfed7884f4f16e

am ff0c4ab6: am 3b077c29: Merge "CtsVerifier: Camera FOV: cap FOV test to 120 degree" into lollipop-cts-dev

* commit 'ff0c4ab667ca92fed830c98604bfed7884f4f16e':
  CtsVerifier: Camera FOV: cap FOV test to 120 degree

apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/DetermineFovActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/DetermineFovActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/DetermineFovActivity.java
index 8b989e1..959e98f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/DetermineFovActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/DetermineFovActivity.java
@@ -145,7 +145,7 @@
         mTargetDistanceCm = getTargetDistance();
         mReportedFovDegrees = PhotoCaptureActivity.getReportedFovDegrees();
 
-        mFovDegrees = mReportedFovDegrees > 80 ? 60 : mReportedFovDegrees;
+        mFovDegrees = mReportedFovDegrees > 120 ? 60 : mReportedFovDegrees;
         mFovMaxDegrees = mFovDegrees + FOV_ADJUSTMENT_RANGE / 2;
         mFovMinDegrees = mFovDegrees - FOV_ADJUSTMENT_RANGE / 2;