Merge "media: add MediaCodec features for HLG editing and dynamic color aspects" into main
diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS
index 2145c1a..19a3ba0 100644
--- a/core/java/android/os/OWNERS
+++ b/core/java/android/os/OWNERS
@@ -95,3 +95,6 @@
# SystemConfig
per-file ISystemConfig.aidl = file:/PACKAGE_MANAGER_OWNERS
per-file SystemConfigManager.java = file:/PACKAGE_MANAGER_OWNERS
+
+# ProfilingService
+per-file ProfilingServiceManager.java = file:/PERFORMANCE_OWNERS
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 2dda76e..2ed75d9 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -191,6 +191,7 @@
"ImmutabilityAnnotation",
"securebox",
"net_flags_lib",
+ "core_os_flags_lib",
],
javac_shard_size: 50,
javacflags: [
diff --git a/services/core/java/com/android/server/os/Android.bp b/services/core/java/com/android/server/os/Android.bp
new file mode 100644
index 0000000..565dc3b
--- /dev/null
+++ b/services/core/java/com/android/server/os/Android.bp
@@ -0,0 +1,12 @@
+aconfig_declarations {
+ name: "core_os_flags",
+ package: "com.android.server.os",
+ srcs: [
+ "*.aconfig",
+ ],
+}
+
+java_aconfig_library {
+ name: "core_os_flags_lib",
+ aconfig_declarations: "core_os_flags",
+}
diff --git a/services/core/java/com/android/server/os/core_os_flags.aconfig b/services/core/java/com/android/server/os/core_os_flags.aconfig
new file mode 100644
index 0000000..cbc0d54
--- /dev/null
+++ b/services/core/java/com/android/server/os/core_os_flags.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.server.os"
+
+flag {
+ name: "proto_tombstone"
+ namespace: "proto_tombstone_ns"
+ description: "Use proto tombstones as source of truth for adding to dropbox"
+ bug: "323857385"
+}