Merge changes from topic "b113052379-cp-from-pi-dev-p2"
am: f259bd9630
Change-Id: I2971810401325cfb1769156f816be43f069d0315
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index c941f79..c068084 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -17238,11 +17238,11 @@
camera in the list of supported camera devices.<wbr/></p>
<p>This capability requires the camera device to support the following:</p>
<ul>
-<li>This camera device must list the following static metadata entries in <a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html">CameraCharacteristics</a>:<ul>
-<li><a href="#static_android.logicalMultiCamera.physicalIds">android.<wbr/>logical<wbr/>Multi<wbr/>Camera.<wbr/>physical<wbr/>Ids</a></li>
-<li><a href="#static_android.logicalMultiCamera.sensorSyncType">android.<wbr/>logical<wbr/>Multi<wbr/>Camera.<wbr/>sensor<wbr/>Sync<wbr/>Type</a></li>
-</ul>
-</li>
+<li>The IDs of underlying physical cameras are returned via
+ <a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getPhysicalCameraIds">CameraCharacteristics#getPhysicalCameraIds</a>.<wbr/></li>
+<li>This camera device must list static metadata
+ <a href="#static_android.logicalMultiCamera.sensorSyncType">android.<wbr/>logical<wbr/>Multi<wbr/>Camera.<wbr/>sensor<wbr/>Sync<wbr/>Type</a> in
+ <a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html">CameraCharacteristics</a>.<wbr/></li>
<li>The underlying physical cameras' static metadata must list the following entries,<wbr/>
so that the application can correlate pixels from the physical streams:<ul>
<li><a href="#static_android.lens.poseReference">android.<wbr/>lens.<wbr/>pose<wbr/>Reference</a></li>
diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml
index 7aa45e6..ec3835d 100644
--- a/camera/docs/metadata_definitions.xml
+++ b/camera/docs/metadata_definitions.xml
@@ -5295,10 +5295,11 @@
This capability requires the camera device to support the following:
- * This camera device must list the following static metadata entries in {@link
- android.hardware.camera2.CameraCharacteristics}:
- - android.logicalMultiCamera.physicalIds
- - android.logicalMultiCamera.sensorSyncType
+ * The IDs of underlying physical cameras are returned via
+ {@link android.hardware.camera2.CameraCharacteristics#getPhysicalCameraIds}.
+ * This camera device must list static metadata
+ android.logicalMultiCamera.sensorSyncType in
+ {@link android.hardware.camera2.CameraCharacteristics}.
* The underlying physical cameras' static metadata must list the following entries,
so that the application can correlate pixels from the physical streams:
- android.lens.poseReference
