summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shuzhen Wang <shuzhenwang@google.com> 2019-04-04 19:15:03 -0700
committer android-build-merger <android-build-merger@google.com> 2019-04-04 19:15:03 -0700
commit08e8b1564bc3b3acdacfb62bafe00c8fbd26eeea (patch)
treed58ebf046095aa90f609f1cf28a17867f8e50b98
parent574dce2f649c784db0ca69de1e88722aab1420cd (diff)
parent1c1e4a629346da12a85d0555273e0b925477eae7 (diff)
Merge "Merge "Camera: Clarify camera1 API behavior for getNumberOfCameras" into qt-dev am: cbf999bd4f" into qt-dev-plus-aosp
am: 1c1e4a6293 Change-Id: I0cdbd29ca3c2e9dd048ec6adb5078e75e22bd595
-rw-r--r--core/java/android/hardware/Camera.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 10fe52a71d9d..33e51c9fa11c 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -271,7 +271,7 @@ public class Camera {
* If there is a
* {@link android.hardware.camera2.CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA
* logical multi-camera} in the system, to maintain app backward compatibility, this method will
- * only expose one camera for every logical camera and underlying physical cameras group.
+ * only expose one camera per facing for all logical camera and physical camera groups.
* Use camera2 API to see all cameras.
*
* @return total number of accessible camera devices, or 0 if there are no