commit 23bebf29754e63bb26028c0992aa6d296a5abc79
author Jeff Davidson <jpd@google.com> Thu Jun 15 03:35:07 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 15 03:35:08 2017 +0000
tree 1cced80d5e8696dd131a9f10182e3146c1eb7f0c
parent fd7d3cf101e3ae18251caeb01f0cd16a159c867b
parent 4a2cf5be9c092fc3119c5eba644b9fe7dc7347e0

Merge "Update dispatcher for eUICC API error code cleanup." into oc-dr1-dev

src/com/android/phone/CallNotifier.java

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index b3d8ade..476ff06 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -528,14 +528,8 @@
     /**
      * Displays a notification when the phone receives a notice that a supplemental
      * service has failed.
-     * TODO: This is a NOOP if it isn't for conferences or resuming call failures right now.
      */
     private void onSuppServiceFailed(AsyncResult r) {
-        if (r.result != Phone.SuppService.CONFERENCE && r.result != Phone.SuppService.RESUME) {
-            if (DBG) log("onSuppServiceFailed: not a merge or resume failure event");
-            return;
-        }
-
         String mergeFailedString = "";
         if (r.result == Phone.SuppService.CONFERENCE) {
             if (DBG) log("onSuppServiceFailed: displaying merge failure message");
@@ -546,9 +540,30 @@
             mergeFailedString = mApplication.getResources().getString(
                     R.string.incall_error_supp_service_switch);
         } else if (r.result == Phone.SuppService.HOLD) {
+            if (DBG) log("onSuppServiceFailed: displaying hold failure message");
             mergeFailedString = mApplication.getResources().getString(
                     R.string.incall_error_supp_service_hold);
+        } else if (r.result == Phone.SuppService.TRANSFER) {
+            if (DBG) log("onSuppServiceFailed: displaying transfer failure message");
+            mergeFailedString = mApplication.getResources().getString(
+                    R.string.incall_error_supp_service_transfer);
+        } else if (r.result == Phone.SuppService.SEPARATE) {
+            if (DBG) log("onSuppServiceFailed: displaying separate failure message");
+            mergeFailedString = mApplication.getResources().getString(
+                    R.string.incall_error_supp_service_separate);
+        } else if (r.result == Phone.SuppService.SWITCH) {
+            if (DBG) log("onSuppServiceFailed: displaying switch failure message");
+            mApplication.getResources().getString(
+                    R.string.incall_error_supp_service_switch);
+        } else if (r.result == Phone.SuppService.REJECT) {
+            if (DBG) log("onSuppServiceFailed: displaying reject failure message");
+            mApplication.getResources().getString(
+                    R.string.incall_error_supp_service_reject);
+        } else {
+            if (DBG) log("onSuppServiceFailed: unknown failure");
+            return;
         }
+
         PhoneDisplayMessage.displayErrorMessage(mApplication, mergeFailedString);
 
         // start a timer that kills the dialog

src/com/android/phone/CdmaSubscriptionListPreference.java

diff --git a/src/com/android/phone/CdmaSubscriptionListPreference.java b/src/com/android/phone/CdmaSubscriptionListPreference.java
index 20adc12..49f4678 100644
--- a/src/com/android/phone/CdmaSubscriptionListPreference.java
+++ b/src/com/android/phone/CdmaSubscriptionListPreference.java
@@ -40,7 +40,7 @@
 
     //preferredSubscriptionMode  0 - RUIM/SIM, preferred
     //                           1 - NV
-    static final int preferredSubscriptionMode = CDMA_SUBSCRIPTION_NV;
+    static final int preferredSubscriptionMode = Phone.PREFERRED_CDMA_SUBSCRIPTION;
 
     private Phone mPhone;
     private CdmaSubscriptionButtonHandler mHandler;