diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-02-05 15:29:49 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-02-05 15:29:49 -0800 |
| commit | 77bc21f9fe7c26481723fda83fc2b6136bc1b86f (patch) | |
| tree | 89c339b76d00666dd977db0e52e3f23bfdcdbfb3 | |
| parent | 65e499798d5b0d983e13ca32e28ea3e7a76cc422 (diff) | |
| parent | 04074b86679dc2bc543ac6a304f3d1b53de610bc (diff) | |
| download | android_packages_apps_InCallUI-77bc21f9fe7c26481723fda83fc2b6136bc1b86f.tar.gz android_packages_apps_InCallUI-77bc21f9fe7c26481723fda83fc2b6136bc1b86f.tar.bz2 android_packages_apps_InCallUI-77bc21f9fe7c26481723fda83fc2b6136bc1b86f.zip | |
Merge "Show conference dial error"
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/com/android/incallui/InCallActivity.java | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 6a0068e1..81b3f563 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -635,4 +635,5 @@ <string name="call_state_holding">Holding</string> <string name="call_state_active">Active</string> <string name="call_state_disconnected">Disconnected</string> + <string name="dial_conference_call_error">Cannot create a 4G conference call, because the 4G network is not available.</string> </resources> diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java index 6fc7cfb4..87cfa064 100644 --- a/src/com/android/incallui/InCallActivity.java +++ b/src/com/android/incallui/InCallActivity.java @@ -766,8 +766,20 @@ public class InCallActivity extends Activity { showErrorDialog(getString(R.string.callFailed_incoming_cb_enabled)); } else if (!TextUtils.isEmpty(disconnectCause.getDescription()) && (code == DisconnectCause.ERROR || code == DisconnectCause.RESTRICTED)) { - showErrorDialog(disconnectCause.getDescription()); + if (isConferenceDialString(call.getNumber())){ + showErrorDialog(getString(R.string.dial_conference_call_error)); + }else{ + showErrorDialog(disconnectCause.getDescription()); + } + } + } + + private boolean isConferenceDialString(String number) { + String[] participantsArr = number.split(";"); + if ((participantsArr != null) && (participantsArr.length > 1)) { + return true; } + return false; } public void dismissPendingDialogs() { |