summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-11-30 16:23:54 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-30 16:23:54 -0800
commitebf28fa3f086bd5d3fa8d988fe4b8a8faeddd710 (patch)
tree259a663c7a687d8e19dd32e4b051bb38450383e6 /telephony
parent1981674771f9517899c346d3095b4227e63bd2a2 (diff)
parent0e58a9529895e270dae90e69486a59e41de714b8 (diff)
downloadframeworks_base-ebf28fa3f086bd5d3fa8d988fe4b8a8faeddd710.zip
frameworks_base-ebf28fa3f086bd5d3fa8d988fe4b8a8faeddd710.tar.gz
frameworks_base-ebf28fa3f086bd5d3fa8d988fe4b8a8faeddd710.tar.bz2
am 0e58a952: am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread
* commit '0e58a9529895e270dae90e69486a59e41de714b8': Throw proper exceptions in SipManager
Diffstat (limited to 'telephony')
-rwxr-xr-xtelephony/java/com/android/internal/telephony/sip/SipPhone.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
index ef31ddd..1f1338c 100755
--- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
@@ -393,12 +393,11 @@ public class SipPhone extends SipPhoneBase {
new SipProfile.Builder(calleeSipUri).build();
SipConnection c = new SipConnection(this, callee,
originalNumber);
- connections.add(c);
c.dial();
+ connections.add(c);
setState(Call.State.DIALING);
return c;
} catch (ParseException e) {
- // TODO: notify someone
throw new SipException("dial", e);
}
}