commit 171cd0678008a48ce281f2f9b631108bc27dbefd
author Scott Kennedy <skennedy@google.com> Wed Nov 28 19:54:30 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 28 19:54:30 2012 -0800
tree 06ae5dd41235637009978b39d48cda06996c50c0
parent 3f893f7b449133935fa8997b5e602d2587546afc
parent 978959e6199410419792e89fcea16413f56aeb12

am 978959e6: Do not vibrate in vibrate mode if ringtone is silent

* commit '978959e6199410419792e89fcea16413f56aeb12':
  Do not vibrate in vibrate mode if ringtone is silent

src/com/android/email/NotificationController.java

diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index 2331f5a..1dc2149 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -677,7 +677,7 @@
             defaults |= Notification.DEFAULT_VIBRATE;
         }
 
-        builder.setSound((ringtoneUri == null) ? null : Uri.parse(ringtoneUri))
+        builder.setSound(TextUtils.isEmpty(ringtoneUri) ? null : Uri.parse(ringtoneUri))
             .setDefaults(defaults);
     }