diff options
author | Colin Cross <ccross@android.com> | 2014-03-28 16:07:27 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2014-03-28 16:07:27 -0700 |
commit | f965ebbdfddf7070ab1807a49b203e76e58b7e4e (patch) | |
tree | 2264f009670ee2dfb3c232a6b66830a4b8734f6e /InCallUI/src/com/android/incallui/InCallActivity.java | |
parent | 73f561e7657a1afe3d4be888bb22c4af4f729e33 (diff) | |
parent | 917bb0e20a146a3ab4f7b0cebc4465d0806d0181 (diff) |
resolved conflicts for merge of 063fa2d9 to master-nova
Change-Id: Iaa921a78fb59185404d24b6a4245ae2cb691ea5f
Diffstat (limited to 'InCallUI/src/com/android/incallui/InCallActivity.java')
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 18 |
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; } |