summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-11-19 16:29:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-11-19 16:29:07 +0000
commite04b17ede6ed15d0a9f73a618caabf58b2dd122d (patch)
tree57b13c5320381c5028eb3602accc3c75197086da
parentede9a0fed3fc01945c52071564cdd5d2d7dc0f95 (diff)
parent8c4e04c688f42c8e3668c066faf7a510d052db1f (diff)
Merge "Remove unnecessary locks." am: 804d6c02aa am: 8c4e04c688
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1897158 Change-Id: If43c9a1362384c3498d37ebe93cc89bef1c59ef4
-rw-r--r--cmds/installd/InstalldNativeService.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 39ef0b5aac..f35abda7e3 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -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];