Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bbe3e40 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I48e7d1ed40e787fb63445d68aa0e198e555c0857
parents 756e0cb1 afdf9402

services/incremental/IncrementalService.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -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);

            }

            }

        }

        }