diff options
| author | Brad Ebinger <breadley@google.com> | 2016-02-19 18:40:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-19 18:40:53 +0000 |
| commit | 6faad73dce6e9ee2b0aa0667c1521e914dd85034 (patch) | |
| tree | c94d99f785765a310a93d11ffcb2c215d45da6b1 /sip | |
| parent | 5beb98eeb1e0b57e24cc73a690644dd58c53d335 (diff) | |
| parent | 686e5dcea6af64d5f9694555300e2b7c5abc8126 (diff) | |
| download | android_packages_services_Telephony-6faad73dce6e9ee2b0aa0667c1521e914dd85034.tar.gz android_packages_services_Telephony-6faad73dce6e9ee2b0aa0667c1521e914dd85034.tar.bz2 android_packages_services_Telephony-6faad73dce6e9ee2b0aa0667c1521e914dd85034.zip | |
Fixes creation of incorrect SIP PhoneAccountHandle am: f1b726aca6 am: cb505644b8
am: 686e5dcea6
* commit '686e5dcea6af64d5f9694555300e2b7c5abc8126':
Fixes creation of incorrect SIP PhoneAccountHandle
Diffstat (limited to 'sip')
| -rw-r--r-- | sip/src/com/android/services/telephony/sip/SipAccountRegistry.java | 2 | ||||
| -rw-r--r-- | sip/src/com/android/services/telephony/sip/SipUtil.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sip/src/com/android/services/telephony/sip/SipAccountRegistry.java b/sip/src/com/android/services/telephony/sip/SipAccountRegistry.java index dd76c271f..025f27fac 100644 --- a/sip/src/com/android/services/telephony/sip/SipAccountRegistry.java +++ b/sip/src/com/android/services/telephony/sip/SipAccountRegistry.java @@ -67,7 +67,7 @@ public final class SipAccountRegistry { sipManager.open( mProfile, SipUtil.createIncomingCallPendingIntent(context, - mProfile.getUriString()), + mProfile.getProfileName()), null); } else { sipManager.open(mProfile); diff --git a/sip/src/com/android/services/telephony/sip/SipUtil.java b/sip/src/com/android/services/telephony/sip/SipUtil.java index e885fadd9..9ca508337 100644 --- a/sip/src/com/android/services/telephony/sip/SipUtil.java +++ b/sip/src/com/android/services/telephony/sip/SipUtil.java @@ -55,10 +55,10 @@ public class SipUtil { } static PendingIntent createIncomingCallPendingIntent( - Context context, String sipUri) { + Context context, String sipProfileName) { Intent intent = new Intent(context, SipBroadcastReceiver.class); intent.setAction(SipManager.ACTION_SIP_INCOMING_CALL); - intent.putExtra(EXTRA_PHONE_ACCOUNT, SipUtil.createAccountHandle(context, sipUri)); + intent.putExtra(EXTRA_PHONE_ACCOUNT, SipUtil.createAccountHandle(context, sipProfileName)); return PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT); } |