diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-18 21:46:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 21:46:51 +0000 |
| commit | 6bbe3e40a7ad56f51f16b04cead7c54933ab97a9 (patch) | |
| tree | 2d61303eb6b0433e62520b9fe4bbb90fdfa49bd1 | |
| parent | 756e0cb1b9bf33fce63e7bcdba50863b036fa3fe (diff) | |
| parent | afdf9402768f0e389ea03c8a41c35b9f9c5cf03b (diff) | |
Merge "Don't restart non-system DataLoaders on reboot." into rvc-dev am: afdf940276
Change-Id: I48e7d1ed40e787fb63445d68aa0e198e555c0857
| -rw-r--r-- | services/incremental/IncrementalService.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp index 78439dba2724..f0dca772adaa 100644 --- a/services/incremental/IncrementalService.cpp +++ b/services/incremental/IncrementalService.cpp @@ -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); } } |