Merge "Don't restart non-system DataLoaders on reboot." into rvc-dev am: afdf940276 am: 6bbe3e40a7 am: a5bd7e0917

Change-Id: I4fc6c32476c423f6ffb016ec21f94ee6d8c2f53f
This commit is contained in:
TreeHugger Robot
2020-05-18 22:19:47 +00:00
committed by Automerger Merge Worker

View File

@@ -63,6 +63,7 @@ struct Constants {
static constexpr auto libDir = "lib"sv;
static constexpr auto libSuffix = ".so"sv;
static constexpr auto blockSize = 4096;
static constexpr auto systemPackage = "android"sv;
};
static const Constants& constants() {
@@ -377,7 +378,8 @@ void IncrementalService::onSystemReady() {
std::lock_guard l(mLock);
mounts.reserve(mMounts.size());
for (auto&& [id, ifs] : mMounts) {
if (ifs->mountId == id) {
if (ifs->mountId == id &&
ifs->dataLoaderStub->params().packageName == Constants::systemPackage) {
mounts.push_back(ifs);
}
}