diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2012-10-17 11:20:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-17 11:20:26 -0700 |
| commit | fc2652efedeaae40c4a3748a8de9ee833e1443e1 (patch) | |
| tree | 89ac4ac4a55fafb8354a66497b3dfd0768eb3a2d /media | |
| parent | e9a33c6098f51c687665adbed799860df2569ad0 (diff) | |
| parent | 87b8a1c3b69a7c975ae2a8ebaaef5724f1b09cef (diff) | |
| download | frameworks_base-fc2652efedeaae40c4a3748a8de9ee833e1443e1.zip frameworks_base-fc2652efedeaae40c4a3748a8de9ee833e1443e1.tar.gz frameworks_base-fc2652efedeaae40c4a3748a8de9ee833e1443e1.tar.bz2 | |
Merge "Fix the NPE for the memwriter." into jb-mr1-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java | 9 |
1 files changed, 4 insertions, 5 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 9b1098e..3464924 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java @@ -114,10 +114,9 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase2<Med mProcMemWriter = new BufferedWriter(new FileWriter (new File(MEDIA_PROCMEM_OUTPUT), true)); mProcMemWriter.write(this.getName() + "\n"); - mMemWriter = new BufferedWriter(new FileWriter - (new File(MEDIA_MEMORY_OUTPUT), true)); } - + mMemWriter = new BufferedWriter(new FileWriter + (new File(MEDIA_MEMORY_OUTPUT), true)); } @Override @@ -126,10 +125,10 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase2<Med MediaTestUtil.getNativeHeapDump(this.getName() + "_after"); if (MediaFrameworkPerfTestRunner.mGetProcmem) { - mMemWriter.write("\n"); mProcMemWriter.close(); - mMemWriter.close(); } + mMemWriter.write("\n"); + mMemWriter.close(); super.tearDown(); } |