diff options
| author | Jason Noguchi <jnoguchi@google.com> | 2012-02-21 15:09:48 -0800 |
|---|---|---|
| committer | Jason Noguchi <jnoguchi@google.com> | 2012-03-22 17:52:03 -0700 |
| commit | 41d88d5f58ede432c7574c55b388dc390b08dc3b (patch) | |
| tree | 9d352aaaab8fc81fc9507025e053e7c5a2a06130 /media/tests/MediaFrameworkTest/AndroidManifest.xml | |
| parent | 941ff38d05f1d870df224ac329d16ab2207b94a1 (diff) | |
| download | frameworks_base-41d88d5f58ede432c7574c55b388dc390b08dc3b.zip frameworks_base-41d88d5f58ede432c7574c55b388dc390b08dc3b.tar.gz frameworks_base-41d88d5f58ede432c7574c55b388dc390b08dc3b.tar.bz2 | |
Adding camera zoom test to mediaframework stress suite.
Change-Id: I3ee72156f42cf189ff1d0bd469f83b938a6b87ff
Diffstat (limited to 'media/tests/MediaFrameworkTest/AndroidManifest.xml')
| -rw-r--r-- | media/tests/MediaFrameworkTest/AndroidManifest.xml | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/media/tests/MediaFrameworkTest/AndroidManifest.xml b/media/tests/MediaFrameworkTest/AndroidManifest.xml index dd5e026..b698705 100644 --- a/media/tests/MediaFrameworkTest/AndroidManifest.xml +++ b/media/tests/MediaFrameworkTest/AndroidManifest.xml @@ -4,9 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,7 +16,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.mediaframeworktest"> - + <uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.INTERNET" /> @@ -24,7 +24,7 @@ <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <uses-permission android:name="android.permission.WAKE_LOCK" /> - <application> + <application> <uses-library android:name="android.test.runner" /> <activity android:label="@string/app_name" android:name="MediaFrameworkTest" @@ -34,12 +34,18 @@ <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> </activity> - </application> + </application> + + <instrumentation android:name=".CameraStressTestRunner" + android:targetPackage="com.android.mediaframeworktest" + android:label="Camera stress tests InstrumentationRunner"> + </instrumentation> + <instrumentation android:name=".MediaFrameworkTestRunner" android:targetPackage="com.android.mediaframeworktest" android:label="MediaFramework tests InstrumentationRunner"> </instrumentation> - + <instrumentation android:name=".MediaFrameworkPerfTestRunner" android:targetPackage="com.android.mediaframeworktest" android:label="MediaFramework Performance tests InstrumentationRunner"> @@ -49,7 +55,7 @@ android:targetPackage="com.android.mediaframeworktest" android:label="MediaFramework unit tests InstrumentationRunner"> </instrumentation> - + <instrumentation android:name=".MediaRecorderStressTestRunner" android:targetPackage="com.android.mediaframeworktest" android:label="MediaRecorder stress tests InstrumentationRunner"> |