Revert "Alarms: Fallback to defualt when uri is invalid"kitkat

This reverts commit addb01105321350119d6321e00d135c5478d496c.

Change-Id: Idf224ac554f7c3bd42f94e9ef1faf34ccc2c3a07

3 files changed, 18 insertions, 53 deletions

diff --git a/src/com/android/deskclock/AlarmClockFragment.java b/src/com/android/deskclock/AlarmClockFragment.java
index c0d25644b..e366fa29d 100644
--- a/src/com/android/deskclock/AlarmClockFragment.java
+++ b/src/com/android/deskclock/AlarmClockFragment.java
@@ -1264,11 +1264,6 @@ public class AlarmClockFragment extends DeskClockFragment implements
                 // The view was converted but somehow lost its tag.
                 setNewHolder(view);
             }
-            if (!Utils.isRingToneUriValid(mContext, alarm.alert)) {
-                alarm.alert = RingtoneManager.getActualDefaultRingtoneUri(context,
-                        RingtoneManager.TYPE_ALARM);
-                asyncUpdateAlarm(alarm, false);
-            }
             final ItemHolder itemHolder = (ItemHolder) tag;
             itemHolder.alarm = alarm;
 
@@ -1519,7 +1514,7 @@ public class AlarmClockFragment extends DeskClockFragment implements
             if (Alarm.NO_RINGTONE_URI.equals(alarm.alert)) {
                 ringtone = mContext.getResources().getString(R.string.silent_alarm_summary);
             } else {
-                ringtitle = getRingToneTitle(alarm);
+                ringtitle = getRingToneTitle(alarm.alert);
                 if (ringtitle != null) {
                     ringtone = ringtitle;
                 } else {
@@ -1628,18 +1623,17 @@ public class AlarmClockFragment extends DeskClockFragment implements
         /**
          * Does a read-through cache for ringtone titles.
          *
-         * @param Alarm The alarm to get the ringtone title from.
+         * @param uri The uri of the ringtone.
          * @return The ringtone title. {@literal null} if no matching ringtone found.
          */
-        private String getRingToneTitle(Alarm alarm) {
-            Uri uri = alarm.alert;
+        private String getRingToneTitle(Uri uri) {
             // Try the cache first
             String title = mRingtoneTitleCache.getString(uri.toString());
             if (title == null) {
                 if (uri.equals(AlarmMediaPlayer.RANDOM_URI)) {
                     title = mContext.getResources().getString(R.string.alarm_type_random);
                 } else {
-                    if (Utils.isRingToneUriValid(mContext, uri)) {
+                    if (isRingToneUriValid(uri)) {
                         if (uri.getAuthority().equals(DOC_AUTHORITY)
                                 || uri.getAuthority().equals(DOC_DOWNLOAD)) {
                             title = getDisplayNameFromDatabase(mContext,uri);
@@ -1658,6 +1652,19 @@ public class AlarmClockFragment extends DeskClockFragment implements
             return title;
         }
 
+        private boolean isRingToneUriValid(Uri uri) {
+            if (uri.getScheme().contentEquals("file")) {
+                File f = new File(uri.getPath());
+                if (f.exists()) {
+                    return true;
+                }
+            } else if (uri.getScheme().contentEquals("content")) {
+                return true;
+            }
+
+            return false;
+        }
+
         private String getDisplayNameFromDatabase(Context context,Uri uri) {
             String selection = null;
             String[] selectionArgs = null;
diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java
index 5abf79fa2..21257f96c 100644
--- a/src/com/android/deskclock/Utils.java
+++ b/src/com/android/deskclock/Utils.java
@@ -28,7 +28,6 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
-import android.database.Cursor;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
@@ -38,7 +37,6 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
-import android.provider.MediaStore;
 import android.provider.Settings;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -56,14 +54,12 @@ import android.view.animation.DecelerateInterpolator;
 import android.widget.TextClock;
 import android.widget.TextView;
 
-import com.android.deskclock.provider.Alarm;
 import com.android.deskclock.stopwatch.Stopwatches;
 import com.android.deskclock.timer.Timers;
 import com.android.deskclock.worldclock.CityObj;
 import com.android.deskclock.worldclock.db.DbCities;
 import com.android.deskclock.worldclock.db.DbCity;
 
-import java.io.File;
 import java.text.Collator;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -612,32 +608,4 @@ public class Utils {
     public static String getCityName(CityObj city, CityObj dbCity) {
         return (city.mCityId == null || dbCity == null) ? city.mCityName : dbCity.mCityName;
     }
-
-    public static boolean isRingToneUriValid(Context context, Uri uri) {
-        if (uri.equals(AlarmMediaPlayer.RANDOM_URI) || uri.equals(Alarm.NO_RINGTONE_URI)) {
-            return true;
-        } else if (uri.getScheme().contentEquals("file")) {
-            File f = new File(uri.getPath());
-            if (f.exists()) {
-                return true;
-            }
-        } else if (uri.getScheme().contentEquals("content")) {
-            Cursor cursor = null;
-            try {
-                cursor = context.getContentResolver().query(uri,
-                        new String[] {MediaStore.Audio.Media.TITLE}, null, null, null);
-                if (cursor != null && cursor.getCount() > 0) {
-                    return true;
-                }
-            } catch (Exception e) {
-                Log.e("Get ringtone uri Exception: e.toString=" + e.toString());
-            } finally {
-                if (cursor != null) {
-                    cursor.close();
-                }
-            }
-        }
-
-        return false;
-    }
 }
diff --git a/src/com/android/deskclock/alarms/AlarmKlaxon.java b/src/com/android/deskclock/alarms/AlarmKlaxon.java
index a7d9470a1..08ec2e12d 100644
--- a/src/com/android/deskclock/alarms/AlarmKlaxon.java
+++ b/src/com/android/deskclock/alarms/AlarmKlaxon.java
@@ -30,7 +30,6 @@ import android.os.Vibrator;
 import com.android.deskclock.Log;
 import com.android.deskclock.AlarmMediaPlayer;
 import com.android.deskclock.R;
-import com.android.deskclock.Utils;
 import com.android.deskclock.provider.AlarmInstance;
 
 import java.io.IOException;
@@ -116,19 +115,10 @@ public class AlarmKlaxon {
             // Fall back on the default alarm if the database does not have an
             // alarm stored.
             if (alarmNoise == null) {
-                // Try to get the actual default first, this will be the one set by the user
-                alarmNoise = RingtoneManager.getActualDefaultRingtoneUri(context,
-                        RingtoneManager.TYPE_ALARM);
-                // if the actual default is null, fallback to the system default.
-                if (alarmNoise == null) {
-                    alarmNoise = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM);
-                }
+                alarmNoise = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM);
                 if (Log.LOGV) {
                     Log.v("Using default alarm: " + alarmNoise.toString());
                 }
-            } else if (!Utils.isRingToneUriValid(context, alarmNoise)) {
-                alarmNoise = RingtoneManager.getActualDefaultRingtoneUri(context,
-                        RingtoneManager.TYPE_ALARM);
             }
 
             sAudioManager = (AudioManager)context.getSystemService(Context.AUDIO_SERVICE);