Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d71be89 authored by Meng Wang's avatar Meng Wang Committed by android-build-merger
Browse files

Merge "Show error code in WFC error notification." into oc-dr1-dev 

am: 00e96a76

Change-Id: I5d11d16a4192029b2cb602ba6bbdc05f82818a39
parents 67c3934a 00e96a76

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+4 −2
Original line number Diff line number Diff line
@@ -1641,14 +1641,16 @@ public class ImsPhone extends ImsPhoneBase { 
                    continue;

                }

                String messageAlert = imsReasonInfo.mExtraMessage;

                CharSequence messageNotification = imsReasonInfo.mExtraMessage;

                String messageNotification = imsReasonInfo.mExtraMessage;

                if (!wfcOperatorErrorAlertMessages[idx].isEmpty()) {

                    messageAlert = String.format(

                        wfcOperatorErrorAlertMessages[idx],

                        imsReasonInfo.mExtraMessage); // Fill IMS error code into alert message

                }

                if (!wfcOperatorErrorNotificationMessages[idx].isEmpty()) {

                    messageNotification = wfcOperatorErrorNotificationMessages[idx];

                    messageNotification = String.format(

                        wfcOperatorErrorNotificationMessages[idx],

                        imsReasonInfo.mExtraMessage); // Fill IMS error code into notification

                }



                // UX requirement is to disable WFC in case of "permanent" registration failures.