2 files changed, 2 insertions, 7 deletions
diff --git a/device.mk b/device.mk
index 32e78f0..3501de9 100644
--- a/device.mk
+++ b/device.mk
@@ -198,12 +198,6 @@ PRODUCT_PACKAGES += \
 	e2fsck \
 	setup_fs
 
-# for bugmailer
-PRODUCT_PACKAGES += send_bug
-PRODUCT_COPY_FILES += \
-	system/extras/bugmailer/bugmailer.sh:system/bin/bugmailer.sh \
-	system/extras/bugmailer/send_bug:system/bin/send_bug
-
 $(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)
 
 $(call inherit-product-if-exists, vendor/nxp/pn544/nxp-pn544-fw-vendor.mk)
diff --git a/init.tuna.rc b/init.tuna.rc
index c171667..6392b12 100755
--- a/init.tuna.rc
+++ b/init.tuna.rc
@@ -224,7 +224,8 @@ service iprenew_eth0 /system/bin/dhcpcd -n
 	oneshot
 
 # bugreport is triggered by holding down volume down, volume up and power
-service bugreport /system/bin/bugmailer.sh -v
+service bugreport /system/bin/dumpstate -d -p -B \
+        -o /data/data/com.android.shell/files/bugreports/bugreport
 	class main
 	disabled
 	oneshot