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

Commit 8c4e04c6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary locks." am: 804d6c02 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1897158

Change-Id: Ie41ef7b84158f929476875f807ac0529ee61bcec
parents ba75ae54 804d6c02

cmds/installd/InstalldNativeService.cpp

+0 −2
Original line number Diff line number Diff line
@@ -637,7 +637,6 @@ binder::Status InstalldNativeService::createAppDataBatched( 
        const std::vector<android::os::CreateAppDataArgs>& args,

        std::vector<android::os::CreateAppDataResult>* _aidl_return) {

    ENFORCE_UID(AID_SYSTEM);

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



    std::vector<android::os::CreateAppDataResult> results;

    for (const auto &arg : args) {
@@ -1627,7 +1626,6 @@ binder::Status InstalldNativeService::rmdex(const std::string& codePath, 
        const std::string& instructionSet) {

    ENFORCE_UID(AID_SYSTEM);

    CHECK_ARGUMENT_PATH(codePath);

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



    char dex_path[PKG_PATH_MAX];