openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Restrict pmsg use to eng builds." into nyc-dr1-dev

This commit is contained in:
Tim Murray 2016-08-22 20:19:19 +00:00 committed by Android (Google) Code Review
parent af8d67e032 f894b96a92
commit 67ea7311f0
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
liblog/pmsg_writer.c
View File

@ -31,6 +31,8 @@
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
#include <sys/system_properties.h>
#include "config_write.h"
#include "log_portability.h"
#include "logger.h"
@ -51,8 +53,25 @@ LIBLOG_HIDDEN struct android_log_transport_write pmsgLoggerWrite = {
.write = pmsgWrite,
};
static bool pmsgShouldUse = false;
// Only use pmsg on eng builds
static bool pmsgIsEng() {
char buf[PROP_VALUE_MAX];
if (__system_property_get("ro.build.type", buf) == 0) {
return false;
}
if (!strncmp(buf, "eng", sizeof("eng"))) {
return true;
}
return false;
}
static int pmsgOpen()
{
pmsgShouldUse = pmsgIsEng();
if (pmsgLoggerWrite.context.fd < 0) {
pmsgLoggerWrite.context.fd = TEMP_FAILURE_RETRY(open("/dev/pmsg0", O_WRONLY | O_CLOEXEC));
}
@ -75,7 +94,7 @@ static int pmsgAvailable(log_id_t logId)
}
if ((logId != LOG_ID_SECURITY) &&
(logId != LOG_ID_EVENTS) &&
!__android_log_is_debuggable()) {
(!pmsgShouldUse || !__android_log_is_debuggable())) {
return -EINVAL;
}
if (pmsgLoggerWrite.context.fd < 0) {
@ -105,7 +124,7 @@ static int pmsgWrite(log_id_t logId, struct timespec *ts,
size_t i, payloadSize;
ssize_t ret;
if ((logId == LOG_ID_EVENTS) && !__android_log_is_debuggable()) {
if ((logId == LOG_ID_EVENTS) && (!pmsgShouldUse || !__android_log_is_debuggable())) {
if (vec[0].iov_len < 4) {
return -EINVAL;
}