From 0b91635caf91b76d304e80997c82fe582b636428 Mon Sep 17 00:00:00 2001
From: Scott Main <smain@google.com>
Date: Thu, 17 Dec 2009 18:01:04 -0800
Subject: docs: add "required" attribute to the <uses-feature> docs and add a
 note to the CAMERA permission stating that it enables the <uses-feature> for
 camera. This is an incrimental update for the 2.0.1 docs. More changes to
 come for the 2.1 docs to include more features

---
 core/res/AndroidManifest.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0d03ff2..3c35fc7 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -403,7 +403,13 @@
         android:label="@string/permlab_recordAudio"
         android:description="@string/permdesc_recordAudio" />
 
-    <!-- Required to be able to access the camera device. -->
+    <!-- Required to be able to access the camera device.
+         <p>This will automatically enforce the <a
+         href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code
+         &lt;uses-feature&gt;}</a> manifest element for <em>all</em> camera features.
+         If you do not require all camera features or can properly operate if a camera
+         is not available, then you must modify your manifest as appropriate in order to
+         install on devices that don't support all camera features.</p> -->
     <permission android:name="android.permission.CAMERA"
         android:permissionGroup="android.permission-group.HARDWARE_CONTROLS"
         android:protectionLevel="dangerous"
-- 
cgit v1.1