commit 3b4847262161f5d780e0aea400337c52edc9cd6a
author Sunny Goyal <sunnygoyal@google.com> Fri Jan 19 09:39:32 2018 -0800
committer Sunny Goyal <sunnygoyal@google.com> Fri Jan 19 09:39:57 2018 -0800
tree 100b09c6a3b5eeb1bddd0203b5d73a21d243722a
parent 599752ed811d9e0a0e5764f3eff62c033bd91948

Fixing crash in TraceHelper when dragging same message across multiple threads

Change-Id: I976a8ae5ac1786d3984b1ff069a8a0c348f48e1c

src/com/android/launcher3/util/TraceHelper.java

diff --git a/src/com/android/launcher3/util/TraceHelper.java b/src/com/android/launcher3/util/TraceHelper.java
index 0f3ac57..bde9c0a 100644
--- a/src/com/android/launcher3/util/TraceHelper.java
+++ b/src/com/android/launcher3/util/TraceHelper.java
@@ -55,7 +55,7 @@
     public static void partitionSection(String sectionName, String partition) {
         if (ENABLED) {
             MutableLong time = sUpTimes.get(sectionName);
-            if (time.value >= 0) {
+            if (time != null && time.value >= 0) {
 
                 if (SYSTEM_TRACE) {
                     Trace.endSection();
@@ -78,7 +78,7 @@
     public static void endSection(String sectionName, String msg) {
         if (ENABLED) {
             MutableLong time = sUpTimes.get(sectionName);
-            if (time.value >= 0) {
+            if (time != null && time.value >= 0) {
                 if (SYSTEM_TRACE) {
                     Trace.endSection();
                 }