Merge "tp: use process metadata table when figuring out launch processes"
diff --git a/CHANGELOG b/CHANGELOG
index 9f94ffc..8407784 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,14 +2,27 @@
   Tracing service and probes:
     *
   Trace Processor:
-    * Removed enable_perfetto_x64_cpu_opt by default for x64 MacOS
-      since it caused issues for CIs.
+    *
   UI:
     *
   SDK:
     *
 
 
+v27.0 - 2022-07-01:
+  Tracing service and probes:
+    * Fix rare crash due to watchdog timeout being too short.
+  Trace Processor:
+    * Removed enable_perfetto_x64_cpu_opt by default for x64 MacOS
+      since it caused issues for CIs.
+    * Improved performance of filtering and sorting on most queries.
+  UI:
+    * Changed sorting of process groups to take slice count and presence of
+      perf profiles into account.
+  SDK:
+    * 
+
+
 v26.1 - 2022-06-13:
   Trace Processor:
     * Fixed build failures on Windows.
diff --git a/src/trace_processor/metrics/sql/android/android_batt.sql b/src/trace_processor/metrics/sql/android/android_batt.sql
index 3de117b..2ee4530 100644
--- a/src/trace_processor/metrics/sql/android/android_batt.sql
+++ b/src/trace_processor/metrics/sql/android/android_batt.sql
@@ -85,11 +85,9 @@
 
 DROP TABLE IF EXISTS suspend_slice_;
 CREATE TABLE suspend_slice_ AS
--- TODO(simonmacm): remove trustworthy hard coding.
 SELECT
     ts,
-    dur,
-    true as trustworthy
+    dur
 FROM
     slice
     JOIN
@@ -98,6 +96,7 @@
 WHERE
     track.name = 'Suspend/Resume Latency'
     AND slice.name = 'syscore_resume(0)'
+    AND dur != -1
 ;
 
 SELECT RUN_METRIC('android/global_counter_span_view.sql',
@@ -168,6 +167,5 @@
       )
     )
     FROM suspend_slice_
-    WHERE trustworthy
   )
 );