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

Commit 032b36d3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Do not send Binder/HIDL transactions from atrace." am: 7fc9d867 am: 43ce91c3 

Change-Id: I0f6f725d07549f91bf1b2094e91b0f266ae4aa27
parents c54a5bb3 43ce91c3

cmds/atrace/atrace.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -854,7 +854,6 @@ static bool setUpUserspaceTracing() 
            tags |= c.tags;

            tags |= c.tags;

        }

        }

    }

    }

    ok &= setTagsProperty(tags);





    bool coreServicesTagEnabled = false;

    bool coreServicesTagEnabled = false;

    for (size_t i = 0; i < arraysize(k_categories); i++) {

    for (size_t i = 0; i < arraysize(k_categories); i++) {
@@ -876,9 +875,11 @@ static bool setUpUserspaceTracing() 
        packageList += android::base::GetProperty(k_coreServicesProp, "");

        packageList += android::base::GetProperty(k_coreServicesProp, "");

    }

    }

    ok &= setAppCmdlineProperty(&packageList[0]);

    ok &= setAppCmdlineProperty(&packageList[0]);

    ok &= setTagsProperty(tags);

#if !ATRACE_SHMEM

    ok &= pokeBinderServices();

    ok &= pokeBinderServices();

    pokeHalServices();

    pokeHalServices();



#endif

    if (g_tracePdx) {

    if (g_tracePdx) {

        ok &= ServiceUtility::PokeServices();

        ok &= ServiceUtility::PokeServices();

    }

    }