Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread

Browse Source
This commit is contained in:
Hung-ying Tyan
2010-09-15 13:02:46 -07:00
committed by Android (Google) Code Review
parent 698ddb0cd6 94e498332a
commit 968735e580
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/sip/SipPhone.java
View File

@@ -754,7 +754,7 @@ public class SipPhone extends SipPhoneBase {
Log.v(LOG_TAG, "hangup conn: " + mPeer.getUriString() + ": " Log.v(LOG_TAG, "hangup conn: " + mPeer.getUriString() + ": "
+ ": on phone " + getPhone().getPhoneName()); + ": on phone " + getPhone().getPhoneName());
try { try {
mSipAudioCall.endCall(); if (mSipAudioCall != null) mSipAudioCall.endCall();
setState(Call.State.DISCONNECTING); setState(Call.State.DISCONNECTING);
setDisconnectCause(DisconnectCause.LOCAL); setDisconnectCause(DisconnectCause.LOCAL);
} catch (SipException e) { } catch (SipException e) {