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

Commit 3605a856 authored by Thiébaud Weksteen's avatar Thiébaud Weksteen Committed by Automerger Merge Worker
Browse files

Merge "Replace security_context_t type" am: 05683386 am: 760547e2 am:... 

Merge "Replace security_context_t type" am: 05683386 am: 760547e2 am: 4622dfdd am: b753c5a9 am: 00e163d9

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

Change-Id: I5e3d62b0a300c7065399653bc0b995070fa6315e
parents 42649635 00e163d9

cmds/cmd/cmd.cpp

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int sort_func(const String16* lhs, const String16* rhs) 
}



struct SecurityContext_Delete {

    void operator()(security_context_t p) const {

    void operator()(char* p) const {

        freecon(p);

    }

};
@@ -108,7 +108,7 @@ public: 
        }

        if (is_selinux_enabled() && seLinuxContext.size() > 0) {

            String8 seLinuxContext8(seLinuxContext);

            security_context_t tmp = nullptr;

            char* tmp = nullptr;

            getfilecon(fullPath.string(), &tmp);

            Unique_SecurityContext context(tmp);

            if (checkWrite) {