commit 35a70c521ef4225b4b93b52a88b844b82a1cc74d
author Cameron Yee <cameronyee@google.com> Fri Jul 14 16:09:04 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 14 16:09:04 2023 +0000
tree d4a6c5e0cbf62791083c6a1445b46643eb136026
parent e95c788860e8cbf1bf5e9346d432910d57d269e6
parent 416c4fe8a84927d8f1a553a05d05687bc83d0b1f

Merge "Update owners" into main

api/Android.bp

diff --git a/api/Android.bp b/api/Android.bp
index f40f0c9..6aef5ff 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -60,14 +60,14 @@
 metalava_cmd = "$(location metalava)"
 // Silence reflection warnings. See b/168689341
 metalava_cmd += " -J--add-opens=java.base/java.util=ALL-UNNAMED "
-metalava_cmd += " --quiet --no-banner --format=v2 "
+metalava_cmd += " --quiet "
 
 genrule {
     name: "current-api-xml",
     tools: ["metalava"],
     srcs: [":frameworks-base-api-current.txt"],
     out: ["current.api"],
-    cmd: metalava_cmd + "-convert2xmlnostrip $(in) $(out)",
+    cmd: metalava_cmd + "signature-to-jdiff $(in) $(out)",
     visibility: ["//visibility:public"],
 }
 

services/tests/wmtests/OWNERS

diff --git a/services/tests/wmtests/OWNERS b/services/tests/wmtests/OWNERS
index 7a128fc..cece37f 100644
--- a/services/tests/wmtests/OWNERS
+++ b/services/tests/wmtests/OWNERS
@@ -1,3 +1,4 @@
+# Bug template url: https://b.corp.google.com/issues/new?component=316125&template=1018199
 include /services/core/java/com/android/server/wm/OWNERS
 
 # Voice Interaction