diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 90fab410610b3..3528daca18352 100644 --- 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) {