Merge cherrypicks of [9427457, 9427458, 9427580, 9427582, 9427507, 9427508, 9427532, 9427584, 9427394, 9427473, 9427585, 9427396, 9427474, 9427586, 9427587, 9427588, 9427547, 9427589, 9427476, 9427477, 9427478, 9427479, 9427640, 9427548, 9427398, 9427591, 9427509, 9427510, 9427511, 9427512, 9427515, 9427516, 9427517, 9427518, 9427519, 9427720, 9427643, 9427570, 9427721, 9427722, 9427725, 9427726, 9427727, 9427730, 9427731, 9427740, 9427741, 9427742, 9427743, 9427744, 9427745, 9427746, 9427747, 9427571, 9427592, 9427593, 9427647] into qt-c2f2-release
Change-Id: Ib576a736cf4da8d0b7eab4d9e91751f88033e93a
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 1012a9e..f2ff074 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -642,11 +642,10 @@
final CharSequence contentText = TextUtils.isEmpty(line1Num) ?
String.format(mContext.getText(
- R.string.limited_sim_function_notification_message).toString(),
- carrierName, line1Num) :
+ R.string.limited_sim_function_notification_message).toString(), carrierName) :
String.format(mContext.getText(
R.string.limited_sim_function_with_phone_num_notification_message).toString(),
- carrierName);
+ carrierName, line1Num);
final Notification.Builder builder = new Notification.Builder(mContext)
.setSmallIcon(R.drawable.ic_sim_card)
.setContentTitle(mContext.getText(
