binder::get_interface -> binder::wait_for_interface
binder::get_interface is deprecated.
Bug: 339248908
Test: atest aidl_integration_test
Change-Id: I2a0cd8a6cd72cd3ac08192b052bb93f9581e21a4
diff --git a/tests/rust/test_client.rs b/tests/rust/test_client.rs
index c197401..68c041b 100644
--- a/tests/rust/test_client.rs
+++ b/tests/rust/test_client.rs
@@ -66,12 +66,12 @@
use std::sync::{Arc, Mutex};
fn get_test_service() -> binder::Strong<dyn ITestService::ITestService> {
- binder::get_interface(<BpTestService as ITestService::ITestService>::get_descriptor())
+ binder::wait_for_interface(<BpTestService as ITestService::ITestService>::get_descriptor())
.expect("did not get binder service")
}
fn get_test_trunk_stable_service() -> binder::Strong<dyn ITrunkStableTest> {
- binder::get_interface(<BpTrunkStableTest as ITrunkStableTest>::get_descriptor())
+ binder::wait_for_interface(<BpTrunkStableTest as ITrunkStableTest>::get_descriptor())
.expect("did not get binder service")
}
@@ -922,9 +922,10 @@
#[test]
fn test_versioned_interface_version() {
- let service: binder::Strong<dyn IFooInterface::IFooInterface> =
- binder::get_interface(<BpFooInterface as IFooInterface::IFooInterface>::get_descriptor())
- .expect("did not get binder service");
+ let service: binder::Strong<dyn IFooInterface::IFooInterface> = binder::wait_for_interface(
+ <BpFooInterface as IFooInterface::IFooInterface>::get_descriptor(),
+ )
+ .expect("did not get binder service");
let version = service.getInterfaceVersion();
assert_eq!(version, Ok(1));
@@ -932,9 +933,10 @@
#[test]
fn test_versioned_interface_hash() {
- let service: binder::Strong<dyn IFooInterface::IFooInterface> =
- binder::get_interface(<BpFooInterface as IFooInterface::IFooInterface>::get_descriptor())
- .expect("did not get binder service");
+ let service: binder::Strong<dyn IFooInterface::IFooInterface> = binder::wait_for_interface(
+ <BpFooInterface as IFooInterface::IFooInterface>::get_descriptor(),
+ )
+ .expect("did not get binder service");
let hash = service.getInterfaceHash();
assert_eq!(hash.as_ref().map(String::as_str), Ok("9e7be1859820c59d9d55dd133e71a3687b5d2e5b"));
@@ -942,18 +944,20 @@
#[test]
fn test_versioned_known_union_field_is_ok() {
- let service: binder::Strong<dyn IFooInterface::IFooInterface> =
- binder::get_interface(<BpFooInterface as IFooInterface::IFooInterface>::get_descriptor())
- .expect("did not get binder service");
+ let service: binder::Strong<dyn IFooInterface::IFooInterface> = binder::wait_for_interface(
+ <BpFooInterface as IFooInterface::IFooInterface>::get_descriptor(),
+ )
+ .expect("did not get binder service");
assert_eq!(service.acceptUnionAndReturnString(&BazUnion::IntNum(42)), Ok(String::from("42")));
}
#[test]
fn test_versioned_unknown_union_field_triggers_error() {
- let service: binder::Strong<dyn IFooInterface::IFooInterface> =
- binder::get_interface(<BpFooInterface as IFooInterface::IFooInterface>::get_descriptor())
- .expect("did not get binder service");
+ let service: binder::Strong<dyn IFooInterface::IFooInterface> = binder::wait_for_interface(
+ <BpFooInterface as IFooInterface::IFooInterface>::get_descriptor(),
+ )
+ .expect("did not get binder service");
let ret = service.acceptUnionAndReturnString(&BazUnion::LongNum(42));
assert!(ret.is_err());
@@ -971,9 +975,10 @@
#[test]
fn test_array_of_parcelable_with_new_field() {
- let service: binder::Strong<dyn IFooInterface::IFooInterface> =
- binder::get_interface(<BpFooInterface as IFooInterface::IFooInterface>::get_descriptor())
- .expect("did not get binder service");
+ let service: binder::Strong<dyn IFooInterface::IFooInterface> = binder::wait_for_interface(
+ <BpFooInterface as IFooInterface::IFooInterface>::get_descriptor(),
+ )
+ .expect("did not get binder service");
let foos = [Default::default(), Default::default(), Default::default()];
let ret = service.returnsLengthOfFooArray(&foos);
@@ -982,9 +987,10 @@
#[test]
fn test_read_data_correctly_after_parcelable_with_new_field() {
- let service: binder::Strong<dyn IFooInterface::IFooInterface> =
- binder::get_interface(<BpFooInterface as IFooInterface::IFooInterface>::get_descriptor())
- .expect("did not get binder service");
+ let service: binder::Strong<dyn IFooInterface::IFooInterface> = binder::wait_for_interface(
+ <BpFooInterface as IFooInterface::IFooInterface>::get_descriptor(),
+ )
+ .expect("did not get binder service");
let in_foo = Default::default();
let mut inout_foo = Foo { intDefault42: 0 };
@@ -997,9 +1003,10 @@
#[test]
fn test_calling_v2_api_triggers_error() {
- let service: binder::Strong<dyn IFooInterface::IFooInterface> =
- binder::get_interface(<BpFooInterface as IFooInterface::IFooInterface>::get_descriptor())
- .expect("did not get binder service");
+ let service: binder::Strong<dyn IFooInterface::IFooInterface> = binder::wait_for_interface(
+ <BpFooInterface as IFooInterface::IFooInterface>::get_descriptor(),
+ )
+ .expect("did not get binder service");
let ret = service.newApi();
@@ -1084,7 +1091,7 @@
#[test]
fn test_nested_type() {
- let service: binder::Strong<dyn INestedService::INestedService> = binder::get_interface(
+ let service: binder::Strong<dyn INestedService::INestedService> = binder::wait_for_interface(
<INestedService::BpNestedService as INestedService::INestedService>::get_descriptor(),
)
.expect("did not get binder service");
@@ -1251,9 +1258,10 @@
#[test]
fn test_fixed_size_array_over_binder() {
let test_service = get_test_service();
- let service: binder::Strong<dyn IRepeatFixedSizeArray> =
- binder::get_interface(<BpRepeatFixedSizeArray as IRepeatFixedSizeArray>::get_descriptor())
- .expect("did not get binder service");
+ let service: binder::Strong<dyn IRepeatFixedSizeArray> = binder::wait_for_interface(
+ <BpRepeatFixedSizeArray as IRepeatFixedSizeArray>::get_descriptor(),
+ )
+ .expect("did not get binder service");
test_repeat_fixed_size_array!(service, RepeatBytes, [1u8, 2u8, 3u8]);
test_repeat_fixed_size_array!(service, RepeatInts, [1i32, 2i32, 3i32]);
