commit 71deef182ac38b17131c45b864847776b585782e
author Mark Salyzyn <salyzyn@google.com> Tue Jan 26 23:04:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 26 23:04:12 2016 +0000
tree a74ab6ccf7ab0335b84b3bd5d04b1b5282855b9c
parent 93a8b0dd6adb4059f8c0ed79416fb2244b62764e
parent 987be9c1e6ae8b91f5fff91406bbf4e949774aa8

Merge "Revert "logd: security buffer only AID_SYSTEM reader"" am: c85ce9ba8e
am: 55045303f7

* commit '55045303f732f744554f15fce5e09327e3c348a0':
  Revert "logd: security buffer only AID_SYSTEM reader"

logd/LogListener.cpp

diff --git a/logd/LogListener.cpp b/logd/LogListener.cpp
index cc6df80..846dd7c 100644
--- a/logd/LogListener.cpp
+++ b/logd/LogListener.cpp
@@ -36,18 +36,6 @@
         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 @@
 
     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;
     }