commit 41c35563e16fc397fd34a64ba80c2728595dd92b
author Anthony Lee <anthonylee@google.com> Thu Sep 11 14:16:33 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 11 14:16:33 2014 +0000
tree 1483b88d39c40bfac52f6454f711bd106e85b1b3
parent 96761561884e4bbf49223c09d124fd45b174fd6d
parent 3d2c1845accf570e290eb1127ecbed1a3b5ba442

am 3d2c1845: am dbaa001a: am 0fc868ba: Merge "Make sure that we request a ringback on SIP connections." into lmp-dev

* commit '3d2c1845accf570e290eb1127ecbed1a3b5ba442':
  Make sure that we request a ringback on SIP connections.

sip/src/com/android/services/telephony/sip/SipConnection.java

diff --git a/sip/src/com/android/services/telephony/sip/SipConnection.java b/sip/src/com/android/services/telephony/sip/SipConnection.java
index 583fa0e..08ca2f0 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnection.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnection.java
@@ -230,6 +230,8 @@
                 case DIALING:
                 case ALERTING:
                     setDialing();
+                    // For SIP calls, we need to ask the framework to play the ringback for us.
+                    setRequestingRingback(true);
                     break;
                 case INCOMING:
                 case WAITING: