summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 2019-04-05 01:07:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-04-05 01:07:27 +0000
commit1c1e4a629346da12a85d0555273e0b925477eae7 (patch)
tree14a0983b328c60f5f669de82101d070a86564e6d
parentb37e639872c556d2115facdbbb92d0a3e4639213 (diff)
parent350b4d5066f6869c3155503ff050c50b891f76ad (diff)
Merge "Merge "Camera: Clarify camera1 API behavior for getNumberOfCameras" into qt-dev am: cbf999bd4f" into qt-dev-plus-aosp
-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