commit 22a3a60ab0a072b3e5ccc5246315d9cdd40e80f1
author Suren Baghdasaryan <surenb@google.com> Wed Mar 21 21:44:23 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 21 21:44:23 2018 +0000
tree 98c10f98d036235fc60f6dcb7d61074ff9208ffc
parent e1e839f0f450d554916c9720bbe5fb8c8a333cc9
parent cb1d8171e0250858cf032feaf9c6054688af83f3

Merge "lmkd: Change error to warning when accessing oom_score_adj file" am: a77411f425 am: 3d3e875767
am: d33812455d

Change-Id: I38e27bae540e947706b31b1eb98c51b51e1a2708

lmkd/lmkd.c

diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c
index 64b1722..c09ad66 100644
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@@ -1215,7 +1215,7 @@
         (unsigned long)property_get_int32("ro.lmk.kill_timeout_ms", 0);
 
 #ifdef LMKD_LOG_STATS
-    statlog_init();
+    statslog_init(&log_ctx, &enable_stats_log);
 #endif
 
     // MCL_ONFAULT pins pages as they fault instead of loading
@@ -1235,7 +1235,7 @@
         mainloop();
 
 #ifdef LMKD_LOG_STATS
-    statslog_destroy();
+    statslog_destroy(&log_ctx);
 #endif
 
     ALOGI("exiting");

lmkd/statslog.h

diff --git a/lmkd/statslog.h b/lmkd/statslog.h
index b567fbf..4cde840 100644
--- a/lmkd/statslog.h
+++ b/lmkd/statslog.h
@@ -17,6 +17,7 @@
 #ifndef _STATSLOG_H_
 #define _STATSLOG_H_
 
+#include <assert.h>
 #include <stdbool.h>
 #include <sys/cdefs.h>
 
@@ -34,17 +35,26 @@
 #define LMK_STATE_CHANGE_START 1
 #define LMK_STATE_CHANGE_STOP 2
 
-static inline void statslog_init() {
-    enable_stats_log = property_get_bool("ro.lmk.log_stats", false);
+/*
+ * The single event tag id for all stats logs.
+ * Keep this in sync with system/core/logcat/event.logtags
+ */
+const static int kStatsEventTag = 1937006964;
 
-    if (enable_stats_log) {
-        log_ctx = create_android_logger(kStatsEventTag);
+static inline void statslog_init(android_log_context* log_ctx, bool* enable_stats_log) {
+    assert(log_ctx != NULL);
+    assert(enable_stats_log != NULL);
+    *enable_stats_log = property_get_bool("ro.lmk.log_stats", false);
+
+    if (*enable_stats_log) {
+        *log_ctx = create_android_logger(kStatsEventTag);
     }
 }
 
-static inline void statslog_destroy() {
-    if (log_ctx) {
-        android_log_destroy(&log_ctx);
+static inline void statslog_destroy(android_log_context* log_ctx) {
+    assert(log_ctx != NULL);
+    if (*log_ctx) {
+        android_log_destroy(log_ctx);
     }
 }
 
@@ -58,12 +68,6 @@
 
 #define MEMCG_PROCESS_MEMORY_STAT_PATH "/dev/memcg/apps/uid_%u/pid_%u/memory.stat"
 
-/*
- * The single event tag id for all stats logs.
- * Keep this in sync with system/core/logcat/event.logtags
- */
-const static int kStatsEventTag = 1937006964;
-
 /**
  * Logs the change in LMKD state which is used as start/stop boundaries for logging
  * LMK_KILL_OCCURRED event.

rootdir/etc/public.libraries.android.txt

diff --git a/rootdir/etc/public.libraries.android.txt b/rootdir/etc/public.libraries.android.txt
index e20b95d..2a51d53 100644
--- a/rootdir/etc/public.libraries.android.txt
+++ b/rootdir/etc/public.libraries.android.txt
@@ -1,6 +1,7 @@
 # See https://android.googlesource.com/platform/ndk/+/master/docs/PlatformApis.md
 libandroid.so
 libaaudio.so
+libamidi.so
 libc.so
 libcamera2ndk.so
 libdl.so

rootdir/etc/public.libraries.wear.txt

diff --git a/rootdir/etc/public.libraries.wear.txt b/rootdir/etc/public.libraries.wear.txt
index 3c46094..56055ba 100644
--- a/rootdir/etc/public.libraries.wear.txt
+++ b/rootdir/etc/public.libraries.wear.txt
@@ -1,6 +1,7 @@
 # See https://android.googlesource.com/platform/ndk/+/master/docs/PlatformApis.md
 libandroid.so
 libaaudio.so
+libamidi.so
 libc.so
 libcamera2ndk.so
 libdl.so