diff options
| author | Igor Murashkin <iam@google.com> | 2013-09-10 12:15:54 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-09-21 21:01:32 -0700 |
| commit | 68f40066c914aefc1f88819dd46dd1135fb9f5bc (patch) | |
| tree | eeb786c7f3ecae6d0179cdfa521ba2b92fe157b6 /media/tests/MediaFrameworkTest | |
| parent | ca833c389b3cc2f95f27fe7782d0bebb8b36d660 (diff) | |
| download | frameworks_base-68f40066c914aefc1f88819dd46dd1135fb9f5bc.zip frameworks_base-68f40066c914aefc1f88819dd46dd1135fb9f5bc.tar.gz frameworks_base-68f40066c914aefc1f88819dd46dd1135fb9f5bc.tar.bz2 | |
camera2: Rename CameraProperties to CameraCharacteristics
Bug: 10360518
Change-Id: I8667bdcc8c9528ace96dc675585f923004932641
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 56d73c0..9d8489c 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.CameraProperties; +import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.ICameraDeviceCallbacks; import android.hardware.camera2.ICameraDeviceUser; @@ -269,7 +269,7 @@ public class CameraDeviceBinderTest extends AndroidTestCase { assertEquals(CameraBinderTestUtils.NO_ERROR, status); assertFalse(info.isEmpty()); - assertNotNull(info.get(CameraProperties.SCALER_AVAILABLE_FORMATS)); + assertNotNull(info.get(CameraCharacteristics.SCALER_AVAILABLE_FORMATS)); } @SmallTest |