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

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

Merge "Revert "Installd: restorecon mislabeled gsf"" into sc-dev am: bfaff607 am: de25999f 

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

Change-Id: I67ffb58a8e4a63e5fb13b26b9337e07c830dbd02
parents bced8577 de25999f

cmds/installd/InstalldNativeService.cpp

+1 −2
Original line number Diff line number Diff line
@@ -342,8 +342,7 @@ 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

    // TODO(b/190567190, b/188141923) Remove recursive fixup of com.google.android.gsf.

    if (strcmp(before, after) || (path.find("com.google.android.gsf") != std::string::npos)) {

    if (strcmp(before, after)) {

        if (existing) {

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

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