commit fc495445d30d93af111a00bfc01e5a175e0ecbe5
author Roy Luo <royluo@google.com> Sat Sep 30 00:27:29 2023 +0000
committer Roy Luo <royluo@google.com> Tue Nov 07 19:35:12 2023 +0000
tree ed7dd962460dde1e013c4c817b8a1edf735b51a3
parent 891fc7c2b89e10424c07ef5ccc79014fdce73995

Extend USB compliance warning API

Add USB feature flags and guard the new compliance warning APIs.

Test: atest VtsAidlUsbTargetTest
      atest CtsUsbManagerTestCases
Bug: 296119135
Bug: 300340959
Change-Id: Iffca537a85cb03ab5eeb2ad331a145ef1d2b848a

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index ab0d5a3..3a772e1 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -61,6 +61,7 @@
     ":service-jobscheduler-deviceidle.flags-aconfig-java{.generated_srcjars}",
     ":surfaceflinger_flags_java_lib{.generated_srcjars}",
     ":android.view.contentcapture.flags-aconfig-java{.generated_srcjars}",
+    ":android.hardware.usb.flags-aconfig-java{.generated_srcjars}",
 ]
 
 filegroup {
@@ -681,3 +682,16 @@
     aconfig_declarations: "android.view.contentcapture.flags-aconfig",
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
 }
+
+// USB
+aconfig_declarations {
+    name: "android.hardware.usb.flags-aconfig",
+    package: "android.hardware.usb.flags",
+    srcs: ["core/java/android/hardware/usb/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+    name: "android.hardware.usb.flags-aconfig-java",
+    aconfig_declarations: "android.hardware.usb.flags-aconfig",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}