From 7e4ce2b578b602e171d12dd59c66711b27d5ab73 Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Thu, 10 Sep 2020 17:37:56 +0000 Subject: [PATCH 1/2] init: do not create dev.mnt. properties for emulated mounts dev.mnt. properties are primarily intended for tuning parameters for mounts such as /system and /data but don't have much use for emulated mounts. There are additional emulated mounts created for each user on a device, so if too many users are created, init would otherwise create too many dev.mnt. properties, filling the property file that backs these properties, and preventing more properties from being generated. Therefore, this change stops init from creating dev.mnt. properties for emulated mounts. Bug: 156721033 Bug: 179111945 Test: user creation stress test doesn't create large numbers of properties Change-Id: I6475956719b7c938b8289189abfef661140d526d --- init/mount_handler.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/init/mount_handler.cpp b/init/mount_handler.cpp index 01abba8d1..46f833104 100644 --- a/init/mount_handler.cpp +++ b/init/mount_handler.cpp @@ -130,7 +130,11 @@ void MountHandler::MountHandlerFunction() { char* buf = nullptr; size_t len = 0; while (getline(&buf, &len, fp_.get()) != -1) { - auto entry = ParseMount(std::string(buf)); + auto buf_string = std::string(buf); + if (buf_string.find("/emulated") != std::string::npos) { + continue; + } + auto entry = ParseMount(buf_string); auto match = untouched.find(entry); if (match == untouched.end()) { touched.emplace_back(std::move(entry)); From 694946141e9851e24f576af17b9affbe9c73daf0 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Tue, 6 Apr 2021 12:36:47 -0700 Subject: [PATCH 2/2] [LSC] Add LOCAL_LICENSE_KINDS to system/core Added SPDX-license-identifier-Apache-2.0 to: libstats/pull_rust/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ia5bb619b514f38555b83c470ffb18f6a9a04d487 --- libstats/pull_rust/Android.bp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libstats/pull_rust/Android.bp b/libstats/pull_rust/Android.bp index 3660199f4..354c7b349 100644 --- a/libstats/pull_rust/Android.bp +++ b/libstats/pull_rust/Android.bp @@ -14,6 +14,10 @@ // limitations under the License. // +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + rust_bindgen { name: "libstatspull_bindgen", wrapper_src: "statslog.h",