summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2015-11-12 01:11:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-12 01:11:01 +0000
commitebfd7b869b931ddb2b3038ff4ee129a8d436e24e (patch)
tree27c2a3afef35f842518c892ce347629ce73defac
parentdce0eca34eab2016d6d11cb32f072db4079a4461 (diff)
parent04292697a7841d6e45e0355c9dc3ced3bbedc768 (diff)
downloadandroid_system_media-ebfd7b869b931ddb2b3038ff4ee129a8d436e24e.tar.gz
android_system_media-ebfd7b869b931ddb2b3038ff4ee129a8d436e24e.tar.bz2
android_system_media-ebfd7b869b931ddb2b3038ff4ee129a8d436e24e.zip
Camera: Documentation updates
am: 04292697a7 * commit '04292697a7841d6e45e0355c9dc3ced3bbedc768': Camera: Documentation updates
-rw-r--r--camera/docs/docs.html2
-rw-r--r--camera/docs/metadata_properties.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 18e074b1..5c463bd8 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -15307,7 +15307,7 @@ raw sensor images.<wbr/></p>
<li>The maximum available resolution for RAW_<wbr/>SENSOR streams
will match either the value in
<a href="#static_android.sensor.info.pixelArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>pixel<wbr/>Array<wbr/>Size</a> or
- <a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a>.<wbr/></li>
+ <a href="#static_android.sensor.info.preCorrectionActiveArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>pre<wbr/>Correction<wbr/>Active<wbr/>Array<wbr/>Size</a>.<wbr/></li>
<li>All DNG-related optional metadata entries are provided
by the camera device.<wbr/></li>
</ul></span>
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index aac0acfc..42457d16 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -4567,7 +4567,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
* The maximum available resolution for RAW_SENSOR streams
will match either the value in
android.sensor.info.pixelArraySize or
- android.sensor.info.activeArraySize.
+ android.sensor.info.preCorrectionActiveArraySize.
* All DNG-related optional metadata entries are provided
by the camera device.
</notes>