Fix the NPE for the memwriter.

Change-Id: Id3a5c8f29b0f6be994ea95eb62f1a0eec8fe75b5

Author: Yu Shan Emily Lau

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

@@ -114,10 +114,9 @@ protected void setUp() throws Exception {
             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 @@ protected void tearDown() throws Exception {
             MediaTestUtil.getNativeHeapDump(this.getName() + "_after");
 
         if (MediaFrameworkPerfTestRunner.mGetProcmem) {
-            mMemWriter.write("\n");
             mProcMemWriter.close();
-            mMemWriter.close();
         }
+        mMemWriter.write("\n");
+        mMemWriter.close();
         super.tearDown();
     }