LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am cc6e41a4: am f6ab64af: Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1

Browse Source 
* commit 'cc6e41a44524592c9b477f99fcc738dea7538811':
  Restore CAMERA permission to ApiDemos.
This commit is contained in:
Daniel Sandler
2011-03-04 11:38:27 -08:00
committed by Android Git Automerger
parent 13575201d2 cc6e41a445
commit 42f58ae22e
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ApiDemos/AndroidManifest.xml
View File

@@ -40,11 +40,9 @@
<!-- We will request access to the camera, saying we require a camera <!-- We will request access to the camera, saying we require a camera
of some sort but not one with autofocus capability. --> of some sort but not one with autofocus capability. -->
<!--
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera" /> <uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" /> <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
-->
<application android:name="ApiDemosApplication" <application android:name="ApiDemosApplication"
android:label="@string/activity_sample_code" android:label="@string/activity_sample_code"