summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2010-10-16 08:59:37 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-16 08:59:37 -0700
commit2cd55d2f6db687d7398355b76fa18105314dfcd9 (patch)
treeb15d8f2509c1cc719e8152a06b6ed59d4d8dd573
parentb25d5be54b7d876aa2b445584b829a410b50e034 (diff)
parent83ed30e5e7aab370400657bcdafde2f071de0b54 (diff)
am 83ed30e5: am ae0bb04a: Merge "Fix issue 3098850" into gingerbread
Merge commit '83ed30e5e7aab370400657bcdafde2f071de0b54' * commit '83ed30e5e7aab370400657bcdafde2f071de0b54': Fix issue 3098850
-rw-r--r--media/tests/MediaFrameworkTest/AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/tests/MediaFrameworkTest/AndroidManifest.xml b/media/tests/MediaFrameworkTest/AndroidManifest.xml
index f70a1451c91c..5c20811a048b 100644
--- a/media/tests/MediaFrameworkTest/AndroidManifest.xml
+++ b/media/tests/MediaFrameworkTest/AndroidManifest.xml
@@ -21,6 +21,7 @@
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<application>
<uses-library android:name="android.test.runner" />
<activity android:label="@string/app_name"