Prevent silent ringtone to be the default one.android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9jb-mr2-release

Bug: 7588955
Change-Id: I3df59a7010f0a92d48796b770ff2e4fcbef5f811

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/android/deskclock/AlarmClock.java b/src/com/android/deskclock/AlarmClock.java
index cacf091b0..996363b6d 100644
--- a/src/com/android/deskclock/AlarmClock.java
+++ b/src/com/android/deskclock/AlarmClock.java
@@ -371,7 +371,9 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback
         final Uri uri = intent.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
         mSelectedAlarm.alert = uri;
         // Save the last selected ringtone as the default for new alarms
-        RingtoneManager.setActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM, uri);
+        if (uri != null) {
+            RingtoneManager.setActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM, uri);
+        }
         asyncUpdateAlarm(mSelectedAlarm, false);
     }
 
@@ -1129,6 +1131,9 @@ public class AlarmClock extends Activity implements LoaderManager.LoaderCallback
     private void asyncAddAlarm() {
         Alarm a = new Alarm();
         a.alert = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
+        if (a.alert == null) {
+            a.alert = Uri.parse("content://settings/system/alarm_alert");
+        }
         asyncAddAlarm(a, true);
     }