diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-09-20 04:45:17 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-09-20 04:45:17 +0000 |
| commit | f1e7b9681a25c8290adadd75f6e3298157131672 (patch) | |
| tree | 213409f478eca8b9929e1fd6b0ce2ec86e5da119 | |
| parent | 38debef1a62c266f49cc367c0f8183a0ca0d753d (diff) | |
| parent | 062b23f0de154f8bdb5d37f48aedea062b0c863e (diff) | |
| download | platform_packages_services_Telephony-android10-c2f2-s1-release.tar.gz platform_packages_services_Telephony-android10-c2f2-s1-release.tar.bz2 platform_packages_services_Telephony-android10-c2f2-s1-release.zip | |
Merge cherrypicks of [9428684, 9428685, 9428686, 9428687, 9428607, 9428608, 9428514, 9428272, 9428273, 9428275, 9428276, 9428277, 9428278, 9428689, 9428690, 9428691, 9428478, 9428702, 9428692, 9428479, 9428720, 9428721, 9428722, 9428723, 9428703, 9426151, 9428693, 9428724, 9428725, 9428726, 9428727, 9428728, 9428729, 9428730, 9428731, 9428732, 9428733, 9428734, 9428704, 9428609, 9428610, 9428611, 9428612, 9428613, 9428614, 9428615, 9426152, 9426153, 9426154, 9426155, 9426156, 9426157, 9426158, 9426159, 9428740, 9428409, 9428694, 9428695, 9428735] into sparse-5888870-L93800000368094851android-10.0.0_r12android10-c2f2-s1-release
Change-Id: I80ba57787939c3f236047280ccd58503f9991991
| -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( |