commit fc2652efedeaae40c4a3748a8de9ee833e1443e1
author Yu Shan Emily Lau <yslau@google.com> Wed Oct 17 11:20:25 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 17 11:20:26 2012 -0700
tree 89ac4ac4a55fafb8354a66497b3dfd0768eb3a2d
parent e9a33c6098f51c687665adbed799860df2569ad0
parent 87b8a1c3b69a7c975ae2a8ebaaef5724f1b09cef

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

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

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 @@
             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 @@
             MediaTestUtil.getNativeHeapDump(this.getName() + "_after");
 
         if (MediaFrameworkPerfTestRunner.mGetProcmem) {
-            mMemWriter.write("\n");
             mProcMemWriter.close();
-            mMemWriter.close();
         }
+        mMemWriter.write("\n");
+        mMemWriter.close();
         super.tearDown();
     }