diff options
author | Yu Shan Emily Lau <yslau@google.com> | 2012-10-17 11:04:14 -0700 |
---|---|---|
committer | Yu Shan Emily Lau <yslau@google.com> | 2012-10-17 11:10:32 -0700 |
commit | 87b8a1c3b69a7c975ae2a8ebaaef5724f1b09cef (patch) | |
tree | 61343a96e6eb55a8825c4af38ecb8cc46769d67b /media/tests/MediaFrameworkTest/src | |
parent | 477687c1eb1919c54e2bffba2a740df3b4af6668 (diff) | |
download | frameworks_base-87b8a1c3b69a7c975ae2a8ebaaef5724f1b09cef.zip frameworks_base-87b8a1c3b69a7c975ae2a8ebaaef5724f1b09cef.tar.gz frameworks_base-87b8a1c3b69a7c975ae2a8ebaaef5724f1b09cef.tar.bz2 |
Fix the NPE for the memwriter.
Change-Id: Id3a5c8f29b0f6be994ea95eb62f1a0eec8fe75b5
Diffstat (limited to 'media/tests/MediaFrameworkTest/src')
-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(); } |