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

Commit c6e9b955 authored by Alex Vakulenko's avatar Alex Vakulenko Committed by android-build-merger
Browse files

Merge "Revert "atrace: Poke PDX services using utility class."" into oc-dev

am: 17cc37dc

Change-Id: Ic31751da5e2699c9a9e11fd0df716847c0685d7e
parents a9824fa5 17cc37dc
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ cc_binary {
        "libz",
        "libbase",
    ],
    static_libs: [
        "libpdx_default_transport",
    ],

    init_rc: ["atrace.rc"],

+0 −4
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@
#include <android/hidl/manager/1.0/IServiceManager.h>
#include <hidl/ServiceManagement.h>

#include <pdx/default_transport/service_utility.h>
#include <utils/String8.h>
#include <utils/Timers.h>
#include <utils/Tokenizer.h>
@@ -50,7 +49,6 @@
#include <android-base/stringprintf.h>

using namespace android;
using pdx::default_transport::ServiceUtility;

using std::string;

@@ -809,7 +807,6 @@ static bool setUpTrace()
    ok &= setAppCmdlineProperty(&packageList[0]);
    ok &= pokeBinderServices();
    pokeHalServices();
    ok &= ServiceUtility::PokeServices();

    // Disable all the sysfs enables.  This is done as a separate loop from
    // the enables to allow the same enable to exist in multiple categories.
@@ -847,7 +844,6 @@ static void cleanUpTrace()
    setTagsProperty(0);
    clearAppProperties();
    pokeBinderServices();
    ServiceUtility::PokeServices();

    // Set the options back to their defaults.
    setTraceOverwriteEnable(true);