commit 97b61647108ffde4cc95e8ab9c92761d944ed68f
author Ta-wei Yen <twyen@google.com> Fri May 27 18:10:17 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 27 18:10:17 2016 +0000
tree bf16c534012ebf38559fe5c9251ca5e0489a13ec
parent 74a027a79cb2510c804761a3c9a801fe4ab3a5bb
parent 2f36d001473cc7a1e36d430181e299d18005aff1

Merge "Fix wrong voice mail ringtone for secondary SIM."

src/com/android/phone/NotificationMgr.java

diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 100a38c..6e68fa3 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -404,12 +404,12 @@
             Uri ringtoneUri = null;
 
             if (enableNotificationSound) {
-                ringtoneUri = VoicemailNotificationSettingsUtil.getRingtoneUri(mPhone);
+                ringtoneUri = VoicemailNotificationSettingsUtil.getRingtoneUri(phone);
             }
 
             Resources res = mContext.getResources();
             PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfigForSubId(
-                    mPhone.getSubId());
+                    subId);
             Notification.Builder builder = new Notification.Builder(mContext);
             builder.setSmallIcon(resId)
                     .setWhen(System.currentTimeMillis())