Merge "Cleanup and fix CAF SSN handling code." into cm-11.0

1 files changed, 5 insertions, 14 deletions

diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java
index c81ef8a3..9e14cee5 100644
--- a/src/com/android/incallui/InCallActivity.java
+++ b/src/com/android/incallui/InCallActivity.java
@@ -755,8 +755,7 @@ public class InCallActivity extends Activity {
         Log.d(this, "maybeShowErrorDialogOnDisconnect: Call=" + call);
 
         if (!isFinishing() && call != null) {
-            final int resId = getResIdForDisconnectCause(call.getDisconnectCause(),
-                    call.getSuppServNotification());
+            final int resId = getResIdForDisconnectCause(call);
             if (resId != INVALID_RES_ID) {
                 showErrorDialog(resId);
             }
@@ -859,26 +858,18 @@ public class InCallActivity extends Activity {
         mDialog.show();
     }
 
-    private int getResIdForDisconnectCause(Call.DisconnectCause cause,
-            Call.SsNotification notification) {
+    private int getResIdForDisconnectCause(Call call) {
+        Call.DisconnectCause cause = call.getDisconnectCause();
         int resId = INVALID_RES_ID;
 
         if (cause == Call.DisconnectCause.INCOMING_MISSED) {
-            // If the network sends SVC Notification then this dialog will be displayed
-            // in case of B when the incoming call at B is not answered and gets forwarded
-            // to C
-            if (notification != null && notification.notificationType == 1 &&
-                    notification.code ==
-                    Call.SsNotification.MT_CODE_ADDITIONAL_CALL_FORWARDED) {
+            if (call.wasAdditionalCallForwarded()) {
                 resId = R.string.callUnanswered_forwarded;
             }
         } else if (cause == Call.DisconnectCause.CALL_BARRED) {
             // When call is disconnected with this code then it can either be barring from
             // MO side or MT side.
-            // In MT case, if network sends SVC Notification then this dialog will be
-            // displayed when A is calling B & incoming is barred on B.
-            if (notification != null && notification.notificationType == 0 &&
-                    notification.code == Call.SsNotification.MO_CODE_INCOMING_CALLS_BARRED) {
+            if (call.isRemoteIncomingCallBarringEnabled()) {
                 resId = R.string.callFailed_incoming_cb_enabled;
             } else {
                 resId = R.string.callFailed_cb_enabled;