Snap for 9510212 from 5b01086c7a3d3c387eb0388c01b2fc525dc34223 to tm-qpr2-beta3-release
Change-Id: Iae3a8a83b2cdb2332efebeb89be627403c95a485
diff --git a/common/google-java-format/PREBUILT b/common/google-java-format/PREBUILT
index be05214..5146275 100644
--- a/common/google-java-format/PREBUILT
+++ b/common/google-java-format/PREBUILT
@@ -11,5 +11,5 @@
https://oss.sonatype.org/content/repositories/snapshots/com/google/googlejavaformat/google-java-format/
Artifacts fetched at SHA-1:
-1c45fa55b1a483314f8cb52bd0a0b21838c2bc32
-with tag google-java-format-1.9
+edf036c7fd07a719c5197e04f8da181e7cdb81ee
+with tag v1.15.0
diff --git a/common/google-java-format/google-java-format b/common/google-java-format/google-java-format
index 2136077..58e1f65 100755
--- a/common/google-java-format/google-java-format
+++ b/common/google-java-format/google-java-format
@@ -1,2 +1,2 @@
#!/bin/bash
-java -jar `dirname "$0"`/google-java-format-1.9-all-deps.jar "$@"
+java -jar `dirname "$0"`/google-java-format-1.15.0-all-deps.jar "$@"
diff --git a/common/google-java-format/google-java-format-1.15.0-all-deps.jar b/common/google-java-format/google-java-format-1.15.0-all-deps.jar
new file mode 100644
index 0000000..5c28f14
--- /dev/null
+++ b/common/google-java-format/google-java-format-1.15.0-all-deps.jar
Binary files differ
diff --git a/common/google-java-format/google-java-format-1.9-all-deps.jar b/common/google-java-format/google-java-format-1.9-all-deps.jar
deleted file mode 100644
index 82c0eb9..0000000
--- a/common/google-java-format/google-java-format-1.9-all-deps.jar
+++ /dev/null
Binary files differ
diff --git a/common/google-java-format/google-java-format-diff.py b/common/google-java-format/google-java-format-diff.py
index f405ba5..151ae33 100755
--- a/common/google-java-format/google-java-format-diff.py
+++ b/common/google-java-format/google-java-format-diff.py
@@ -33,8 +33,7 @@
import subprocess
import io
import sys
-import locale
-from distutils.spawn import find_executable
+from shutil import which
def main():
parser = argparse.ArgumentParser(description=
@@ -60,6 +59,11 @@
help='do not fix the import order')
parser.add_argument('--skip-removing-unused-imports', action='store_true',
help='do not remove ununsed imports')
+ parser.add_argument(
+ '--skip-javadoc-formatting',
+ action='store_true',
+ default=False,
+ help='do not reformat javadoc')
parser.add_argument('-b', '--binary', help='path to google-java-format binary')
parser.add_argument('--google-java-format-jar', metavar='ABSOLUTE_PATH', default=None,
help='use a custom google-java-format jar')
@@ -101,7 +105,7 @@
elif args.google_java_format_jar:
base_command = ['java', '-jar', args.google_java_format_jar]
else:
- binary = find_executable('google-java-format') or '/usr/bin/google-java-format'
+ binary = which('google-java-format') or '/usr/bin/google-java-format'
base_command = [binary]
# Reformat files containing changes in place.
@@ -117,11 +121,12 @@
command.append('--skip-sorting-imports')
if args.skip_removing_unused_imports:
command.append('--skip-removing-unused-imports')
+ if args.skip_javadoc_formatting:
+ command.append('--skip-javadoc-formatting')
command.extend(lines)
command.append(filename)
p = subprocess.Popen(command, stdout=subprocess.PIPE,
- stderr=None, stdin=subprocess.PIPE,
- encoding=locale.getpreferredencoding())
+ stderr=None, stdin=subprocess.PIPE)
stdout, stderr = p.communicate()
if p.returncode != 0:
sys.exit(p.returncode);
@@ -129,7 +134,7 @@
if not args.i:
with open(filename) as f:
code = f.readlines()
- formatted_code = io.StringIO(stdout).readlines()
+ formatted_code = io.StringIO(stdout.decode('utf-8')).readlines()
diff = difflib.unified_diff(code, formatted_code,
filename, filename,
'(before formatting)', '(after formatting)')
diff --git a/common/m2/Android.bp b/common/m2/Android.bp
index f1f98f9..9347b80 100644
--- a/common/m2/Android.bp
+++ b/common/m2/Android.bp
@@ -113,6 +113,13 @@
}
java_import {
+ name: "truth-java8-extension-jar",
+ jars: ["repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.jar"],
+ sdk_version: "current",
+ host_supported: true,
+}
+
+java_import {
name: "rxjava",
jars: [
"repository/io/reactivex/rxjava2/rxjava/2.2.9/rxjava-2.2.9.jar",
@@ -284,6 +291,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/common/m2/repository/com/google/truth/extensions/truth-extensions-parent/1.0.1/truth-extensions-parent-1.0.1.pom b/common/m2/repository/com/google/truth/extensions/truth-extensions-parent/1.0.1/truth-extensions-parent-1.0.1.pom
new file mode 100644
index 0000000..4eebacb
--- /dev/null
+++ b/common/m2/repository/com/google/truth/extensions/truth-extensions-parent/1.0.1/truth-extensions-parent-1.0.1.pom
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth-parent</artifactId>
+ <version>1.0.1</version>
+ </parent>
+ <groupId>com.google.truth.extensions</groupId>
+ <artifactId>truth-extensions-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Truth Extensions (Parent)</name>
+ <description>
+ Parent metdata for a collection of Truth extensions, Subjects, utilities for
+ the Truth assertion framework.
+ </description>
+ <modules>
+ <module>java8</module>
+ <module>re2j</module>
+ <module>liteproto</module>
+ <module>proto</module>
+ </modules>
+</project>
diff --git a/common/m2/repository/com/google/truth/extensions/truth-extensions-parent/1.0.1/truth-extensions-parent-1.0.1.pom.md5 b/common/m2/repository/com/google/truth/extensions/truth-extensions-parent/1.0.1/truth-extensions-parent-1.0.1.pom.md5
new file mode 100644
index 0000000..8e9f9b4
--- /dev/null
+++ b/common/m2/repository/com/google/truth/extensions/truth-extensions-parent/1.0.1/truth-extensions-parent-1.0.1.pom.md5
@@ -0,0 +1 @@
+a2eeb05d7c9c8534b8471b7340e2b544
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/extensions/truth-extensions-parent/1.0.1/truth-extensions-parent-1.0.1.pom.sha1 b/common/m2/repository/com/google/truth/extensions/truth-extensions-parent/1.0.1/truth-extensions-parent-1.0.1.pom.sha1
new file mode 100644
index 0000000..bd48457
--- /dev/null
+++ b/common/m2/repository/com/google/truth/extensions/truth-extensions-parent/1.0.1/truth-extensions-parent-1.0.1.pom.sha1
@@ -0,0 +1 @@
+f0bf616ecef98569e794b3348b4c410de5ffc5d0
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1-sources.jar b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1-sources.jar
new file mode 100644
index 0000000..72725a8
--- /dev/null
+++ b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1-sources.jar
Binary files differ
diff --git a/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1-sources.jar.md5 b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1-sources.jar.md5
new file mode 100644
index 0000000..7f62872
--- /dev/null
+++ b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1-sources.jar.md5
@@ -0,0 +1 @@
+c7b1d91e3f4090340d890f829f70c870
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1-sources.jar.sha1 b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1-sources.jar.sha1
new file mode 100644
index 0000000..c1d2a2f
--- /dev/null
+++ b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1-sources.jar.sha1
@@ -0,0 +1 @@
+08d8b78c0d7856965c6209060a9fde83e07cbaaa
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.jar b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.jar
new file mode 100644
index 0000000..e48babe
--- /dev/null
+++ b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.jar
Binary files differ
diff --git a/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.jar.md5 b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.jar.md5
new file mode 100644
index 0000000..6601965
--- /dev/null
+++ b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.jar.md5
@@ -0,0 +1 @@
+e8adb9fdcc19ccc8c2ec8604a298e9c2
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.jar.sha1 b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.jar.sha1
new file mode 100644
index 0000000..4faf949
--- /dev/null
+++ b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.jar.sha1
@@ -0,0 +1 @@
+ef07b2cc2201472381fdd3bcf773310e22bb9080
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.pom b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.pom
new file mode 100644
index 0000000..4d9c515
--- /dev/null
+++ b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.pom
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.google.truth.extensions</groupId>
+ <artifactId>truth-extensions-parent</artifactId>
+ <version>1.0.1</version>
+ </parent>
+ <artifactId>truth-java8-extension</artifactId>
+ <name>Truth Extension for Java8</name>
+ <description>
+ An extension for the Truth test assertion framework supporting Java8 types and structures
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-compat-qual</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-gwt-sources</id>
+ <phase>post-integration-test</phase>
+ <goals><goal>jar</goal></goals>
+ <configuration>
+ <classifier>gwt</classifier>
+ <classesDirectory>src/main/java</classesDirectory>
+ <includes>
+ <include>**/*.java</include>
+ <include>**/*.gwt.xml</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
+
diff --git a/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.pom.md5 b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.pom.md5
new file mode 100644
index 0000000..3344cdf
--- /dev/null
+++ b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.pom.md5
@@ -0,0 +1 @@
+b3a6d670942814ca04a6388a62e60084
\ No newline at end of file
diff --git a/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.pom.sha1 b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.pom.sha1
new file mode 100644
index 0000000..bbac9f6
--- /dev/null
+++ b/common/m2/repository/com/google/truth/extensions/truth-java8-extension/1.0.1/truth-java8-extension-1.0.1.pom.sha1
@@ -0,0 +1 @@
+77d7d803117780fe47438baa83680123810adb78
\ No newline at end of file
diff --git a/common/m2/repository/org/sonatype/oss/oss-parent/maven-metadata.xml b/common/m2/repository/org/sonatype/oss/oss-parent/maven-metadata.xml
index 80aec3e..0a9e660 100644
--- a/common/m2/repository/org/sonatype/oss/oss-parent/maven-metadata.xml
+++ b/common/m2/repository/org/sonatype/oss/oss-parent/maven-metadata.xml
@@ -3,10 +3,10 @@
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<versioning>
- <release>7</release>
+ <release>9</release>
<versions>
- <version>7</version>
+ <version>9</version>
</versions>
- <lastUpdated>20180616054532</lastUpdated>
+ <lastUpdated>20220818171125</lastUpdated>
</versioning>
</metadata>
diff --git a/linux-x86_64/perfetto/configs/trace_config_detailed.textproto b/linux-x86_64/perfetto/configs/trace_config_detailed.textproto
index 0cc0887..98e191c 100644
--- a/linux-x86_64/perfetto/configs/trace_config_detailed.textproto
+++ b/linux-x86_64/perfetto/configs/trace_config_detailed.textproto
@@ -76,6 +76,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"
@@ -98,6 +104,7 @@
atrace_categories: "sync"
atrace_categories: "workq"
atrace_categories: "res"
+ atrace_categories: "power"
}
}
@@ -155,3 +162,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
+ }
+ }
+}
