summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2009-12-17 18:01:04 -0800
committerScott Main <smain@google.com>2009-12-19 00:25:11 -0800
commit0b91635caf91b76d304e80997c82fe582b636428 (patch)
treee6b476e9ff1eeee7f1b9d70027b41ad9d3c9eef8 /core
parent1362bbcf760bd55d325d00ddea4b6f76afad8c08 (diff)
downloadframeworks_base-0b91635caf91b76d304e80997c82fe582b636428.zip
frameworks_base-0b91635caf91b76d304e80997c82fe582b636428.tar.gz
frameworks_base-0b91635caf91b76d304e80997c82fe582b636428.tar.bz2
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
Diffstat (limited to 'core')
-rw-r--r--core/res/AndroidManifest.xml8
1 files changed, 7 insertions, 1 deletions
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"