summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBrett Chabot <brettchabot@android.com>2009-11-25 13:02:50 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-25 13:02:50 -0800
commitc2e074c112ee00761c7f0a492793442a1773fcbb (patch)
tree6c1d7152f72233d071d9decf9f466e7bc2643f18 /tests
parentd0be07cb285e783723767747a3d8fd098a0441d2 (diff)
parentd782b4b6f3411ece7299f414783baa3758756bbe (diff)
downloadframeworks_base-c2e074c112ee00761c7f0a492793442a1773fcbb.zip
frameworks_base-c2e074c112ee00761c7f0a492793442a1773fcbb.tar.gz
frameworks_base-c2e074c112ee00761c7f0a492793442a1773fcbb.tar.bz2
am d782b4b6: Add keyguard permission to instrumented ImfTest package.
Merge commit 'd782b4b6f3411ece7299f414783baa3758756bbe' into eclair-plus-aosp * commit 'd782b4b6f3411ece7299f414783baa3758756bbe': Add keyguard permission to instrumented ImfTest package.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/ImfTest/AndroidManifest.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/ImfTest/AndroidManifest.xml b/tests/ImfTest/AndroidManifest.xml
index 55e5d38..82dbe75 100755
--- a/tests/ImfTest/AndroidManifest.xml
+++ b/tests/ImfTest/AndroidManifest.xml
@@ -1,6 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.imftest">
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+
<application>
<activity android:name=".samples.InputTypeActivity" android:label="Input Type Activity">