Use correct failure message for call resume failure.
The "can't switch" message was being used in the past.
Test: Manual
Bug: 77914301
Change-Id: I6ac651789ea05dcc5075d907ff3443ad4e816839
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e7e2571..dec26fb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1100,6 +1100,9 @@
<string name="incall_error_supp_service_unknown">Service not supported</string>
<!-- In-call screen: message displayed in an error dialog -->
<string name="incall_error_supp_service_switch">Can\'t switch calls.</string>
+ <!-- In-call screen: message displayed in an error dialog when the user attempts to resume a
+ call, and the system encountered an error which prevented the call from being resumed. -->
+ <string name="incall_error_supp_service_resume">Can\'t resume call.</string>
<!-- In-call screen: message displayed in an error dialog -->
<string name="incall_error_supp_service_separate">Can\'t separate call.</string>
<!-- In-call screen: message displayed in an error dialog -->
diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 1a7a1d1..ec670f5 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -546,9 +546,9 @@
mergeFailedString = mApplication.getResources().getString(
R.string.incall_error_supp_service_conference);
} else if (r.result == Phone.SuppService.RESUME) {
- if (DBG) log("onSuppServiceFailed: displaying merge failure message");
+ if (DBG) log("onSuppServiceFailed: displaying resume failure message");
mergeFailedString = mApplication.getResources().getString(
- R.string.incall_error_supp_service_switch);
+ R.string.incall_error_supp_service_resume);
} else if (r.result == Phone.SuppService.HOLD) {
if (DBG) log("onSuppServiceFailed: displaying hold failure message");
mergeFailedString = mApplication.getResources().getString(