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

Commit 55045303 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "Revert "logd: security buffer only AID_SYSTEM reader"" 

am: c85ce9ba

* commit 'c85ce9ba':
  Revert "logd: security buffer only AID_SYSTEM reader"
parents e4d688e2 c85ce9ba

logd/LogListener.cpp

+1 −13
Original line number Diff line number Diff line
@@ -36,18 +36,6 @@ LogListener::LogListener(LogBuffer *buf, LogReader *reader) : 
        reader(reader) {

}



static bool clientHasSecurityCredentials(uid_t uid, gid_t gid, pid_t /* pid */) {

    if (uid == AID_SYSTEM) {

        return true;

    }



    if (gid == AID_SYSTEM) {

        return true;

    }



    return false;

}



bool LogListener::onDataAvailable(SocketClient *cli) {

    static bool name_set;

    if (!name_set) {
@@ -110,7 +98,7 @@ bool LogListener::onDataAvailable(SocketClient *cli) { 


    if ((header->id == LOG_ID_SECURITY) &&

            (!__android_log_security() ||

             !clientHasSecurityCredentials(cred->uid, cred->gid, cred->pid))) {

             !clientHasLogCredentials(cred->uid, cred->gid, cred->pid))) {

        return false;

    }