ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Restrict pmsg use to eng builds."

Browse source 
am: 1723f3fcd1

Change-Id: Idf6703adbdbae1cfc42e92a9951920d29b69d29a
This commit is contained in:
Mark Salyzyn 2016-09-20 17:42:21 +00:00 • committed by android-build-merger
commit acf9f6d71b
1 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
liblog/pmsg_writer.c
View file

@ -31,8 +31,6 @@
#include <private/android_filesystem_config.h> #include <private/android_filesystem_config.h>
#include <private/android_logger.h> #include <private/android_logger.h>
#include <sys/system_properties.h>
#include "config_write.h" #include "config_write.h"
#include "log_portability.h" #include "log_portability.h"
#include "logger.h" #include "logger.h"
@ -53,25 +51,8 @@ LIBLOG_HIDDEN struct android_log_transport_write pmsgLoggerWrite = {
.write = pmsgWrite, .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() static int pmsgOpen()
{ {
pmsgShouldUse = pmsgIsEng();
if (pmsgLoggerWrite.context.fd < 0) { if (pmsgLoggerWrite.context.fd < 0) {
pmsgLoggerWrite.context.fd = TEMP_FAILURE_RETRY(open("/dev/pmsg0", O_WRONLY | O_CLOEXEC)); pmsgLoggerWrite.context.fd = TEMP_FAILURE_RETRY(open("/dev/pmsg0", O_WRONLY | O_CLOEXEC));
} }
@ -94,7 +75,7 @@ static int pmsgAvailable(log_id_t logId)
} }
if ((logId != LOG_ID_SECURITY) && if ((logId != LOG_ID_SECURITY) &&
(logId != LOG_ID_EVENTS) && (logId != LOG_ID_EVENTS) &&
(!pmsgShouldUse || !__android_log_is_debuggable())) { !__android_log_is_debuggable()) {
return -EINVAL; return -EINVAL;
} }
if (pmsgLoggerWrite.context.fd < 0) { if (pmsgLoggerWrite.context.fd < 0) {
@ -124,7 +105,7 @@ static int pmsgWrite(log_id_t logId, struct timespec *ts,
size_t i, payloadSize; size_t i, payloadSize;
ssize_t ret; ssize_t ret;
if ((logId == LOG_ID_EVENTS) && (!pmsgShouldUse || !__android_log_is_debuggable())) { if ((logId == LOG_ID_EVENTS) && !__android_log_is_debuggable()) {
if (vec[0].iov_len < 4) { if (vec[0].iov_len < 4) {
return -EINVAL; return -EINVAL;
} }