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

Commit affa4c90 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-319cd093-b0d8-4b32-b6ef-e921d10edf73-for-git_oc-dr1-release-40... 

release-request-319cd093-b0d8-4b32-b6ef-e921d10edf73-for-git_oc-dr1-release-4012016 snap-temp-L54300000064339674

Change-Id: Ic410a04f7d6f1e553a820f107ba2c8273d87857b
parents 41450ffc 4ed76e27

cmds/atrace/Android.bp

+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"],

cmds/atrace/atrace.cpp

+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);

cmds/cmd/cmd.cpp

+7 −0
Original line number Diff line number Diff line
@@ -123,6 +123,13 @@ int main(int argc, char* const argv[]) 
{

    signal(SIGPIPE, SIG_IGN);

    sp<ProcessState> proc = ProcessState::self();

    // setThreadPoolMaxThreadCount(0) actually tells the kernel it's

    // not allowed to spawn any additional threads, but we still spawn

    // a binder thread from userspace when we call startThreadPool().

    // This is safe because we only have 2 callbacks, neither of which

    // block.

    // See b/36066697 for rationale

    proc->setThreadPoolMaxThreadCount(0);

    proc->startThreadPool();



    sp<IServiceManager> sm = defaultServiceManager();

cmds/installd/InstalldNativeService.cpp

+10 −0
Original line number Diff line number Diff line
@@ -1782,6 +1782,16 @@ binder::Status InstalldNativeService::dumpProfiles(int32_t uid, const std::strin 
    return ok();

}



// Copy the contents of a system profile over the data profile.

binder::Status InstalldNativeService::copySystemProfile(const std::string& systemProfile,

        int32_t packageUid, const std::string& packageName, bool* _aidl_return) {

    ENFORCE_UID(AID_SYSTEM);

    CHECK_ARGUMENT_PACKAGE_NAME(packageName);

    std::lock_guard<std::recursive_mutex> lock(mLock);

    *_aidl_return = copy_system_profile(systemProfile, packageUid, packageName);

    return ok();

}



// TODO: Consider returning error codes.

binder::Status InstalldNativeService::mergeProfiles(int32_t uid, const std::string& packageName,

        bool* _aidl_return) {

cmds/installd/InstalldNativeService.h

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ public: 
    binder::Status mergeProfiles(int32_t uid, const std::string& packageName, bool* _aidl_return);

    binder::Status dumpProfiles(int32_t uid, const std::string& packageName,

            const std::string& codePaths, bool* _aidl_return);

    binder::Status copySystemProfile(const std::string& systemProfile,

            int32_t uid, const std::string& packageName, bool* _aidl_return);

    binder::Status clearAppProfiles(const std::string& packageName);

    binder::Status destroyAppProfiles(const std::string& packageName);