summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-05-08 20:14:53 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-08 20:14:53 +0200
commit9cd94f87283159d80a51e1fce6ff68c97158b7ae (patch)
tree8cbfdd2b69ae6d36dcacaadec6f12b0f899a040c
parentam 3257155e: am 77a2c883: Merge "Add an alternate screen for viewing recovery logs." (diff)
parentam 3128176e: Merge "Fix build following adb change." (diff)
downloadandroid_bootable_recovery-9cd94f87283159d80a51e1fce6ff68c97158b7ae.tar
android_bootable_recovery-9cd94f87283159d80a51e1fce6ff68c97158b7ae.tar.gz
android_bootable_recovery-9cd94f87283159d80a51e1fce6ff68c97158b7ae.tar.bz2
android_bootable_recovery-9cd94f87283159d80a51e1fce6ff68c97158b7ae.tar.lz
android_bootable_recovery-9cd94f87283159d80a51e1fce6ff68c97158b7ae.tar.xz
android_bootable_recovery-9cd94f87283159d80a51e1fce6ff68c97158b7ae.tar.zst
android_bootable_recovery-9cd94f87283159d80a51e1fce6ff68c97158b7ae.zip
-rw-r--r--minadbd/adb_main.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp
index f6e240108..0e65386c4 100644
--- a/minadbd/adb_main.cpp
+++ b/minadbd/adb_main.cpp
@@ -26,13 +26,9 @@
#include "adb.h"
#include "transport.h"
-int adb_main(int is_daemon, int server_port)
-{
- atexit(usb_cleanup);
-
+int adb_main(int is_daemon, int server_port) {
adb_device_banner = "sideload";
- // No SIGCHLD. Let the service subproc handle its children.
signal(SIGPIPE, SIG_IGN);
init_transport_registration();