summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yu Shan Emily Lau <yslau@google.com> 2010-03-12 12:09:52 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-03-12 12:09:52 -0800
commite25bf5dc6357c4cc441846c389b86add3f8489cc (patch)
treeaa4680c68aa0616a01852d9dc164d3bbaf91f62b
parentbb51d9feea260e1527628b878319c0cf76adadeb (diff)
parentadc238a97cfbff4405c800994c14e147bc7df2bb (diff)
Merge "Fix the bug that it should write the zero diff to the output file when the actual diff is negative."
-rw-r--r--media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java6
1 files changed, 3 insertions, 3 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 a3bbb7447f7a..8202efd9b211 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
@@ -395,10 +395,10 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi
Thread.sleep(10000);
mEndPid = getMediaserverPid();
int memDiff = mEndMemory - startMemory;
- if (memDiff < 0)
+ if (memDiff < 0) {
memDiff = 0;
- else
- output.write("The total diff = " + memDiff);
+ }
+ output.write("The total diff = " + memDiff);
output.write("\n\n");
// mediaserver crash
if (startPid != mEndPid) {