Merge "Fix order of voicemail ringtone initialization." into lmp-mr1-dev
diff --git a/src/com/android/phone/settings/VoicemailRingtonePreference.java b/src/com/android/phone/settings/VoicemailRingtonePreference.java
index fa3cc70..3dbb99f 100644
--- a/src/com/android/phone/settings/VoicemailRingtonePreference.java
+++ b/src/com/android/phone/settings/VoicemailRingtonePreference.java
@@ -39,6 +39,10 @@
}
}
};
+ }
+
+ public void init(Phone phone) {
+ mPhone = phone;
final Preference preference = this;
final String preferenceKey =
@@ -58,10 +62,6 @@
updateRingtoneName();
}
- public void init(Phone phone) {
- mPhone = phone;
- }
-
@Override
protected Uri onRestoreRingtone() {
return VoicemailNotificationSettingsUtil.getRingtoneUri(mPhone);