summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@android.com> 2010-12-09 13:45:34 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-12-09 13:45:34 -0800
commited6f095a83af9477d37e67a29762baf30ea97723 (patch)
tree76e8170eb17c47b5b16b88337a653d59f0f34978
parent2308fef4b2926416fd618d406be21c000cff8a49 (diff)
parent485059de22294a68099e9346af3aca88106919c6 (diff)
Merge "CameraBrowser: Give it ACCESS_USB permission, which is now required for PTP"
-rw-r--r--media/tests/CameraBrowser/AndroidManifest.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/tests/CameraBrowser/AndroidManifest.xml b/media/tests/CameraBrowser/AndroidManifest.xml
index db4a336972c1..1b1c146e2d5d 100644
--- a/media/tests/CameraBrowser/AndroidManifest.xml
+++ b/media/tests/CameraBrowser/AndroidManifest.xml
@@ -1,6 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.camerabrowser">
+ <uses-permission android:name="android.permission.ACCESS_USB" />
+
<application android:label="@string/app_label">
<activity android:name="CameraBrowser" android:label="Camera Browser">
<intent-filter>