Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee974a46 authored by Yu Shan Emily Lau's avatar Yu Shan Emily Lau Committed by Android Git Automerger
Browse files

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

* commit 'fc2652ef':
  Fix the NPE for the memwriter.
parents 52d84585 fc2652ef
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -114,22 +114,21 @@ 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));
    }

    }

    @Override
    protected void tearDown() throws Exception {
        if (MediaFrameworkPerfTestRunner.mGetNativeHeapDump)
            MediaTestUtil.getNativeHeapDump(this.getName() + "_after");

        if (MediaFrameworkPerfTestRunner.mGetProcmem) {
            mMemWriter.write("\n");
            mProcMemWriter.close();
            mMemWriter.close();
        }
        mMemWriter.write("\n");
        mMemWriter.close();
        super.tearDown();
    }