diff options
| author | Daniel Xie <dxie@google.com> | 2015-10-27 23:23:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-27 23:23:11 +0000 |
| commit | 83f87f183c469ed5a8bdfe0922d94d4d8a199746 (patch) | |
| tree | 7bad83faf14171f27f122622282f7fc6b6fcaebd | |
| parent | 75b97739efe31d3f2533913b053b125fc7334a0b (diff) | |
| parent | a0025366126e6807bc1a0b6a0b9d37df8877593a (diff) | |
| download | cts-83f87f183c469ed5a8bdfe0922d94d4d8a199746.tar.gz | |
Merge "Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into lollipop-mr1-cts-dev am: 98990c5fe4 am: c77e5aa3d2
am: a002536612
* commit 'a0025366126e6807bc1a0b6a0b9d37df8877593a':
Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition
| -rw-r--r-- | tests/tests/hardware/src/android/hardware/camera2/cts/CameraManagerTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraManagerTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraManagerTest.java index 27ff6d1ae07..c4280435e84 100644 --- a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraManagerTest.java +++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraManagerTest.java @@ -149,7 +149,8 @@ public class CameraManagerTest extends AndroidTestCase { assertNotNull("Can't get lens facing info", lensFacing); if (lensFacing == CameraCharacteristics.LENS_FACING_FRONT) { assertTrue("System doesn't have front camera feature", - mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_FRONT)); + mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_FRONT) || + mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_EXTERNAL)); } else if (lensFacing == CameraCharacteristics.LENS_FACING_BACK) { assertTrue("System doesn't have back camera feature", mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)); |