Camera: Remove FREEFORM cropping requirement from FULL

Bug: 22207844
Change-Id: Ie31698dffe17bf9d7b95f931fd0f0ec9593ac35a

2 files changed, 11 insertions, 6 deletions

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index b319affa..bfeb6b2a 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -17531,8 +17531,7 @@ final used crop region in metadata result <a href="#controls_android.scaler.crop
 <p>Camera devices that support FREEFORM cropping will support any crop region that
 is inside of the active array.<wbr/> The camera device will apply the same crop region and
 return the final used crop region in capture result metadata <a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a>.<wbr/></p>
-<p>FULL capability devices (<a href="#static_android.info.supportedHardwareLevel">android.<wbr/>info.<wbr/>supported<wbr/>Hardware<wbr/>Level</a> <code>==</code> FULL) will support
-FREEFORM cropping.<wbr/> LEGACY capability devices will only support CENTER_<wbr/>ONLY cropping.<wbr/></p>
+<p>LEGACY capability devices will only support CENTER_<wbr/>ONLY cropping.<wbr/></p>
             </td>
           </tr>
 
@@ -24956,7 +24955,6 @@ doesn't violate the above rules.<wbr/></p>
 <li>Manual sensor control (<a href="#static_android.request.availableCapabilities">android.<wbr/>request.<wbr/>available<wbr/>Capabilities</a> contains MANUAL_<wbr/>SENSOR)</li>
 <li>Manual post-processing control (<a href="#static_android.request.availableCapabilities">android.<wbr/>request.<wbr/>available<wbr/>Capabilities</a> contains
   MANUAL_<wbr/>POST_<wbr/>PROCESSING)</li>
-<li>Arbitrary cropping region (<a href="#static_android.scaler.croppingType">android.<wbr/>scaler.<wbr/>cropping<wbr/>Type</a> <code>==</code> FREEFORM)</li>
 <li>At least 3 processed (but not stalling) format output streams
   (<a href="#static_android.request.maxNumOutputProc">android.<wbr/>request.<wbr/>max<wbr/>Num<wbr/>Output<wbr/>Proc</a> <code>&gt;=</code> 3)</li>
 <li>The required stream configurations defined in <a href="#static_android.scaler.availableStreamConfigurations">android.<wbr/>scaler.<wbr/>available<wbr/>Stream<wbr/>Configurations</a></li>
@@ -24979,6 +24977,10 @@ queried separately.<wbr/> These include:</p>
 post-processing,<wbr/> arbitrary cropping regions,<wbr/> and has relaxed performance constraints.<wbr/></p>
 <p>Each higher level supports everything the lower level supports
 in this order: FULL <code>&gt;</code> LIMITED <code>&gt;</code> LEGACY.<wbr/></p>
+<p>Note:
+Pre-API level 23,<wbr/> FULL devices also supported arbitrary cropping region
+(<a href="#static_android.scaler.croppingType">android.<wbr/>scaler.<wbr/>cropping<wbr/>Type</a> <code>==</code> FREEFORM); this requirement was relaxed in API level 23,<wbr/>
+and FULL devices may only support CENTERED cropping.<wbr/></p>
             </td>
           </tr>
 
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 84f86323..a9c5fa12 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -5662,8 +5662,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           is inside of the active array. The camera device will apply the same crop region and
           return the final used crop region in capture result metadata android.scaler.cropRegion.
 
-          FULL capability devices (android.info.supportedHardwareLevel `==` FULL) will support
-          FREEFORM cropping. LEGACY capability devices will only support CENTER_ONLY cropping.
+          LEGACY capability devices will only support CENTER_ONLY cropping.
           </details>
         </entry>
       </static>
@@ -7988,7 +7987,6 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           * Manual sensor control (android.request.availableCapabilities contains MANUAL_SENSOR)
           * Manual post-processing control (android.request.availableCapabilities contains
             MANUAL_POST_PROCESSING)
-          * Arbitrary cropping region (android.scaler.croppingType `==` FREEFORM)
           * At least 3 processed (but not stalling) format output streams
             (android.request.maxNumOutputProc `&gt;=` 3)
           * The required stream configurations defined in android.scaler.availableStreamConfigurations
@@ -8013,6 +8011,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
 
           Each higher level supports everything the lower level supports
           in this order: FULL `&gt;` LIMITED `&gt;` LEGACY.
+
+          Note:
+          Pre-API level 23, FULL devices also supported arbitrary cropping region
+          (android.scaler.croppingType `==` FREEFORM); this requirement was relaxed in API level 23,
+          and FULL devices may only support CENTERED cropping.
           </details>
           <hal_details>
           The camera 3 HAL device can implement one of two possible