[automerger] Merge "CDD: Relax CDD to allow device owner migration path for proprietary device admins." into nougat-dev am: ce7f9a307d am: 5e7bb42f51 am: 4fb8b88d7e am: ecb97ccaaf am: db91a8fa89 -s ours am: aab3a41aff am: 98eb42dbf9 am: 5bf7b39db0
am: 11e813b9fa
Change-Id: Ib26b8c75cbc84d1a8e32035b18c742ad0444f750
diff --git a/7_hardware-compatibility/7_5_cameras.md b/7_hardware-compatibility/7_5_cameras.md
index 570a8ae..b5da828 100644
--- a/7_hardware-compatibility/7_5_cameras.md
+++ b/7_hardware-compatibility/7_5_cameras.md
@@ -81,7 +81,6 @@
* [C-2-1] The camera preview MUST be mirrored horizontally relative to
the device’s current orientation.
-
### 7.5.3\. External Camera
Device implementations:
@@ -115,11 +114,19 @@
exposure, gain, white balance gains, color conversion, denoising, sharpening,
and more.
-The older API package, `android.hardware.Camera`, is marked as deprecated in
+The older API package,`android.hardware.Camera`, is marked as deprecated in
Android 5.0 but as it should still be available for apps to use. Android device
implementations MUST ensure the continued support of the API as described in
this section and in the Android SDK.
+All features that are common between the deprecated android.hardware.Camera class
+and the newer android.hardware.camera2 package MUST have equivalent performance
+and quality in both APIs. For example, with equivalent settings,
+autofocus speed and accuracy must be identical, and the quality of captured images
+must be the same. Features that depend on the different semantics of the two APIs
+are not required to have matching speed or quality, but SHOULD match as closely
+as possible.
+
Device implementations MUST implement the following behaviors for the
camera-related APIs, for all available cameras. Device implementations: