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

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

Merge "More robust restorecon and additional debug info." into tm-dev am: 8169e839 

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



Change-Id: Id7795b85bd149dd41145612db7347f154b1806f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ccaef30a 8169e839

core/jni/android_os_SELinux.cpp

+6 −2
Original line number Diff line number Diff line
@@ -239,8 +239,12 @@ static jboolean setFileCon(JNIEnv *env, jobject, jstring pathStr, jstring contex 
    char *tmp = const_cast<char *>(context.c_str());

    int ret = setfilecon(path.c_str(), tmp);



    if (ret == 0) {

        ALOGV("setFileCon(%s, %s) => %d", path.c_str(), context.c_str(), ret);

    return (ret == 0) ? true : false;

        return true;

    }

    ALOGE("setFileCon(%s, %s) => %d, err: %s", path.c_str(), context.c_str(), ret, strerror(errno));

    return false;

}



/*

services/core/java/com/android/server/pm/PackageInstallerService.java

+10 −1
Original line number Diff line number Diff line
@@ -1034,9 +1034,18 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 
        }



        if (!SELinux.restorecon(stageDir)) {

            String path = stageDir.getCanonicalPath();

            String ctx = SELinux.fileSelabelLookup(path);

            boolean success = SELinux.setFileContext(path, ctx);

            Slog.e(TAG,

                    "Failed to SELinux.restorecon session dir, path: [" + path + "], ctx: [" + ctx

                            + "]. Retrying via SELinux.fileSelabelLookup/SELinux.setFileContext: "

                            + (success ? "SUCCESS" : "FAILURE"));

            if (!success) {

                throw new IOException("Failed to restorecon session dir: " + stageDir);

            }

        }

    }



    private String buildExternalStageCid(int sessionId) {

        return "smdl" + sessionId + ".tmp";