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

Merge "liblog: __android_log_is_loggable support Developer Options"

Browse source
This commit is contained in:
Mark Salyzyn 2015-04-23 21:06:30 +00:00 • committed by Gerrit Code Review
commit 2ce1d81fd4
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; return def;
} }
{ {
static const char log_namespace[] = "log.tag."; static const char log_namespace[] = "persist.log.tag.";
char key[sizeof(log_namespace) + strlen(tag)]; char key[sizeof(log_namespace) + strlen(tag)];
strcpy(key, log_namespace); 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) { if (__system_property_get(key + 8, buf) <= 0) {
buf[0] = '\0'; buf[0] = '\0';
} }
if (!buf[0] && __system_property_get(key, buf) <= 0) {
buf[0] = '\0';
}
} }
switch (toupper(buf[0])) { switch (toupper(buf[0])) {
case 'V': return ANDROID_LOG_VERBOSE; 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) int __android_log_is_loggable(int prio, const char *tag, int def)
{ {
static char user; int logLevel = __android_log_level(tag, def);
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);
return logLevel >= 0 && prio >= logLevel; return logLevel >= 0 && prio >= logLevel;
} }