summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2013-09-10 10:01:51 -0700
committerEino-Ville Talvala <etalvala@google.com>2013-09-10 11:07:20 -0700
commit0702575fea9e820c8d52736da7542117b02bf679 (patch)
treec25eed0286ca7eef366f7bbc237f9e191ef81c68
parentf0771b27ac2a6deaf81afdf318580d0ae57e9de1 (diff)
downloadandroid_system_media-0702575fea9e820c8d52736da7542117b02bf679.tar.gz
android_system_media-0702575fea9e820c8d52736da7542117b02bf679.tar.bz2
android_system_media-0702575fea9e820c8d52736da7542117b02bf679.zip
Camera: Updates for latest camera2 API changes
Bug: 10549462 Change-Id: Ic8d24d5288a2da8c9e804293be7b4043be038e05
-rw-r--r--camera/docs/CameraPropertiesTest.mako2
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/docs/CameraPropertiesTest.mako b/camera/docs/CameraPropertiesTest.mako
index 1e46cf64..c730b874 100644
--- a/camera/docs/CameraPropertiesTest.mako
+++ b/camera/docs/CameraPropertiesTest.mako
@@ -58,7 +58,7 @@ public class CameraPropertiesTest extends AndroidTestCase {
% if entry.kind == 'static' and entry.visibility == "public":
public void testCameraProperties${pascal_case(entry.name)}() throws Exception {
- String[] ids = mCameraManager.getDeviceIdList();
+ String[] ids = mCameraManager.getCameraIdList();
for (int i = 0; i < ids.length; i++) {
CameraDevice camera = mCameraManager.openCamera(ids[i]);
assertNotNull("Failed to open camera", camera);