commit 178509efc415f365ad09c11df2d68b51ac32aca4
author Kenny Root <kroot@google.com> Tue Jan 24 15:37:09 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 24 15:37:09 2012 -0800
tree 6bef8846aa4d76b7c22db57ebb8fe8ce4e703681
parent 9883083afdb09845b0364f04c18d4fff24a89036
parent fa351ab265957fa8815df3c4ca1f3c105f253e8b

am fa351ab2: Only do bugreport on user build with ADB enabled

* commit 'fa351ab265957fa8815df3c4ca1f3c105f253e8b':
  Only do bugreport on user build with ADB enabled

bugmailer/bugmailer.sh

diff --git a/bugmailer/bugmailer.sh b/bugmailer/bugmailer.sh
index ba8eeb7..93d1c8a 100755
--- a/bugmailer/bugmailer.sh
+++ b/bugmailer/bugmailer.sh
@@ -1,5 +1,12 @@
 #!/system/bin/sh
 
+# Do not allow bugreports on user builds unless USB debugging
+# is enabled.
+if [ "x$(getprop ro.build.type)" = "xuser" -a \
+     "x$(getprop init.svc.adbd)" != "xrunning" ]; then
+  exit 0
+fi
+
 timestamp=`date +'%Y-%m-%d-%H-%M-%S'`
 storagePath="$EXTERNAL_STORAGE/bugreports"
 bugreport=$storagePath/bugreport-$timestamp