commit 93f9ff5d731f7744d5a5b7e72639fb08e0159252
author Tyler Gunn <tgunn@google.com> Wed Apr 11 13:53:04 2018 -0700
committer Tyler Gunn <tgunn@google.com> Wed Apr 11 13:53:04 2018 -0700
tree 9b4c22d52c62fb29450f387fbc1126b9c92f7414
parent 668300083eafb4d9f37fe6ef2837fe44416ad472

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

src/com/android/phone/CallNotifier.java

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(