diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-27 11:52:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 11:52:35 -0700 |
| commit | 45a83a896701f61f72082f7116b85d1537ebf4cb (patch) | |
| tree | ee3fc8ec828b89a354a2e97ae3e21c7c7e752e1a | |
| parent | 44669d31d1d5b094d7b7d3e393281440ea0c9536 (diff) | |
| parent | fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f (diff) | |
| download | frameworks_base-45a83a896701f61f72082f7116b85d1537ebf4cb.zip frameworks_base-45a83a896701f61f72082f7116b85d1537ebf4cb.tar.gz frameworks_base-45a83a896701f61f72082f7116b85d1537ebf4cb.tar.bz2 | |
am fccd5bc7: Fix build.
Merge commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f' into gingerbread-plus-aosp
* commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f':
Fix build.
| -rw-r--r-- | services/java/com/android/server/sip/SipSessionGroup.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/java/com/android/server/sip/SipSessionGroup.java b/services/java/com/android/server/sip/SipSessionGroup.java index 3282c7f..91677a2 100644 --- a/services/java/com/android/server/sip/SipSessionGroup.java +++ b/services/java/com/android/server/sip/SipSessionGroup.java @@ -663,6 +663,9 @@ class SipSessionGroup implements SipListener { } else if (current != null) { Log.d(TAG, "transaction terminated: " + toString(current)); return true; + } else { + // no transaction; shouldn't be here; ignored + return true; } } |