commit 97a04fec29361033d49729b9ca436ff119692b93
author Jay Shrauner <shrauner@google.com> Thu Sep 17 22:43:53 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 17 22:43:53 2015 +0000
tree 8e28b626f23b6d05891a8b46c05016cfede72fa9
parent ceb81f60667091ca9a637304b1a3874e24e5355b
parent c284bbb83c890b4c22c8028bab6540b140affaf9

Merge "Fix IllegalStateException in onOptionsItemSelected" into ub-contactsdialer-a-dev

src/com/android/contacts/editor/ContactEditorBaseFragment.java

diff --git a/src/com/android/contacts/editor/ContactEditorBaseFragment.java b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
index 1c0ecab..2be2d3b 100644
--- a/src/com/android/contacts/editor/ContactEditorBaseFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
@@ -713,8 +713,10 @@
     }
 
     private void onRingtonePicked(Uri pickedUri) {
-        if (pickedUri == null || RingtoneManager.isDefault(pickedUri)) {
-            mCustomRingtone = null;
+        if (pickedUri == null) {
+            mCustomRingtone = ""; // silent ringtone
+        } else if (RingtoneManager.isDefault(pickedUri)){
+            mCustomRingtone = null; // default ringtone
         } else {
             mCustomRingtone = pickedUri.toString();
         }
@@ -914,7 +916,11 @@
 
         final Uri ringtoneUri;
         if (mCustomRingtone != null) {
-            ringtoneUri = Uri.parse(mCustomRingtone);
+            if ("".equals(mCustomRingtone)) { // select silent ringtone in RingtonePickerActivity
+                ringtoneUri = null;
+            } else {
+                ringtoneUri = Uri.parse(mCustomRingtone);
+            }
         } else {
             // Otherwise pick default ringtone Uri so that something is selected.
             ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);