Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2084387c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "VTS: Replace deprecated 'getService' by 'waitForService'" am:... 

Merge "VTS: Replace deprecated 'getService' by 'waitForService'" am: 2c0a6875 am: b90b6e7b am: 53a571c6

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



Change-Id: Iaf172acab3ec5f649c3aa8da7c3170c194046544
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 387d3ce0 53a571c6

security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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 =