diff options
| author | Daniel Xie <dxie@google.com> | 2015-10-27 22:54:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-27 22:54:39 +0000 |
| commit | 4a889caa5129bd4f022af4642906543c57ec2551 (patch) | |
| tree | 35a16905ca4f620fe7b7cd84c7db729c6b779d58 | |
| parent | 7a4b1f97e0cc395aa423d56b48b2957d8f4fd486 (diff) | |
| parent | 473c226256243fb96f21964f3f7e2cccf9da6b9f (diff) | |
| download | cts-4a889caa5129bd4f022af4642906543c57ec2551.tar.gz | |
Merge "DO NOT MERGE: Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition" into marshmallow-cts-dev
| -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 4c351886a8d..67c08fef43d 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)); |