summaryrefslogtreecommitdiffstats
path: root/media/tests/MediaFrameworkTest/AndroidManifest.xml
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2010-08-10 20:09:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-10 20:09:24 -0700
commit1ded9f95636a83298658bfcd840ae8e51127c714 (patch)
tree361d8d160910e3bff8a9bdc1e96ab8f2ede6b660 /media/tests/MediaFrameworkTest/AndroidManifest.xml
parent8279c754d176d5c2aa23f6f7ad16fcea03278788 (diff)
parentfbb936bfab22cb1c3748cccffe67f42f7d764b54 (diff)
downloadframeworks_base-1ded9f95636a83298658bfcd840ae8e51127c714.zip
frameworks_base-1ded9f95636a83298658bfcd840ae8e51127c714.tar.gz
frameworks_base-1ded9f95636a83298658bfcd840ae8e51127c714.tar.bz2
am fbb936bf: Merge "Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application." into gingerbread
Merge commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54' into gingerbread-plus-aosp * commit 'fbb936bfab22cb1c3748cccffe67f42f7d764b54': Add the a power test case which simply do the audio playback. The actual power measurement will be done by another application.
Diffstat (limited to 'media/tests/MediaFrameworkTest/AndroidManifest.xml')
-rw-r--r--media/tests/MediaFrameworkTest/AndroidManifest.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/tests/MediaFrameworkTest/AndroidManifest.xml b/media/tests/MediaFrameworkTest/AndroidManifest.xml
index 246f9fc..f70a145 100644
--- a/media/tests/MediaFrameworkTest/AndroidManifest.xml
+++ b/media/tests/MediaFrameworkTest/AndroidManifest.xml
@@ -51,4 +51,9 @@
android:label="MediaRecorder stress tests InstrumentationRunner">
</instrumentation>
+ <instrumentation android:name=".MediaFrameworkPowerTestRunner"
+ android:targetPackage="com.android.mediaframeworktest"
+ android:label="Media Power tests InstrumentationRunner">
+ </instrumentation>
+
</manifest>