diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-08-16 14:11:43 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2013-08-19 20:37:37 +0000 |
| commit | b6c38e9de1a2824ce599d7074fa4a226926177c1 (patch) | |
| tree | 35a4e7b88201ff595f5888c6ec6cfa5bed8fafc6 /media/tests/MediaFrameworkTest | |
| parent | b6e8943933f745f5e3f248ac058fc8dbca8f8ab1 (diff) | |
| download | frameworks_base-b6c38e9de1a2824ce599d7074fa4a226926177c1.zip frameworks_base-b6c38e9de1a2824ce599d7074fa4a226926177c1.tar.gz frameworks_base-b6c38e9de1a2824ce599d7074fa4a226926177c1.tar.bz2 | |
Camera2: Remove redundant Keys classes
Also update tests accordingly
Bug: 10345522
Change-Id: I8c7d17cdfbda6faba09134745a96089bf1b70cb7
Diffstat (limited to 'media/tests/MediaFrameworkTest')
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 |