commit 221bbb5f3948080dc94ce1bfbdc92d62be94c882
author Stephen Crane <sjc@immunant.com> Wed Dec 16 15:52:10 2020 -0800
committer Stephen Crane <sjc@immunant.com> Tue Feb 09 18:20:36 2021 -0800
tree 8df77267ae93ddba945a1e48311c9495211a4ade
parent 2bb8575ea037efeb09b9a12ca09198e055e1a26b

keystore2: Use libbinder_rs Strong references for Binder objects

Update keystore2 to use libbinder_rs Strong<> and Weak<> references for
Binder objects rather than just Box<dyn Interface>.

Bug: 175584883
Test: atest keystore2_test
Change-Id: Ic234ce5ed007a265769a72043d77eb817a21b8ea

keystore2/src/km_compat/lib.rs

diff --git a/keystore2/src/km_compat/lib.rs b/keystore2/src/km_compat/lib.rs
index 097e6d4..eca0a85 100644
--- a/keystore2/src/km_compat/lib.rs
+++ b/keystore2/src/km_compat/lib.rs
@@ -34,14 +34,14 @@
         KeyParameterArray::KeyParameterArray, KeyParameterValue::KeyParameterValue,
         KeyPurpose::KeyPurpose, PaddingMode::PaddingMode, SecurityLevel::SecurityLevel, Tag::Tag,
     };
-    use android_hardware_security_keymint::binder;
+    use android_hardware_security_keymint::binder::{self, Strong};
     use android_security_compat::aidl::android::security::compat::IKeystoreCompatService::IKeystoreCompatService;
 
     static COMPAT_NAME: &str = "android.security.compat";
 
-    fn get_device() -> Option<Box<dyn IKeyMintDevice>> {
+    fn get_device() -> Option<Strong<dyn IKeyMintDevice>> {
         add_keymint_device_service();
-        let compat_service: Box<dyn IKeystoreCompatService> =
+        let compat_service: Strong<dyn IKeystoreCompatService> =
             binder::get_interface(COMPAT_NAME).ok()?;
         compat_service.getKeyMintDevice(SecurityLevel::TRUSTED_ENVIRONMENT).ok()
     }
@@ -321,7 +321,7 @@
     #[test]
     fn test_secure_clock() {
         add_keymint_device_service();
-        let compat_service: Box<dyn IKeystoreCompatService> =
+        let compat_service: binder::Strong<dyn IKeystoreCompatService> =
             binder::get_interface(COMPAT_NAME).unwrap();
         let secure_clock = compat_service.getSecureClock().unwrap();
 
@@ -336,7 +336,7 @@
     #[test]
     fn test_shared_secret() {
         add_keymint_device_service();
-        let compat_service: Box<dyn IKeystoreCompatService> =
+        let compat_service: binder::Strong<dyn IKeystoreCompatService> =
             binder::get_interface(COMPAT_NAME).unwrap();
         let shared_secret =
             compat_service.getSharedSecret(SecurityLevel::TRUSTED_ENVIRONMENT).unwrap();