Merge "Panda: Add bugmailer so bugreports can be produced."
diff --git a/device.mk b/device.mk
index 2ef82c2..73d66ae 100644
--- a/device.mk
+++ b/device.mk
@@ -75,6 +75,11 @@
 	hciconfig \
 	hcitool
 
+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-if-exists, vendor/ti/panda/device-vendor.mk)
 $(call inherit-product, frameworks/base/build/tablet-dalvik-heap.mk)
 $(call inherit-product, hardware/ti/omap4xxx/omap4.mk)
diff --git a/init.omap4pandaboard.rc b/init.omap4pandaboard.rc
index 928c4b9..a11a75b 100644
--- a/init.omap4pandaboard.rc
+++ b/init.omap4pandaboard.rc
@@ -25,15 +25,23 @@
 	mount ext4 /dev/block/platform/omap/omap_hsmmc.0/by-name/cache /cache wait noatime nosuid nodev
 
 # change permissions for Bluetooth/FM/GPS
-    chmod 0600 /sys/class/rfkill/rfkill0/state
-    chown bluetooth bluetooth /sys/class/rfkill/rfkill0/state
-    chmod 0600 /dev/ttyO1
-    chown bluetooth bluetooth /dev/ttyO1
+	chmod 0600 /sys/class/rfkill/rfkill0/state
+	chown bluetooth bluetooth /sys/class/rfkill/rfkill0/state
+	chmod 0600 /dev/ttyO1
+	chown bluetooth bluetooth /dev/ttyO1
 
 
 # take a wakelock on boot until PM is working
 	write /sys/power/wake_lock hack
 
+# bugreport is triggered by holding down the user button and left mouse button
+service bugreport /system/bin/bugmailer.sh -v
+	class main
+	disabled
+	oneshot
+	keycodes 102 272
+
+
 service pvrsrvinit /vendor/bin/pvrsrvinit
 	class core
 	user root