merge in nyc-bugfix-release history after reset to nyc-dev
diff --git a/include/android/log.h b/include/android/log.h
index 391c826..1c171b7 100644
--- a/include/android/log.h
+++ b/include/android/log.h
@@ -89,11 +89,6 @@
} android_LogPriority;
/*
- * Release any logger resources (a new log write will immediately re-acquire)
- */
-void __android_log_close();
-
-/*
* Send a simple string to the log.
*/
int __android_log_write(int prio, const char *tag, const char *text);
diff --git a/liblog/logger_write.c b/liblog/logger_write.c
index c7b5a84..b802ed7 100644
--- a/liblog/logger_write.c
+++ b/liblog/logger_write.c
@@ -132,41 +132,6 @@
}
return kLogNotAvailable;
}
-/*
- * Release any logger resources. A new log write will immediately re-acquire.
- */
-LIBLOG_ABI_PUBLIC void __android_log_close()
-{
- struct android_log_transport_write *transport;
-
- __android_log_lock();
-
- write_to_log = __write_to_log_init;
-
- /*
- * Threads that are actively writing at this point are not held back
- * by a lock and are at risk of dropping the messages with a return code
- * -EBADF. Prefer to return error code than add the overhead of a lock to
- * each log writing call to guarantee delivery. In addition, anyone
- * calling this is doing so to release the logging resources and shut down,
- * for them to do so with outstanding log requests in other threads is a
- * disengenuous use of this function.
- */
-
- write_transport_for_each(transport, &__android_log_persist_write) {
- if (transport->close) {
- (*transport->close)();
- }
- }
-
- write_transport_for_each(transport, &__android_log_transport_write) {
- if (transport->close) {
- (*transport->close)();
- }
- }
-
- __android_log_unlock();
-}
/* log_init_lock assumed */
static int __write_to_log_initialize()
diff --git a/liblog/tests/liblog_test.cpp b/liblog/tests/liblog_test.cpp
index f0acdf8..6aa4fb7 100644
--- a/liblog/tests/liblog_test.cpp
+++ b/liblog/tests/liblog_test.cpp
@@ -132,17 +132,12 @@
ASSERT_TRUE(NULL != (logger_list = android_logger_list_open(
LOG_ID_EVENTS, ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, 1000, pid)));
- // Check that we can close and reopen the logger
log_time ts(CLOCK_MONOTONIC);
- ASSERT_LT(0, __android_log_btwrite(0, EVENT_TYPE_LONG, &ts, sizeof(ts)));
- __android_log_close();
- log_time ts1(CLOCK_MONOTONIC);
- ASSERT_LT(0, __android_log_btwrite(0, EVENT_TYPE_LONG, &ts1, sizeof(ts1)));
+ ASSERT_LT(0, __android_log_btwrite(0, EVENT_TYPE_LONG, &ts, sizeof(ts)));
usleep(1000000);
int count = 0;
- int second_count = 0;
for (;;) {
log_msg log_msg;
@@ -166,13 +161,10 @@
log_time tx(eventData + 4 + 1);
if (ts == tx) {
++count;
- } else if (ts1 == tx) {
- ++second_count;
}
}
EXPECT_EQ(1, count);
- EXPECT_EQ(1, second_count);
android_logger_list_close(logger_list);
}
