Merge "Merge Android 13 QPR2"
diff --git a/common/m2/Android.bp b/common/m2/Android.bp
index 15b552f..c6a9260 100644
--- a/common/m2/Android.bp
+++ b/common/m2/Android.bp
@@ -377,6 +377,51 @@
}
java_import {
+ name: "auto-common-1.1.2",
+ jars: ["repository/com/google/auto/auto-common/1.1.2/auto-common-1.1.2.jar"],
+ host_supported: true,
+}
+
+java_import {
+ name: "auto-value-1.9",
+ jars: ["repository/com/google/auto/value/auto-value/1.9/auto-value-1.9.jar"],
+ host_supported: true,
+}
+
+java_plugin {
+ name: "auto_value_plugin_1.9",
+ static_libs: [
+ "auto-value-1.9",
+ "auto-common-1.1.2",
+ "escapevelocity",
+ "guava",
+ "javapoet",
+ ],
+ processor_class: "com.google.auto.value.processor.AutoValueProcessor",
+ visibility: ["//visibility:public"],
+}
+
+java_plugin {
+ name: "auto_value_builder_plugin_1.9",
+ static_libs: [
+ "auto-value-1.9",
+ "auto-common-1.1.2",
+ "escapevelocity",
+ "guava",
+ "javapoet",
+ ],
+ processor_class: "com.google.auto.value.processor.AutoBuilderProcessor",
+ visibility: ["//visibility:public"],
+}
+
+java_import {
+ name: "gson-prebuilt-jar-2.9.1",
+ jars: ["repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar"],
+ sdk_version: "current",
+ host_supported: true,
+}
+
+java_import {
name: "commons-codec",
jars: ["repository/commons-codec/commons-codec/1.10/commons-codec-1.10.jar"],
host_supported: true,
diff --git a/common/m2/repository/com/google/auto/auto-common/1.1.2/auto-common-1.1.2.jar b/common/m2/repository/com/google/auto/auto-common/1.1.2/auto-common-1.1.2.jar
new file mode 100644
index 0000000..76b792c
--- /dev/null
+++ b/common/m2/repository/com/google/auto/auto-common/1.1.2/auto-common-1.1.2.jar
Binary files differ
diff --git a/common/m2/repository/com/google/auto/value/auto-value/1.9/auto-value-1.9.jar b/common/m2/repository/com/google/auto/value/auto-value/1.9/auto-value-1.9.jar
new file mode 100644
index 0000000..ce5dc93
--- /dev/null
+++ b/common/m2/repository/com/google/auto/value/auto-value/1.9/auto-value-1.9.jar
Binary files differ
diff --git a/common/m2/repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar b/common/m2/repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar
new file mode 100644
index 0000000..8a663ec
--- /dev/null
+++ b/common/m2/repository/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar
Binary files differ
diff --git a/linux-x86_64/perfetto/configs/trace_config_detailed.textproto b/linux-x86_64/perfetto/configs/trace_config_detailed.textproto
index 9663f17..ecee73f 100644
--- a/linux-x86_64/perfetto/configs/trace_config_detailed.textproto
+++ b/linux-x86_64/perfetto/configs/trace_config_detailed.textproto
@@ -82,6 +82,12 @@
ftrace_events: "gpu_mem/gpu_mem_total"
ftrace_events: "fastrpc/fastrpc_dma_stat"
+ # Power events
+ ftrace_events: "power/suspend_resume"
+ ftrace_events: "power/cpu_frequency"
+ ftrace_events: "power/cpu_idle"
+ ftrace_events: "power/gpu_frequency"
+
# Old (kernel) LMK
ftrace_events: "lowmemorykiller/lowmemory_kill"
@@ -104,6 +110,7 @@
atrace_categories: "sync"
atrace_categories: "workq"
atrace_categories: "res"
+ atrace_categories: "power"
}
}
@@ -161,3 +168,17 @@
name: "android.surfaceflinger.frametimeline"
}
}
+
+data_sources: {
+ config {
+ name: "android.power"
+ target_buffer: 1
+ android_power_config {
+ battery_poll_ms: 1000
+ collect_power_rails: true
+ battery_counters: BATTERY_COUNTER_CAPACITY_PERCENT
+ battery_counters: BATTERY_COUNTER_CHARGE
+ battery_counters: BATTERY_COUNTER_CURRENT
+ }
+ }
+}
