summaryrefslogtreecommitdiffstats
path: root/sip
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2016-04-07 21:59:07 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-07 21:59:07 +0000
commitae4c05f1280a8672bb837f81cc0a7d9c7ac15d0d (patch)
treedd559d50703d88f0fd43356c099ae7f25e20655a /sip
parent7a65cb20f336a281a39a751fc1b063939ab5509d (diff)
parent7c81a8a153c24af57594378ea4fddfa23e796d94 (diff)
downloadandroid_packages_services_Telephony-ae4c05f1280a8672bb837f81cc0a7d9c7ac15d0d.tar.gz
android_packages_services_Telephony-ae4c05f1280a8672bb837f81cc0a7d9c7ac15d0d.tar.bz2
android_packages_services_Telephony-ae4c05f1280a8672bb837f81cc0a7d9c7ac15d0d.zip
DO NOT MERGE Use E PhoneAccount for MT ECM Call am: a1a6eb9 am: 568b617
am: 7c81a8a * commit '7c81a8a153c24af57594378ea4fddfa23e796d94': DO NOT MERGE Use E PhoneAccount for MT ECM Call Change-Id: Ib9e7107facf1fe626ac439e1c5cd5868915c8a84
Diffstat (limited to 'sip')
-rw-r--r--sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java b/sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java
index 545854d16..d1bd4e215 100644
--- a/sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java
+++ b/sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java
@@ -21,6 +21,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.sip.SipManager;
import android.os.Bundle;
+import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.util.Log;
@@ -68,7 +69,13 @@ public class SipBroadcastReceiver extends BroadcastReceiver {
if (accountHandle != null) {
Bundle extras = new Bundle();
extras.putParcelable(SipUtil.EXTRA_INCOMING_CALL_INTENT, intent);
- TelecomManager.from(context).addNewIncomingCall(accountHandle, extras);
+ TelecomManager tm = TelecomManager.from(context);
+ PhoneAccount phoneAccount = tm.getPhoneAccount(accountHandle);
+ if (phoneAccount != null && phoneAccount.isEnabled()) {
+ tm.addNewIncomingCall(accountHandle, extras);
+ } else {
+ log("takeCall, PhoneAccount is disabled. Not accepting incoming call...");
+ }
}
}