| commit | 76b646a50ffd999305ab74962107d686dc738cc2 | [log] [tgz] |
|---|---|---|
| author | Heidi von Markham <hvm@google.com> | Wed May 13 17:26:27 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed May 13 17:26:27 2015 +0000 |
| tree | d2ba3950a59f7c46d87b7509bdd4e4d3ba85caba | |
| parent | 65ef0ead55a3949a0d7d49a67afce8063f9370c5 [diff] | |
| parent | 20981a8057b6eef8dc34278291c23bf6f4159700 [diff] |
Merge "Docs: Adding new images for security section Updating framework images with feedback"
diff --git a/src/devices/camera/images/ape_fwk_camera.png b/src/devices/camera/images/ape_fwk_camera.png index 102461e..cb8831b 100644 --- a/src/devices/camera/images/ape_fwk_camera.png +++ b/src/devices/camera/images/ape_fwk_camera.png Binary files differ
diff --git a/src/devices/camera/images/camera-hal-overview.png b/src/devices/camera/images/camera-hal-overview.png index fed29e7..3f39356 100644 --- a/src/devices/camera/images/camera-hal-overview.png +++ b/src/devices/camera/images/camera-hal-overview.png Binary files differ
diff --git a/src/devices/camera/images/camera-ops-flow.png b/src/devices/camera/images/camera-ops-flow.png index 7326782..2d5cd4f 100644 --- a/src/devices/camera/images/camera-ops-flow.png +++ b/src/devices/camera/images/camera-ops-flow.png Binary files differ
diff --git a/src/devices/camera/images/camera_block.png b/src/devices/camera/images/camera_block.png index b7a58eb..29b92e9 100644 --- a/src/devices/camera/images/camera_block.png +++ b/src/devices/camera/images/camera_block.png Binary files differ
diff --git a/src/devices/camera/images/camera_hal.png b/src/devices/camera/images/camera_hal.png index 28fa927..ffb1406 100644 --- a/src/devices/camera/images/camera_hal.png +++ b/src/devices/camera/images/camera_hal.png Binary files differ
diff --git a/src/devices/camera/images/camera_model.png b/src/devices/camera/images/camera_model.png index 50cbabc..a8810c6 100644 --- a/src/devices/camera/images/camera_model.png +++ b/src/devices/camera/images/camera_model.png Binary files differ
diff --git a/src/devices/camera/images/camera_simple_model.png b/src/devices/camera/images/camera_simple_model.png index fd0fac0..625dd8f 100644 --- a/src/devices/camera/images/camera_simple_model.png +++ b/src/devices/camera/images/camera_simple_model.png Binary files differ
diff --git a/src/devices/camera/images/crop-region-11-ratio.png b/src/devices/camera/images/crop-region-11-ratio.png index 8e28230..f6406d7 100644 --- a/src/devices/camera/images/crop-region-11-ratio.png +++ b/src/devices/camera/images/crop-region-11-ratio.png Binary files differ
diff --git a/src/devices/camera/images/crop-region-169-ratio.png b/src/devices/camera/images/crop-region-169-ratio.png index 62837e2..d190858 100644 --- a/src/devices/camera/images/crop-region-169-ratio.png +++ b/src/devices/camera/images/crop-region-169-ratio.png Binary files differ
diff --git a/src/devices/camera/images/crop-region-43-ratio.png b/src/devices/camera/images/crop-region-43-ratio.png index f48046b..420068b 100644 --- a/src/devices/camera/images/crop-region-43-ratio.png +++ b/src/devices/camera/images/crop-region-43-ratio.png Binary files differ
diff --git a/src/devices/camera/images/crop-region-43-square-ratio.png b/src/devices/camera/images/crop-region-43-square-ratio.png index 3794dbe..9257dda 100644 --- a/src/devices/camera/images/crop-region-43-square-ratio.png +++ b/src/devices/camera/images/crop-region-43-square-ratio.png Binary files differ
diff --git a/src/devices/camera/index.jd b/src/devices/camera/index.jd index 1e5cab8..9bf74df 100644 --- a/src/devices/camera/index.jd +++ b/src/devices/camera/index.jd
@@ -30,7 +30,7 @@ camera framework APIs in <a href="http://developer.android.com/reference/android/hardware/package-summary.html">android.hardware</a> to your underlying camera driver and hardware. The camera subsystem includes implementations for camera pipeline components while the camera HAL provides interfaces for use in implementing your version of these components.</p> <h2 id="architecture">Architecture</h2> -<p>The following figure and list describe the components involved and where to find the source for each: +<p>The following figure and list describe the HAL components: </p> <img src="images/ape_fwk_camera.png" alt="Android camera architecture" id="figure1" />
diff --git a/src/source/build-numbers.jd b/src/source/build-numbers.jd index 4210bae..395b613 100644 --- a/src/source/build-numbers.jd +++ b/src/source/build-numbers.jd
@@ -178,6 +178,12 @@ <th>Supported devices</th> </tr> <tr> + <td>LMY47X</td> + <td>android-5.1.1_r2</td> + <td>Lollipop</td> + <td>Nexus 9 (volantis)</td> +</tr> +<tr> <td>LMY47V</td> <td>android-5.1.1_r1</td> <td>Lollipop</td>
