commit c32724f212569fd2a306ebe3c573ddb9bda45565
author Mikhail Naganov <mnaganov@google.com> Tue Dec 27 23:10:53 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 27 23:10:53 2022 +0000
tree c3f9e7c33b686f2d04dc0aa5f88882fc676bde66
parent e477b3815735eb095cb6ac4cff69c5506ecb1f47
parent 37e86813c8df307e0b81fda9ce210596d7d4de9e

Merge "Stabilize audio playback types used by the HAL"

keystore2/aidl/Android.bp

diff --git a/keystore2/aidl/Android.bp b/keystore2/aidl/Android.bp
index c114125..c52d658 100644
--- a/keystore2/aidl/Android.bp
+++ b/keystore2/aidl/Android.bp
@@ -20,7 +20,7 @@
     name: "android.system.keystore2",
     vendor_available: true,
     srcs: ["android/system/keystore2/*.aidl"],
-    imports: ["android.hardware.security.keymint"],
+    imports: ["android.hardware.security.keymint-V3"],
     stability: "vintf",
     backend: {
         java: {

media/OWNERS

diff --git a/media/OWNERS b/media/OWNERS
new file mode 100644
index 0000000..7d8b121
--- /dev/null
+++ b/media/OWNERS
@@ -0,0 +1 @@
+include platform/hardware/interfaces:/audio/aidl/OWNERS