| commit | a45163347be612e468fb60bd1e78d647ddd3ffaa | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Wed Jun 06 09:21:51 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 06 09:21:51 2012 -0700 |
| tree | 7883879966fd4c3d623ac8201b4e985843a0ffbb | |
| parent | 714ff374410b0db52665a8f526fb5568bcbcac55 [diff] | |
| parent | e5a2b4d0daed606a5907ca0fd28828e00008cbe6 [diff] |
Merge "Camera: Add cancelAutofocus test case." into jb-dev
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java index c66f0a7..939a6c2 100755 --- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java +++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -1372,6 +1372,10 @@ mCamera.setParameters(parameters); + // Valid to call outside of preview; should just reset lens or + // be a no-op. + mCamera.cancelAutoFocus(); + mCamera.startPreview(); // No op if autofocus is not in progress.