diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-09-27 11:49:32 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2013-09-27 11:49:32 -0700 |
| commit | d6d89aaa4d727d543d06d24e997c3c096f9157ca (patch) | |
| tree | bab73f2acc62f19990c8323dc9147b2068ef21c6 | |
| parent | ba4cc6a012ec2bc850251b64b7d2eb80e1775967 (diff) | |
| download | pdk-d6d89aaa4d727d543d06d24e997c3c096f9157ca.tar.gz | |
TestingCamera2: use CameraManager to get camera properties
Use CameraManager#getCameraCharacteristics rather than
CameraDevice#getProperties.
Bug: 10360518
Change-Id: Ieb6de2692446f595a8bbc6c39dd97eb3daaae495
| -rw-r--r-- | apps/TestingCamera2/src/com/android/testingcamera2/CameraOps.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps.java b/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps.java index 6bc972e..6c588a7 100644 --- a/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps.java +++ b/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps.java @@ -156,7 +156,7 @@ public class CameraOps { } mCamera = mBlockingCameraManager.openCamera(devices[0], /*listener*/null, mOpsHandler); - mCameraCharacteristics = mCamera.getProperties(); + mCameraCharacteristics = mCameraManager.getCameraCharacteristics(mCamera.getId()); } catch (CameraAccessException e) { throw new ApiFailureException("open failure", e); } catch (BlockingOpenException e) { @@ -174,7 +174,8 @@ public class CameraOps { minimalOpenCamera(); try { - CameraCharacteristics properties = mCamera.getProperties(); + CameraCharacteristics properties = + mCameraManager.getCameraCharacteristics(mCamera.getId()); Size[] previewSizes = null; Size sz = DEFAULT_SIZE; @@ -247,7 +248,8 @@ public class CameraOps { mCamera.stopRepeating(); mCamera.waitUntilIdle(); - CameraCharacteristics properties = mCamera.getProperties(); + CameraCharacteristics properties = + mCameraManager.getCameraCharacteristics(mCamera.getId()); Size[] jpegSizes = null; if (properties != null) { jpegSizes = properties.get( @@ -360,7 +362,8 @@ public class CameraOps { private Size getRecordingSize() throws ApiFailureException { try { - CameraCharacteristics properties = mCamera.getProperties(); + CameraCharacteristics properties = + mCameraManager.getCameraCharacteristics(mCamera.getId()); Size[] recordingSizes = null; if (properties != null) { |