Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the NPE for the memwriter." into jb-mr1-dev

Browse Source
This commit is contained in:
Yu Shan Emily Lau
2012-10-17 11:20:25 -07:00
committed by Android (Google) Code Review
parent e9a33c6098 87b8a1c3b6
commit fc2652efed
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java
View File

@@ -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();
}