diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-31 21:25:06 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-31 21:25:06 +0000 |
| commit | 5bd42778c9f9d8cbf44adceb4dadcceca05a255b (patch) | |
| tree | 40c491efecaf076dbfd031eca621aae7d28b77c3 | |
| parent | 05ab8e111b9f399155070f489492cd1f35d8afc3 (diff) | |
| download | chromium_src-5bd42778c9f9d8cbf44adceb4dadcceca05a255b.zip chromium_src-5bd42778c9f9d8cbf44adceb4dadcceca05a255b.tar.gz chromium_src-5bd42778c9f9d8cbf44adceb4dadcceca05a255b.tar.bz2 | |
Add camera permission in manifest files.
This allows webrtc to access camera. This is a split of https://codereview.chromium.org/11860002/.
BUG=161417
Review URL: https://codereview.chromium.org/12090095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179959 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/android/testshell/java/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | content/shell/android/shell_apk/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | testing/android/AndroidManifest.xml | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/chrome/android/testshell/java/AndroidManifest.xml b/chrome/android/testshell/java/AndroidManifest.xml index 0da98141..8505e88 100644 --- a/chrome/android/testshell/java/AndroidManifest.xml +++ b/chrome/android/testshell/java/AndroidManifest.xml @@ -69,6 +69,7 @@ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> + <uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.GET_ACCOUNTS"/> <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.READ_PHONE_STATE"/> diff --git a/content/shell/android/shell_apk/AndroidManifest.xml b/content/shell/android/shell_apk/AndroidManifest.xml index 77444a3..d71450e 100644 --- a/content/shell/android/shell_apk/AndroidManifest.xml +++ b/content/shell/android/shell_apk/AndroidManifest.xml @@ -64,6 +64,7 @@ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> + <uses-permission android:name="android.permission.CAMERA"/> <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.READ_PHONE_STATE"/> diff --git a/testing/android/AndroidManifest.xml b/testing/android/AndroidManifest.xml index 27e4bb7..cf847d1 100644 --- a/testing/android/AndroidManifest.xml +++ b/testing/android/AndroidManifest.xml @@ -24,6 +24,7 @@ found in the LICENSE file. </application> <!-- TODO(jrg): add more permissions as needed by unit tests. --> + <uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> |