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

Commit 83327c2c authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "Fix includes; use IBase instead of IBinder." am: bd5dc9df 

am: a7a0658e

Change-Id: Ib4bfc9615322d30bdb7bb0aef9e245119f1f95e5
parents bd7ba04b a7a0658e

cmds/atrace/atrace.cpp

+1 −7
Original line number Diff line number Diff line
@@ -514,11 +514,7 @@ static bool pokeBinderServices() 
static void pokeHalServices()

{

    using ::android::hidl::manager::V1_0::IServiceManager;

    using ::android::hardware::IBinder;

    using ::android::hardware::hidl_string;

    using ::android::hardware::Parcel;



    Parcel data;



    sp<IServiceManager> sm = ::android::hardware::defaultServiceManager();

    auto listRet = sm->list([&](const auto &interfaces) {
@@ -530,9 +526,7 @@ static void pokeHalServices() 
            hidl_string fqInterfaceName = fqInstanceName.substr(0, n);

            hidl_string instanceName = fqInstanceName.substr(n+1, std::string::npos);

            auto getRet = sm->get(fqInterfaceName, instanceName, [&](const auto &interface) {

                // TODO(b/32756130)

                // Once IServiceManager returns IBase, use interface->notifySyspropsChanged() here

                interface->transact(IBinder::SYSPROPS_TRANSACTION, data, nullptr, 0, nullptr);

                interface->notifySyspropsChanged();

            });

            if (!getRet.isOk()) {

                fprintf(stderr, "failed to get service %s: %s\n",