Merge "VTS: Replace deprecated 'getService' by 'waitForService'" am: 2c0a687519 am: b90b6e7b1f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2425754

Change-Id: I1fd514de8e432548d041ef4abe1c7d534cfd685d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-08 10:17:55 +00:00
committed by Automerger Merge Worker

View File

@@ -2052,9 +2052,10 @@ void device_id_attestation_vsr_check(const ErrorCode& result) {
// Check whether the given named feature is available.
bool check_feature(const std::string& name) {
::android::sp<::android::IServiceManager> sm(::android::defaultServiceManager());
::android::sp<::android::IBinder> binder(sm->getService(::android::String16("package_native")));
::android::sp<::android::IBinder> binder(
sm->waitForService(::android::String16("package_native")));
if (binder == nullptr) {
GTEST_LOG_(ERROR) << "getService package_native failed";
GTEST_LOG_(ERROR) << "waitForService package_native failed";
return false;
}
::android::sp<::android::content::pm::IPackageManagerNative> packageMgr =