diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-28 16:26:40 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-28 16:26:40 -0700 |
commit | e406906e16bf31bdd0064b8d47df5b177e8e8550 (patch) | |
tree | 1a03ad7da83809a156aed0a74936332015ad7819 /media | |
parent | a0d128c8c601750dcbcf97342ffca7865b8a6f9e (diff) | |
parent | 69f593ccb7414ee98991b1da1a4bfbd9951e3570 (diff) | |
download | frameworks_base-e406906e16bf31bdd0064b8d47df5b177e8e8550.zip frameworks_base-e406906e16bf31bdd0064b8d47df5b177e8e8550.tar.gz frameworks_base-e406906e16bf31bdd0064b8d47df5b177e8e8550.tar.bz2 |
Merge change 8878
* changes:
Support for selection of silent ringtone from the ringtone picker. This doesn't actually enable that, but adds the necessary code to make it work when enabled, and cleans up some ringtone related code.
Diffstat (limited to 'media')
-rw-r--r-- | media/java/android/media/RingtoneManager.java | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index 44026e4..8481410 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -605,21 +605,6 @@ public class RingtoneManager { Log.e(TAG, "Failed to open ringtone " + ringtoneUri); } - // Ringtone doesn't exist, use the fallback ringtone. - try { - AssetFileDescriptor afd = context.getResources().openRawResourceFd( - com.android.internal.R.raw.fallbackring); - if (afd != null) { - Ringtone r = new Ringtone(context); - r.open(afd); - afd.close(); - return r; - } - } catch (Exception ex) { - } - - // we should never get here - Log.e(TAG, "unable to find a usable ringtone"); return null; } @@ -638,8 +623,8 @@ public class RingtoneManager { public static Uri getActualDefaultRingtoneUri(Context context, int type) { String setting = getSettingForType(type); if (setting == null) return null; - final String uriString = Settings.System.getString(context.getContentResolver(), setting); - return uriString != null ? Uri.parse(uriString) : getValidRingtoneUri(context); + final String uriString = Settings.System.getString(context.getContentResolver(), setting); + return uriString != null ? Uri.parse(uriString) : null; } /** @@ -655,7 +640,8 @@ public class RingtoneManager { public static void setActualDefaultRingtoneUri(Context context, int type, Uri ringtoneUri) { String setting = getSettingForType(type); if (setting == null) return; - Settings.System.putString(context.getContentResolver(), setting, ringtoneUri.toString()); + Settings.System.putString(context.getContentResolver(), setting, + ringtoneUri != null ? ringtoneUri.toString() : null); } private static String getSettingForType(int type) { |