Skip to content

Commit b3ee91a

Browse files
committed
Merge origin/main and regenerate build files
1 parent 7ea4de0 commit b3ee91a

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

Android.bp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16971,8 +16971,15 @@ filegroup {
1697116971
"src/trace_processor/perfetto_sql/stdlib/android/app_process_starts.sql",
1697216972
"src/trace_processor/perfetto_sql/stdlib/android/auto/multiuser.sql",
1697316973
"src/trace_processor/perfetto_sql/stdlib/android/battery.sql",
16974+
"src/trace_processor/perfetto_sql/stdlib/android/battery/app_wakelocks.sql",
16975+
"src/trace_processor/perfetto_sql/stdlib/android/battery/audio.sql",
1697416976
"src/trace_processor/perfetto_sql/stdlib/android/battery/charging_states.sql",
1697516977
"src/trace_processor/perfetto_sql/stdlib/android/battery/doze.sql",
16978+
"src/trace_processor/perfetto_sql/stdlib/android/battery/foreground_services.sql",
16979+
"src/trace_processor/perfetto_sql/stdlib/android/battery/freezer.sql",
16980+
"src/trace_processor/perfetto_sql/stdlib/android/battery/job_scheduler.sql",
16981+
"src/trace_processor/perfetto_sql/stdlib/android/battery/process_states.sql",
16982+
"src/trace_processor/perfetto_sql/stdlib/android/battery/standby_bucket.sql",
1697616983
"src/trace_processor/perfetto_sql/stdlib/android/battery_stats.sql",
1697716984
"src/trace_processor/perfetto_sql/stdlib/android/binder.sql",
1697816985
"src/trace_processor/perfetto_sql/stdlib/android/binder_breakdown.sql",

src/trace_processor/perfetto_sql/stdlib/android/battery/job_scheduler.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ SELECT
465465
FROM raw_job_states;
466466

467467
-- Create table with job execution intervals (state='STARTED').
468-
CREATE PERFETTO TABLE _job_started AS
468+
CREATE PERFETTO TABLE _job_started_sdk AS
469469
WITH
470470
job_states_with_lead AS (
471471
SELECT
@@ -656,7 +656,7 @@ SELECT
656656
1e9 * 60.0
657657
)
658658
) AS INTEGER) AS uptime_mins
659-
FROM _job_started;
659+
FROM _job_started_sdk;
660660

661661
-- Jobs, reported by statsd.
662662
CREATE PERFETTO TABLE _jobs_from_statsd AS

0 commit comments

Comments
 (0)