commit 985deaa685b443f86ff3a000287925380ed176bf
author Oriol Prieto Gasco <opg@google.com> Tue Feb 06 18:34:45 2024 +0000
committer Oriol Prieto Gasco <opg@google.com> Wed Feb 07 20:01:22 2024 +0000
tree f2710ba256037763e79b19d4cade3cf6d52bfddf
parent e6a5a4a92145207e3b3c1a6cc3f96a18953dab88

Set the container field of aconfig flags

Please see go/aconfig-flag-containers for more context

Test: m
Bug: 312769710
Change-Id: I45c6503ffcb7245f871c9c6d472972e95138c14e

service/Android.bp

diff --git a/service/Android.bp b/service/Android.bp
index 001a54e..cf3f73e 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -18,7 +18,7 @@
 
 java_sdk_library {
     name: "service-configinfrastructure",
-    srcs: [ "java/**/*.java" ],
+    srcs: ["java/**/*.java"],
     defaults: [
         "framework-system-server-module-defaults",
         "framework-system-server-module-optimize-defaults",
@@ -35,7 +35,7 @@
         "modules-utils-shell-command-handler",
         "device_config_reboot_flags_java_lib",
         "guava",
-        "libaconfig_java_proto_lite"
+        "libaconfig_java_proto_lite",
     ],
     libs: [
         "framework-configinfrastructure.impl",
@@ -55,8 +55,9 @@
 aconfig_declarations {
     name: "device_config_reboot_flags",
     package: "com.android.server.deviceconfig",
+    container: "com.android.configinfrastructure",
     srcs: [
-      "flags.aconfig",
+        "flags.aconfig",
     ],
 }
 

service/flags.aconfig

diff --git a/service/flags.aconfig b/service/flags.aconfig
index f8a8d25..fe131d8 100644
--- a/service/flags.aconfig
+++ b/service/flags.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.server.deviceconfig"
+container: "com.android.configinfrastructure"
 
 flag {
     name: "enable_reboot_notification"