Merge "Migrate voicemail ringtone before initing settings dialog." into lmp-mr1-dev
diff --git a/src/com/android/phone/settings/VoicemailRingtonePreference.java b/src/com/android/phone/settings/VoicemailRingtonePreference.java
index 3dbb99f..4ee4e64 100644
--- a/src/com/android/phone/settings/VoicemailRingtonePreference.java
+++ b/src/com/android/phone/settings/VoicemailRingtonePreference.java
@@ -3,7 +3,6 @@
import android.content.Context;
import android.media.RingtoneManager;
import android.net.Uri;
-import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.preference.Preference;
@@ -11,7 +10,6 @@
import android.util.AttributeSet;
import com.android.internal.telephony.Phone;
-import com.android.phone.PhoneGlobals;
import com.android.phone.common.util.SettingsUtil;
/**
@@ -44,6 +42,9 @@
public void init(Phone phone) {
mPhone = phone;
+ // Requesting the ringtone will trigger migration if necessary.
+ VoicemailNotificationSettingsUtil.getRingtoneUri(phone);
+
final Preference preference = this;
final String preferenceKey =
VoicemailNotificationSettingsUtil.getVoicemailRingtoneSharedPrefsKey(mPhone);