commit 473c226256243fb96f21964f3f7e2cccf9da6b9f
author Takayuki Hoshi <hoshi@google.com> Thu Oct 01 12:52:15 2015 +0900
committer Daniel Xie <dxie@google.com> Tue Oct 27 22:54:23 2015 +0000
tree 35a16905ca4f620fe7b7cd84c7db729c6b779d58
parent 7a4b1f97e0cc395aa423d56b48b2957d8f4fd486

DO NOT MERGE: Add FEATURE_CAMERA_EXTERNAL to front-facing camera condition

Bug: 23633157

Change-Id: I3be28b471faba102c42975f9f335d5ae0a5dc2cb
(cherry picked from commit 658da1e24ba71acd82405b23afd7929fa1f11229)

tests/tests/hardware/src/android/hardware/camera2/cts/CameraManagerTest.java

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 4c35188..67c08fe 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 @@
             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));