Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't restart non-system DataLoaders on reboot." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-18 21:36:15 +00:00
committed by Android (Google) Code Review
parent ce6252e5a4 ea96c1f624
commit afdf940276
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/incremental/IncrementalService.cpp
View File

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