diff options
author | Hung-ying Tyan <tyanh@google.com> | 2010-10-03 20:35:02 +0800 |
---|---|---|
committer | Hung-ying Tyan <tyanh@google.com> | 2010-10-04 08:07:42 +0800 |
commit | 9ea96c6cade1f25d4d77dcbd24854df431548b36 (patch) | |
tree | 56652bb681e2ff930fedffcabe4bd2f748e831a7 /voip/java/android/net/sip | |
parent | 624380a14def6c2acdb473e09c36139acbcefbf9 (diff) | |
download | frameworks_base-9ea96c6cade1f25d4d77dcbd24854df431548b36.zip frameworks_base-9ea96c6cade1f25d4d77dcbd24854df431548b36.tar.gz frameworks_base-9ea96c6cade1f25d4d77dcbd24854df431548b36.tar.bz2 |
SIP: minor fixes.
+ Log error instead of crashing app process in SipManager's ListenerRelay.
+ Terminate dialog and transaction in SipSessionGroup.reset().
+ Remove redundant reset() in SipSessionGroup.
Change-Id: Ifbf29d2c9607ffe1a1a50b0c131ee3a4e81a0d0e
Diffstat (limited to 'voip/java/android/net/sip')
-rw-r--r-- | voip/java/android/net/sip/SipManager.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java index a589fe9..bd859e8 100644 --- a/voip/java/android/net/sip/SipManager.java +++ b/voip/java/android/net/sip/SipManager.java @@ -23,6 +23,7 @@ import android.os.IBinder; import android.os.Looper; import android.os.RemoteException; import android.os.ServiceManager; +import android.util.Log; import java.text.ParseException; @@ -83,6 +84,8 @@ public class SipManager { /** Part of the incoming call intent. */ public static final String EXTRA_OFFER_SD = "android:sipOfferSD"; + private static final String TAG = "SipManager"; + private ISipService mSipService; private Context mContext; @@ -525,8 +528,10 @@ public class SipManager { return ((session == null) ? mUri : session.getLocalProfile().getUriString()); - } catch (RemoteException e) { - throw new RuntimeException(e); + } catch (Throwable e) { + // SipService died? SIP stack died? + Log.w(TAG, "getUri(): " + e); + return null; } } |