summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorleozwang@chromium.org <leozwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-09 08:02:45 +0000
committerleozwang@chromium.org <leozwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-09 08:02:45 +0000
commit3617e805c6f9626bdd24a2eb8bc940c3db13f0fd (patch)
tree4a9ff51572ca525a38e9580fe92beb0231bec117
parent46f1c009ba35b15890bbff2d6b12fa8f11d1f93f (diff)
downloadchromium_src-3617e805c6f9626bdd24a2eb8bc940c3db13f0fd.zip
chromium_src-3617e805c6f9626bdd24a2eb8bc940c3db13f0fd.tar.gz
chromium_src-3617e805c6f9626bdd24a2eb8bc940c3db13f0fd.tar.bz2
Add RECORD_AUDIO in Android manifest.
This CL enables audio capture on Android. BUG=161417 Review URL: https://chromiumcodereview.appspot.com/12209041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181610 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/android/testshell/java/AndroidManifest.xml1
-rw-r--r--content/shell/android/browsertests_apk/AndroidManifest.xml2
-rw-r--r--content/shell/android/shell_apk/AndroidManifest.xml1
-rw-r--r--testing/android/AndroidManifest.xml1
4 files changed, 5 insertions, 0 deletions
diff --git a/chrome/android/testshell/java/AndroidManifest.xml b/chrome/android/testshell/java/AndroidManifest.xml
index 8505e88..237d0fe 100644
--- a/chrome/android/testshell/java/AndroidManifest.xml
+++ b/chrome/android/testshell/java/AndroidManifest.xml
@@ -73,6 +73,7 @@
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
</manifest>
diff --git a/content/shell/android/browsertests_apk/AndroidManifest.xml b/content/shell/android/browsertests_apk/AndroidManifest.xml
index 5746a43..b2db72a 100644
--- a/content/shell/android/browsertests_apk/AndroidManifest.xml
+++ b/content/shell/android/browsertests_apk/AndroidManifest.xml
@@ -64,9 +64,11 @@
<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"/>
+ <uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
</manifest>
diff --git a/content/shell/android/shell_apk/AndroidManifest.xml b/content/shell/android/shell_apk/AndroidManifest.xml
index d71450e..1eb5964 100644
--- a/content/shell/android/shell_apk/AndroidManifest.xml
+++ b/content/shell/android/shell_apk/AndroidManifest.xml
@@ -68,6 +68,7 @@
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+ <uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
</manifest>
diff --git a/testing/android/AndroidManifest.xml b/testing/android/AndroidManifest.xml
index cf847d1..1d27d59 100644
--- a/testing/android/AndroidManifest.xml
+++ b/testing/android/AndroidManifest.xml
@@ -26,6 +26,7 @@ found in the LICENSE file.
<!-- 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.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>