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

Merge "liblog: android_log_isloggable failing apct"

Browse source
This commit is contained in:
Treehugger Robot 2016-04-18 23:22:40 +00:00 • committed by Gerrit Code Review
commit 0d4661d549
2 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
liblog/log_is_loggable.c
View file

@ -63,7 +63,6 @@ static int check_cache(struct cache *cache)
static void refresh_cache(struct cache *cache, const char *key) static void refresh_cache(struct cache *cache, const char *key)
{ {
uint32_t serial;
char buf[PROP_VALUE_MAX]; char buf[PROP_VALUE_MAX];
if (!cache->pinfo) { if (!cache->pinfo) {
@ -71,13 +70,8 @@ static void refresh_cache(struct cache *cache, const char *key)
if (!cache->pinfo) { if (!cache->pinfo) {
return; return;
} }
cache->serial = -1;
} }
serial = __system_property_serial(cache->pinfo); cache->serial = __system_property_serial(cache->pinfo);
if (serial == cache->serial) {
return;
}
cache->serial = serial;
__system_property_read(cache->pinfo, 0, buf); __system_property_read(cache->pinfo, 0, buf);
switch(buf[0]) { switch(buf[0]) {
case 't': case 'T': case 't': case 'T':

28
liblog/tests/liblog_test.cpp
View file

@ -1338,7 +1338,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_FALSE(android_log_is_loggable); EXPECT_FALSE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_FALSE(__android_log_is_loggable( EXPECT_FALSE(__android_log_is_loggable(
levels[i].level, tag, levels[j].level)); levels[i].level, tag, levels[j].level));
} }
@ -1347,7 +1347,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_TRUE(android_log_is_loggable); EXPECT_TRUE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_TRUE(__android_log_is_loggable( EXPECT_TRUE(__android_log_is_loggable(
levels[i].level, tag, levels[j].level)); levels[i].level, tag, levels[j].level));
} }
@ -1379,7 +1379,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_FALSE(android_log_is_loggable); EXPECT_FALSE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_FALSE(__android_log_is_loggable( EXPECT_FALSE(__android_log_is_loggable(
levels[i].level, tag, ANDROID_LOG_DEBUG)); levels[i].level, tag, ANDROID_LOG_DEBUG));
} }
@ -1388,7 +1388,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_TRUE(android_log_is_loggable); EXPECT_TRUE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_TRUE(__android_log_is_loggable( EXPECT_TRUE(__android_log_is_loggable(
levels[i].level, tag, ANDROID_LOG_DEBUG)); levels[i].level, tag, ANDROID_LOG_DEBUG));
} }
@ -1408,7 +1408,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_FALSE(android_log_is_loggable); EXPECT_FALSE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_FALSE(__android_log_is_loggable( EXPECT_FALSE(__android_log_is_loggable(
levels[i].level, tag, ANDROID_LOG_DEBUG)); levels[i].level, tag, ANDROID_LOG_DEBUG));
} }
@ -1417,7 +1417,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_TRUE(android_log_is_loggable); EXPECT_TRUE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_TRUE(__android_log_is_loggable( EXPECT_TRUE(__android_log_is_loggable(
levels[i].level, tag, ANDROID_LOG_DEBUG)); levels[i].level, tag, ANDROID_LOG_DEBUG));
} }
@ -1439,7 +1439,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_FALSE(android_log_is_loggable); EXPECT_FALSE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_FALSE(__android_log_is_loggable( EXPECT_FALSE(__android_log_is_loggable(
levels[i].level, tag, ANDROID_LOG_DEBUG)); levels[i].level, tag, ANDROID_LOG_DEBUG));
} }
@ -1448,7 +1448,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_TRUE(android_log_is_loggable); EXPECT_TRUE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_TRUE(__android_log_is_loggable( EXPECT_TRUE(__android_log_is_loggable(
levels[i].level, tag, ANDROID_LOG_DEBUG)); levels[i].level, tag, ANDROID_LOG_DEBUG));
} }
@ -1468,7 +1468,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_FALSE(android_log_is_loggable); EXPECT_FALSE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_FALSE(__android_log_is_loggable( EXPECT_FALSE(__android_log_is_loggable(
levels[i].level, tag, ANDROID_LOG_DEBUG)); levels[i].level, tag, ANDROID_LOG_DEBUG));
} }
@ -1477,7 +1477,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_TRUE(android_log_is_loggable); EXPECT_TRUE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_TRUE(__android_log_is_loggable( EXPECT_TRUE(__android_log_is_loggable(
levels[i].level, tag, ANDROID_LOG_DEBUG)); levels[i].level, tag, ANDROID_LOG_DEBUG));
} }
@ -1513,7 +1513,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_FALSE(android_log_is_loggable); EXPECT_FALSE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_FALSE(__android_log_is_loggable( EXPECT_FALSE(__android_log_is_loggable(
levels[i].level, tag, ANDROID_LOG_DEBUG)); levels[i].level, tag, ANDROID_LOG_DEBUG));
} }
@ -1522,7 +1522,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_TRUE(android_log_is_loggable); EXPECT_TRUE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_TRUE(__android_log_is_loggable( EXPECT_TRUE(__android_log_is_loggable(
levels[i].level, tag, ANDROID_LOG_DEBUG)); levels[i].level, tag, ANDROID_LOG_DEBUG));
} }
@ -1542,7 +1542,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_FALSE(android_log_is_loggable); EXPECT_FALSE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_FALSE(__android_log_is_loggable( EXPECT_FALSE(__android_log_is_loggable(
levels[i].level, tag, ANDROID_LOG_DEBUG)); levels[i].level, tag, ANDROID_LOG_DEBUG));
} }
@ -1551,7 +1551,7 @@ TEST(liblog, is_loggable) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
EXPECT_TRUE(android_log_is_loggable); EXPECT_TRUE(android_log_is_loggable);
for(size_t k = 1000; k; --k) { for(size_t k = 10; k; --k) {
EXPECT_TRUE(__android_log_is_loggable( EXPECT_TRUE(__android_log_is_loggable(
levels[i].level, tag, ANDROID_LOG_DEBUG)); levels[i].level, tag, ANDROID_LOG_DEBUG));
} }