OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9e77aef
)
Add NPE check before stopping profiler
author
Amith Yamasani
<yamasani@google.com>
Thu, 26 Jan 2017 22:57:20 +0000
(14:57 -0800)
committer
Amith Yamasani
<yamasani@google.com>
Thu, 26 Jan 2017 22:58:26 +0000
(14:58 -0800)
During crash scenarios, stopProfiling() could be called early.
Change-Id: I6ef78a47e3431dd7c41198ec29d40ebef3928c6a
Fixes:
34744398
Test: N/A
core/java/android/app/ActivityThread.java
patch
|
blob
|
history
diff --git
a/core/java/android/app/ActivityThread.java
b/core/java/android/app/ActivityThread.java
index
90fab41
..
3528dac
100644
(file)
--- 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) {