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

                    Rlog.e(LOG_TAG, "Invalid index: " + wfcOperatorErrorCodes[i]);

                    continue;

                }

                CharSequence messageAlert = imsReasonInfo.mExtraMessage;

                String messageAlert = imsReasonInfo.mExtraMessage;

                CharSequence messageNotification = imsReasonInfo.mExtraMessage;

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

                    messageAlert = wfcOperatorErrorAlertMessages[idx];

                    messageAlert = String.format(

                        wfcOperatorErrorAlertMessages[idx],

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

                }

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

                    messageNotification = wfcOperatorErrorNotificationMessages[idx];