diff options
author | Sascha Haeberling <haeberling@google.com> | 2014-10-23 19:05:56 -0700 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2014-10-27 14:12:08 -0700 |
commit | c8f354b3de2a5a7aae19dd884b83c59f9550fb2e (patch) | |
tree | 088550d6b2f3f4eee2487dedaef45c31b69f3477 | |
parent | 861bd311d2a90b2dd17fb6e35fd665ca823125c9 (diff) | |
download | platform_cts-c8f354b3de2a5a7aae19dd884b83c59f9550fb2e.tar.gz platform_cts-c8f354b3de2a5a7aae19dd884b83c59f9550fb2e.tar.bz2 platform_cts-c8f354b3de2a5a7aae19dd884b83c59f9550fb2e.zip |
[CtsVerifier] Make sure to set camera parameters before measuring FOV.
Bug: 18110354
Change-Id: Ida3868640c85c454cf74cc2781fbf1dc29f527c5
-rw-r--r-- | apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java index 178a811cabb..eea1b76746e 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java @@ -171,7 +171,7 @@ public class PhotoCaptureActivity extends Activity mReportedFovPrePictureTaken = mCamera.getParameters().getHorizontalViewAngle(); mResolutionSpinnerIndex = position; - initializeCamera(); + startPreview(); } } @@ -395,6 +395,10 @@ public class PhotoCaptureActivity extends Activity } private void initializeCamera() { + initializeCamera(true); + } + + private void initializeCamera(boolean startPreviewAfterInit) { if (mCamera == null || mSurfaceHolder.getSurface() == null) { return; } @@ -417,7 +421,10 @@ public class PhotoCaptureActivity extends Activity mCamera.setParameters(params); mCameraInitialized = true; } - startPreview(); + + if (startPreviewAfterInit) { + startPreview(); + } } private void startPreview() { @@ -428,7 +435,7 @@ public class PhotoCaptureActivity extends Activity } } - private void switchToCamera(SelectableResolution resolution, boolean initializeCamera) { + private void switchToCamera(SelectableResolution resolution, boolean startPreview) { if (mCamera != null) { mCamera.stopPreview(); mCamera.release(); @@ -437,9 +444,7 @@ public class PhotoCaptureActivity extends Activity mSelectedResolution = resolution; mCamera = Camera.open(mSelectedResolution.cameraId); - if (initializeCamera){ - initializeCamera(); - } + initializeCamera(startPreview); } /** |