diff options
author | Brad Ebinger <breadley@google.com> | 2016-04-07 21:55:28 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-04-07 21:55:28 +0000 |
commit | 7c81a8a153c24af57594378ea4fddfa23e796d94 (patch) | |
tree | 1e03da790148842967b038ac2947994a3557e3de /sip | |
parent | bbba3ca6496421e570bb2a9d6df23f415c245f7e (diff) | |
parent | 568b6172906cd91f865a45b4bee4d36085d70187 (diff) | |
download | android_packages_services_Telephony-7c81a8a153c24af57594378ea4fddfa23e796d94.tar.gz android_packages_services_Telephony-7c81a8a153c24af57594378ea4fddfa23e796d94.tar.bz2 android_packages_services_Telephony-7c81a8a153c24af57594378ea4fddfa23e796d94.zip |
DO NOT MERGE Use E PhoneAccount for MT ECM Call am: a1a6eb9
am: 568b617
* commit '568b6172906cd91f865a45b4bee4d36085d70187':
DO NOT MERGE Use E PhoneAccount for MT ECM Call
Change-Id: I186cc3e4bac6e6849e32fdbb3ec8790f8444598a
Diffstat (limited to 'sip')
-rw-r--r-- | sip/src/com/android/services/telephony/sip/SipBroadcastReceiver.java | 9 |
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..."); + } } } |