diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-09-20 03:02:43 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-09-20 03:02:43 +0000 |
| commit | a957f37f56f38a7334b8959ebf0e49327fbe471b (patch) | |
| tree | b3430d32bd860e444f640c45c54d701359248c61 | |
| parent | 99d69d441f37ad320f1cba086c2590e08aca745a (diff) | |
| parent | e9a04fa95530431b5e2e76ebf5b088ae4398cbf2 (diff) | |
| download | Telephony-android10-c2f2-s2-release.tar.gz | |
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-releaseandroid-10.0.0_r14android-10.0.0_r13android10-c2f2-s2-releaseandroid10-c2f2-release
Change-Id: Ib576a736cf4da8d0b7eab4d9e91751f88033e93a
| -rw-r--r-- | src/com/android/phone/NotificationMgr.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java index 1012a9e37..f2ff074ef 100644 --- a/src/com/android/phone/NotificationMgr.java +++ b/src/com/android/phone/NotificationMgr.java @@ -642,11 +642,10 @@ public class NotificationMgr { 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( |