diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-12-01 16:31:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-01 16:31:49 -0800 |
| commit | 98b837cd2b647593e5948bb0363cc75b8467b54e (patch) | |
| tree | b419134423e3740272edd0959ebb3b7fee9554d4 /dalvik | |
| parent | 8f8565baa038dfd92ed6271de441dd07b0c06d06 (diff) | |
| parent | 5aad086b3800a9b328f9a4b6119f7d7532c752f7 (diff) | |
| download | libcore-98b837cd2b647593e5948bb0363cc75b8467b54e.zip libcore-98b837cd2b647593e5948bb0363cc75b8467b54e.tar.gz libcore-98b837cd2b647593e5948bb0363cc75b8467b54e.tar.bz2 | |
am 5aad086b: Merge "Fix SamplingProfiler to handle null group on thread termination"
* commit '5aad086b3800a9b328f9a4b6119f7d7532c752f7':
Fix SamplingProfiler to handle null group on thread termination
Diffstat (limited to 'dalvik')
| -rw-r--r-- | dalvik/src/main/java/dalvik/system/SamplingProfiler.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dalvik/src/main/java/dalvik/system/SamplingProfiler.java b/dalvik/src/main/java/dalvik/system/SamplingProfiler.java index c21d97d..a0c9637 100644 --- a/dalvik/src/main/java/dalvik/system/SamplingProfiler.java +++ b/dalvik/src/main/java/dalvik/system/SamplingProfiler.java @@ -406,7 +406,9 @@ public final class SamplingProfiler { this.objectId = objectId; this.threadId = threadId; this.threadName = thread.getName(); - this.groupName = thread.getThreadGroup().getName(); + // group will become null when thread is terminated + ThreadGroup group = thread.getThreadGroup(); + this.groupName = group == null ? null : group.getName(); } private ThreadEvent(ThreadEventType type, int threadId) { |