| commit | e171f31ac38c23e7654ac6e75ca6a2a626a52eb3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Nov 19 16:39:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 19 16:39:57 2021 +0000 |
| tree | 80030b0d291b70c8ce1056321519b7079359f223 | |
| parent | beed27b47ceb0d4e02dc1b0a2ae3427d3c30b5b4 [diff] | |
| parent | e04b17ede6ed15d0a9f73a618caabf58b2dd122d [diff] |
Merge "Remove unnecessary locks." am: 804d6c02aa am: 8c4e04c688 am: e04b17ede6 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1897158 Change-Id: I101d235e3de8e728936417acb663bd034e4a6b08
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp index 39ef0b5..f35abda 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp
@@ -637,7 +637,6 @@ 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 @@ 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];