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

Commit 112f6949 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "android_os_SELinux.cpp: fix deprecation warnings." into main am: ee46f57b am: b6817312 

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



Change-Id: I5b9e46710141afba25c77a06d6749b74d9c40e65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b73df95 b6817312

core/jni/android_os_SELinux.cpp

+7 −7
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ selabel_handle* GetSELabelHandle() { 
}



struct SecurityContext_Delete {

    void operator()(security_context_t p) const {

    void operator()(char* p) const {

        freecon(p);

    }

};
@@ -111,7 +111,7 @@ static jstring fileSelabelLookup(JNIEnv* env, jobject, jstring pathStr) { 
        return NULL;

    }



    security_context_t tmp = NULL;

    char* tmp = NULL;

    if (selabel_lookup(selabel_handle, &tmp, path_c_str, S_IFREG) != 0) {

      ALOGE("fileSelabelLookup => selabel_lookup for %s failed: %d", path_c_str, errno);

      return NULL;
@@ -138,7 +138,7 @@ static jstring getFdConInner(JNIEnv *env, jobject fileDescriptor, bool isSocket) 
        return NULL;

    }



    security_context_t tmp = NULL;

    char* tmp = NULL;

    int ret;

    if (isSocket) {

        ret = getpeercon(fd, &tmp);
@@ -184,7 +184,7 @@ static jstring getFdCon(JNIEnv *env, jobject, jobject fileDescriptor) { 
 * Function: setFSCreateCon

 * Purpose: set security context used for creating a new file system object

 * Parameters:

 *       context: security_context_t representing the new context of a file system object,

 *       context: char* representing the new context of a file system object,

 *                set to NULL to return to the default policy behavior

 * Returns: true on success, false on error

 * Exception: none
@@ -267,7 +267,7 @@ static jstring getFileCon(JNIEnv *env, jobject, jstring pathStr) { 
        return NULL;

    }



    security_context_t tmp = NULL;

    char* tmp = NULL;

    int ret = getfilecon(path.c_str(), &tmp);

    Unique_SecurityContext context(tmp);
@@ -293,7 +293,7 @@ static jstring getCon(JNIEnv *env, jobject) { 
        return NULL;

    }



    security_context_t tmp = NULL;

    char* tmp = NULL;

    int ret = getcon(&tmp);

    Unique_SecurityContext context(tmp);
@@ -320,7 +320,7 @@ static jstring getPidCon(JNIEnv *env, jobject, jint pid) { 
        return NULL;

    }



    security_context_t tmp = NULL;

    char* tmp = NULL;

    int ret = getpidcon(static_cast<pid_t>(pid), &tmp);

    Unique_SecurityContext context(tmp);