diff options
| author | Andrew Lee <anwlee@google.com> | 2015-01-26 20:32:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-26 20:32:23 +0000 |
| commit | f300ae67ec39a6ebaf09aad574c35f98d1a84d89 (patch) | |
| tree | add13f7907e20c85e47db064c1d0a77542655d8d /src | |
| parent | 85bb6af38c9d31a5ab77cb84d9c3d2471f5c4a96 (diff) | |
| parent | 2b2bcb0f8b92e548a0fab79974ff54bf6229e0bb (diff) | |
| download | android_packages_apps_PhoneCommon-f300ae67ec39a6ebaf09aad574c35f98d1a84d89.tar.gz android_packages_apps_PhoneCommon-f300ae67ec39a6ebaf09aad574c35f98d1a84d89.tar.bz2 android_packages_apps_PhoneCommon-f300ae67ec39a6ebaf09aad574c35f98d1a84d89.zip | |
am 2b2bcb0f: am 895849b2: Return default notification uri if none found.
* commit '2b2bcb0f8b92e548a0fab79974ff54bf6229e0bb':
Return default notification uri if none found.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/phone/common/util/SettingsUtil.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/phone/common/util/SettingsUtil.java b/src/com/android/phone/common/util/SettingsUtil.java index 859c1a5..d513f2c 100644 --- a/src/com/android/phone/common/util/SettingsUtil.java +++ b/src/com/android/phone/common/util/SettingsUtil.java @@ -36,6 +36,9 @@ import java.lang.CharSequence; import java.lang.String; public class SettingsUtil { + private static final String DEFAULT_NOTIFICATION_URI_STRING = + Settings.System.DEFAULT_NOTIFICATION_URI.toString(); + /** * Obtain the setting for "vibrate when ringing" setting. * @@ -72,12 +75,12 @@ public class SettingsUtil { } else { final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); // For voicemail notifications, we use the value saved in Phone's shared preferences. - String uriString = prefs.getString(key, null); + String uriString = prefs.getString(key, DEFAULT_NOTIFICATION_URI_STRING); if (TextUtils.isEmpty(uriString)) { // silent ringtone ringtoneUri = null; } else { - if (uriString.equals(Settings.System.DEFAULT_NOTIFICATION_URI.toString())) { + if (uriString.equals(DEFAULT_NOTIFICATION_URI_STRING)) { // If it turns out that the voicemail notification is set to the system // default notification, we retrieve the actual URI to prevent it from showing // up as "Unknown Ringtone". |