commit | fcd5c57c92d9e5399be9c8e80561540cb565a13b | [log] [tgz] |
---|---|---|
author | Martijn Coenen <maco@google.com> | Thu Nov 26 15:48:31 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 26 15:48:31 2020 +0000 |
tree | d535e30cb5ffcff8bdbceb297e0310ee83a54749 | |
parent | 21c0c360330ee3db7a3c58bef24898ccfa199813 [diff] | |
parent | 2d5e05b44248e445af986ca8410c6e98c6ba3533 [diff] |
Don't return a reference in FindQuotaDeviceForUuid. am: 2d5e05b442 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13128175 Change-Id: I2cc42e6ab585ef3ba532c7e0d1959c47dca85bb1
diff --git a/cmds/installd/QuotaUtils.cpp b/cmds/installd/QuotaUtils.cpp index e080291..6027139 100644 --- a/cmds/installd/QuotaUtils.cpp +++ b/cmds/installd/QuotaUtils.cpp
@@ -35,7 +35,7 @@ /* Map of all quota mounts from target to source */ std::unordered_map<std::string, std::string> mQuotaReverseMounts; -std::string& FindQuotaDeviceForUuid(const std::string& uuid) { +std::string FindQuotaDeviceForUuid(const std::string& uuid) { std::lock_guard<std::recursive_mutex> lock(mMountsLock); auto path = create_data_path(uuid.empty() ? nullptr : uuid.c_str()); return mQuotaReverseMounts[path];