commit 6ba555f2ad878129cd1da9dd7b7613ab166090ab
author Igor Murashkin <iam@google.com> Tue Aug 19 23:06:56 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 19 22:53:25 2014 +0000
tree b9aeec626d7d7fdc982248fd7a4e757d8923c9b0
parent 3e3fbc4d734c1394823ac3d91b88c4aa87c6b265
parent 63fbdb6440ce5009ef0bfd3d1e1cc60b46004973

Merge "libutils: Don't segfault ProcessCallStack when getting thread name fails" into lmp-dev

liblog/logd_write.c

diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index 3171c78..3659676 100644
--- a/liblog/logd_write.c
+++ b/liblog/logd_write.c
@@ -31,6 +31,10 @@
 #include <time.h>
 #include <unistd.h>
 
+#ifdef __BIONIC__
+#include <android/set_abort_message.h>
+#endif
+
 #include <log/logd.h>
 #include <log/logger.h>
 #include <log/log_read.h>
@@ -333,8 +337,7 @@
 
 #if __BIONIC__
     if (prio == ANDROID_LOG_FATAL) {
-        extern void __android_set_abort_message(const char*);
-        __android_set_abort_message(msg);
+        android_set_abort_message(msg);
     }
 #endif
 

liblog/logd_write_kern.c

diff --git a/liblog/logd_write_kern.c b/liblog/logd_write_kern.c
index 1ed5ecf..ae621cb 100644
--- a/liblog/logd_write_kern.c
+++ b/liblog/logd_write_kern.c
@@ -28,6 +28,10 @@
 #include <time.h>
 #include <unistd.h>
 
+#ifdef __BIONIC__
+#include <android/set_abort_message.h>
+#endif
+
 #include <log/log.h>
 #include <log/logd.h>
 #include <log/logger.h>
@@ -177,8 +181,7 @@
 
 #if __BIONIC__
     if (prio == ANDROID_LOG_FATAL) {
-        extern void __android_set_abort_message(const char*);
-        __android_set_abort_message(msg);
+        android_set_abort_message(msg);
     }
 #endif
 

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 08b9a35..25593a9 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -526,7 +526,6 @@
     onrestart restart zygote
     onrestart restart media
     onrestart restart surfaceflinger
-    onrestart restart inputflinger
     onrestart restart drm
 
 service vold /system/bin/vold
@@ -560,12 +559,6 @@
     group graphics drmrpc
     onrestart restart zygote
 
-service inputflinger /system/bin/inputflinger
-    class main
-    user system
-    group input
-    onrestart restart zygote
-
 service drm /system/bin/drmserver
     class main
     user drm