commit 4124f4a40e1fef90df0dec243ecd9bcdbb911738
author Paul Westbrook <pwestbro@google.com> Thu Nov 29 10:05:40 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 29 10:05:40 2012 -0800
tree 6cc0b20da1cc2d9951ca7bfd74c6cd4142dff956
parent 978959e6199410419792e89fcea16413f56aeb12
parent 397cce4229eb90a6582e1e5b7ce153536a986627

Merge "Specify a timeout for the connection handshake" into jb-mr1.1-dev

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);
     }