resolved conflicts for merge of 5feee861 to klp-modular-dev-plus-aosp

Change-Id: I5e8217fbe5336ebfa91eddf11e7f46465be8f751

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 c34d85470..d41cc99ae 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -28,6 +28,7 @@ import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.telephony.DisconnectCause;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
@@ -439,7 +440,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()) {
@@ -485,18 +489,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;
         }