From b6c38e9de1a2824ce599d7074fa4a226926177c1 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Fri, 16 Aug 2013 14:11:43 -0700 Subject: Camera2: Remove redundant Keys classes Also update tests accordingly Bug: 10345522 Change-Id: I8c7d17cdfbda6faba09134745a96089bf1b70cb7 --- .../mediaframeworktest/integration/CameraDeviceBinderTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'media/tests/MediaFrameworkTest') diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java index 5225e23..722087c 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java @@ -18,7 +18,7 @@ package com.android.mediaframeworktest.integration; import android.graphics.SurfaceTexture; import android.hardware.camera2.CameraMetadata; -import android.hardware.camera2.CameraPropertiesKeys; +import android.hardware.camera2.CameraProperties; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.ICameraDeviceCallbacks; import android.hardware.camera2.ICameraDeviceUser; @@ -271,7 +271,7 @@ public class CameraDeviceBinderTest extends AndroidTestCase { assertEquals(CameraBinderTestUtils.NO_ERROR, status); assertFalse(info.isEmpty()); - assertNotNull(info.get(CameraPropertiesKeys.Scaler.AVAILABLE_FORMATS)); + assertNotNull(info.get(CameraProperties.SCALER_AVAILABLE_FORMATS)); } @SmallTest -- cgit v1.1