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

am 9d4b3010: am 2ce1d81f: Merge "liblog: __android_log_is_loggable support Developer Options" 

* commit '9d4b3010b5b8c9e6c155df2ec1da4a33992a1ebd':
  liblog: __android_log_is_loggable support Developer Options
This commit is contained in:
Mark Salyzyn 2015-04-23 21:27:59 +00:00 committed by Android Git Automerger
parent ef9a093fdd 9d4b3010b5
commit 9277b01138
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
liblog/log_is_loggable.c
View File

@ -28,7 +28,7 @@ static int __android_log_level(const char *tag, int def)
return def;
}
{
static const char log_namespace[] = "log.tag.";
static const char log_namespace[] = "persist.log.tag.";
char key[sizeof(log_namespace) + strlen(tag)];
strcpy(key, log_namespace);
@ -37,6 +37,9 @@ static int __android_log_level(const char *tag, int def)
if (__system_property_get(key + 8, buf) <= 0) {
buf[0] = '\0';
}
if (!buf[0] && __system_property_get(key, buf) <= 0) {
buf[0] = '\0';
}
}
switch (toupper(buf[0])) {
case 'V': return ANDROID_LOG_VERBOSE;
@ -53,17 +56,6 @@ static int __android_log_level(const char *tag, int def)
int __android_log_is_loggable(int prio, const char *tag, int def)
{
static char user;
int logLevel;
if (user == 0) {
char buf[PROP_VALUE_MAX];
if (__system_property_get("ro.build.type", buf) <= 0) {
buf[0] = '\0';
}
user = strcmp(buf, "user") ? -1 : 1;
}
logLevel = (user == 1) ? def : __android_log_level(tag, def);
int logLevel = __android_log_level(tag, def);
return logLevel >= 0 && prio >= logLevel;
}