commit e0802e722f1ed2277ca8f21527adbad2d248d7d5
author Steven Moreland <smoreland@google.com> Mon Mar 29 17:02:31 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 29 17:02:31 2021 +0000
tree bf85045258606eeca00f61ad5e86c6d34dc41425
parent 7009907e8bb6cd5a811d45d6883896f08be67656
parent 56936e8d7d3b02fb82bbd388c9d82f4beaa29c91

Merge "Add VINTF manifest for android.system.keystore2"

keystore2/Android.bp

diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index b6ccf4c..aff824b 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -100,4 +100,6 @@
         "libvpnprofilestore-rust",
     ],
     init_rc: ["keystore2.rc"],
+
+    vintf_fragments: ["android.system.keystore2-service.xml"],
 }

keystore2/android.system.keystore2-service.xml

diff --git a/keystore2/android.system.keystore2-service.xml b/keystore2/android.system.keystore2-service.xml
new file mode 100644
index 0000000..6b8d0cb
--- /dev/null
+++ b/keystore2/android.system.keystore2-service.xml
@@ -0,0 +1,9 @@
+<manifest version="1.0" type="framework">
+    <hal format="aidl">
+        <name>android.system.keystore2</name>
+        <interface>
+            <name>IKeystoreService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</manifest>

keystore2/src/keystore2_main.rs

diff --git a/keystore2/src/keystore2_main.rs b/keystore2/src/keystore2_main.rs
index 09ffecb..e745697 100644
--- a/keystore2/src/keystore2_main.rs
+++ b/keystore2/src/keystore2_main.rs
@@ -25,7 +25,7 @@
 use std::{panic, path::Path, sync::mpsc::channel};
 use vpnprofilestore::VpnProfileStore;
 
-static KS2_SERVICE_NAME: &str = "android.system.keystore2";
+static KS2_SERVICE_NAME: &str = "android.system.keystore2.IKeystoreService/default";
 static APC_SERVICE_NAME: &str = "android.security.apc";
 static AUTHORIZATION_SERVICE_NAME: &str = "android.security.authorization";
 static REMOTE_PROVISIONING_SERVICE_NAME: &str = "android.security.remoteprovisioning";