commit f13b9eb2cf52624d41411ad65f322ea111fd4244
author The Android Automerger <android-build@google.com> Thu Jun 25 01:03:53 2015 -0700
committer The Android Automerger <android-build@google.com> Thu Jun 25 01:03:53 2015 -0700
tree 4b30f61c80558130de0e86f7d9d72380f25cf4fd
parent 192f620abb673cbc1bf6098d96eae744befe8e60
parent 383de417dfa6047b30b6a73c81650bfb0668e5b1

merge in mnc-release history after reset to mnc-dev

camera/docs/docs.html

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 6357e72..256d207 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -18342,6 +18342,9 @@
               <p>This array contains <code>(xmin,<wbr/> ymin,<wbr/> width,<wbr/> height)</code>.<wbr/> The <code>(xmin,<wbr/> ymin)</code> must be
 &gt;= <code>(0,<wbr/>0)</code>.<wbr/>
 The <code>(width,<wbr/> height)</code> must be &lt;= <code><a href="#static_android.sensor.info.pixelArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>pixel<wbr/>Array<wbr/>Size</a></code>.<wbr/></p>
+<p>If omitted by the HAL implementation,<wbr/> the camera framework will assume that this is
+the same as the post-correction active array region given in
+<a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a>.<wbr/></p>
             </td>
           </tr>
 

camera/docs/metadata_properties.xml

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 0a1ce67..fe058da 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -5875,6 +5875,10 @@
             This array contains `(xmin, ymin, width, height)`. The `(xmin, ymin)` must be
             >= `(0,0)`.
             The `(width, height)` must be <= `android.sensor.info.pixelArraySize`.
+
+            If omitted by the HAL implementation, the camera framework will assume that this is
+            the same as the post-correction active array region given in
+            android.sensor.info.activeArraySize.
             </hal_details>
             <tag id="RAW" />
           </entry>