resolved conflicts for merge of 063fa2d9 to master-nova

Change-Id: Iaa921a78fb59185404d24b6a4245ae2cb691ea5f

1 files changed, 11 insertions, 7 deletions

diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index 203476cc0..0fd95292a 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -29,6 +29,7 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.telecomm.InCallAdapter;
+import android.telephony.DisconnectCause;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
@@ -451,7 +452,10 @@ public class InCallActivity extends Activity {
         return super.dispatchPopulateAccessibilityEvent(event);
     }
 
-    public void maybeShowErrorDialogOnDisconnect(Call.DisconnectCause cause) {
+    /**
+     * @param cause disconnect cause as defined in {@link DisconnectCause}
+     */
+    public void maybeShowErrorDialogOnDisconnect(int cause) {
         Log.d(this, "maybeShowErrorDialogOnDisconnect");
 
         if (!isFinishing()) {
@@ -497,18 +501,18 @@ public class InCallActivity extends Activity {
         mDialog.show();
     }
 
-    private int getResIdForDisconnectCause(Call.DisconnectCause cause) {
+    private int getResIdForDisconnectCause(int cause) {
         int resId = INVALID_RES_ID;
 
-        if (cause == Call.DisconnectCause.CALL_BARRED) {
+        if (cause == DisconnectCause.CALL_BARRED) {
             resId = R.string.callFailed_cb_enabled;
-        } else if (cause == Call.DisconnectCause.FDN_BLOCKED) {
+        } else if (cause == DisconnectCause.FDN_BLOCKED) {
             resId = R.string.callFailed_fdn_only;
-        } else if (cause == Call.DisconnectCause.CS_RESTRICTED) {
+        } else if (cause == DisconnectCause.CS_RESTRICTED) {
             resId = R.string.callFailed_dsac_restricted;
-        } else if (cause == Call.DisconnectCause.CS_RESTRICTED_EMERGENCY) {
+        } else if (cause == DisconnectCause.CS_RESTRICTED_EMERGENCY) {
             resId = R.string.callFailed_dsac_restricted_emergency;
-        } else if (cause == Call.DisconnectCause.CS_RESTRICTED_NORMAL) {
+        } else if (cause == DisconnectCause.CS_RESTRICTED_NORMAL) {
             resId = R.string.callFailed_dsac_restricted_normal;
         }