Merge "Add NPE check before stopping profiler"

2017-01-26 23:04:03 +00:00
parent 17bb1b77f7 b1684439b5
commit dacf5e522e
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -5032,7 +5032,9 @@ public final class ActivityThread {
     * @hide
     */
    public void stopProfiling() {
-        mProfiler.stopProfiling();
+        if (mProfiler != null) {
+            mProfiler.stopProfiling();
+        }
    }

    static final void handleDumpHeap(boolean managed, DumpHeapData dhd) {