fix android.hardware.camera2.cts.CameraManagerTest#testManagerGetDeviceIdList for TV
TV Camera is defined as an EXTERNAL CAMERA, and the lensFacing is set LENS_FACING_EXTERNAL.
But CTS test case has not added the code to handle the external camera.
Change the CTS code to support external Camera.
Change-Id: Ib3b210d566d77e15a90820bfecf1da25d5a025d1
diff --git a/tests/camera/src/android/hardware/camera2/cts/CameraManagerTest.java b/tests/camera/src/android/hardware/camera2/cts/CameraManagerTest.java
index 67c08fe..11071fc 100644
--- a/tests/camera/src/android/hardware/camera2/cts/CameraManagerTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/CameraManagerTest.java
@@ -149,11 +149,13 @@
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_EXTERNAL));
+ mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_FRONT));
} else if (lensFacing == CameraCharacteristics.LENS_FACING_BACK) {
assertTrue("System doesn't have back camera feature",
mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA));
+ } else if (lensFacing == CameraCharacteristics.LENS_FACING_EXTERNAL) {
+ assertTrue("System doesn't have external camera feature",
+ mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_EXTERNAL));
} else {
fail("Unknown camera lens facing " + lensFacing.toString());
}
@@ -166,10 +168,11 @@
assertTrue("Missing system feature: FEATURE_CAMERA_ANY",
ids.length == 0
|| mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY));
- assertTrue("Missing system feature: FEATURE_CAMERA or FEATURE_CAMERA_FRONT",
+ assertTrue("Missing system feature: FEATURE_CAMERA, FEATURE_CAMERA_FRONT or FEATURE_CAMERA_EXTERNAL",
ids.length == 0
|| mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
- || mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_FRONT));
+ || mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_FRONT)
+ || mPackageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_EXTERNAL));
}
// Test: that properties can be queried from each device, without exceptions.
