summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author James Dong <jdong@google.com> 2010-08-04 11:11:50 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-08-04 11:11:50 -0700
commit327c0bd9e2d7a68e163459e93db2a0bbb2c7a526 (patch)
tree064ed5c981bd31c7ec19b784edef5aefb4d09847
parent4be0d52125b88dc992a4c500edbe95bf55484e0b (diff)
parent9b84e8df41261abeec7e37bff5f1b0cbf1fbce80 (diff)
am 9b84e8df: am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
Merge commit '9b84e8df41261abeec7e37bff5f1b0cbf1fbce80' * commit '9b84e8df41261abeec7e37bff5f1b0cbf1fbce80': 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();