From 674ce6ef58527f5e48299da889d031daac1e770e Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Tue, 26 Jan 2016 21:47:35 +0000 Subject: [PATCH] Revert "logd: security buffer only AID_SYSTEM reader" This reverts commit 756332e88b98018d82f225c54734be3d76102bfc. Change-Id: Ib8607ac758b7e88a9db716ec4274ec0e4e3dc596 --- logd/LogListener.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/logd/LogListener.cpp b/logd/LogListener.cpp index cc6df8051..846dd7c41 100644 --- a/logd/LogListener.cpp +++ b/logd/LogListener.cpp @@ -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; }