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

Commit e4e7c515 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Resume interrupted restorecon in a separate thread." into main am: f1e4a205 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2850152



Change-Id: Ica138c29dd1186b5d25b247bcf187c8b50ddb3fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25e99c59 f1e4a205

cmds/installd/InstalldNativeService.cpp

+23 −8
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <fstream>

#include <functional>

#include <regex>

#include <thread>

#include <unordered_set>



#include <android-base/file.h>
@@ -556,12 +557,14 @@ static int restorecon_app_data_lazy(const std::string& path, const std::string& 
    // If the initial top-level restorecon above changed the label, then go

    // back and restorecon everything recursively

    if (inProgress || before != after) {

        ScopedTrace tracer("label-change");

        if (existing) {

            LOG(DEBUG) << "Detected label change from " << before << " to " << after << " at "

                       << path << "; running recursive restorecon";

        }



        auto restorecon = [path, seInfo, uid]() {

            ScopedTrace tracer("label-change");



            // Temporary mark the folder as "in-progress" to resume in case of reboot/other failure.

            RestoreconInProgress fence(path);
@@ -570,6 +573,18 @@ static int restorecon_app_data_lazy(const std::string& path, const std::string& 
                PLOG(ERROR) << "Failed recursive restorecon for " << path;

                return -1;

            }

            return 0;

        };

        if (inProgress) {

            // The previous restorecon was interrupted. It's either crashed (unlikely), or the phone

            // was rebooted. Possibly because it took too much time. This time let's move it to a

            // separate thread - so it won't block the rest of the OS.

            std::thread(restorecon).detach();

        } else {

            if (int result = restorecon(); result) {

                return result;

            }

        }

    }



    return 0;