summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author James Dong <jdong@google.com> 2010-08-03 10:10:31 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-08-03 10:10:31 -0700
commit9b84e8df41261abeec7e37bff5f1b0cbf1fbce80 (patch)
tree9d97f8d3bf160fe5657e7acc87a4087095650bf5
parent51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef (diff)
parenta788026fd35eee2190dc7635e1fdbc781f6ef668 (diff)
am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
Merge commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668' into gingerbread-plus-aosp * commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668': Fixed a typo in a method name of MediaPlayerPerformance.java class
-rw-r--r--media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
index a0ef90532cd1..0e3029bbb3d7 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
@@ -518,7 +518,7 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
// Test case 6: Capture the memory usage after every 20 video and audio
// recorded
@LargeTest
- public void testRecordVidedAudioMemoryUsage() throws Exception {
+ public void testRecordVideoAudioMemoryUsage() throws Exception {
boolean memoryResult = false;
mStartPid = getMediaserverPid();