Commit Graph

951 Commits

Author SHA1 Message Date
David Brown
648e1aeb8a am 5cf44f69: am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
Merge commit '5cf44f6907cde1126dd982af2d4dfd5c35da9eb9'

* commit '5cf44f6907cde1126dd982af2d4dfd5c35da9eb9':
  Implement contacts lookup (caller-id) for incoming SIP calls.
2010-09-30 11:25:54 -07:00
David Brown
5cf44f6907 am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread
Merge commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b' into gingerbread-plus-aosp

* commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b':
  Implement contacts lookup (caller-id) for incoming SIP calls.
2010-09-29 14:10:37 -07:00
David Brown
158d390f53 Implement contacts lookup (caller-id) for incoming SIP calls.
CallerInfoAsyncQuery can now handle SIP addresses in addition to regular
phone numbers: if the number passed in to startQuery() is actually a "URI
number", we now treat it as a SIP address and look it up directly in the
Data table.

If it's a regular phone number, the behavior is unchanged: we use the
PhoneLookup table as before.

This piece of the fix covers only the contact lookup for incoming calls;
we still need some more cleanup of the CallerInfo class in order to get
the call log working.

Bug: 3004127

Change-Id: I0fcb80f9de5b8ecf99d31ee92e0889ddb07216fd
2010-09-28 17:47:36 -07:00
Hung-ying Tyan
6c6eacda80 am f7e13400: am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR
Merge commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236'

* commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236':
  SIP: add DisconnectCause.SERVER_ERROR
2010-09-28 12:47:49 -07:00
Chung-yih Wang
3c094de4a9 am 4a64afd2: am 24547592: Fix the startAudio order for 3-way calls.
Merge commit '4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989'

* commit '4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989':
  Fix the startAudio order for 3-way calls.
2010-09-28 12:47:37 -07:00
Hung-ying Tyan
c508e8468f Fix build.
Change-Id: I0c158e65eb47de64eb954a0e11c9843988cb8043
2010-09-29 02:38:12 +08:00
Hung-ying Tyan
e18f15e6fe am 1738252a: am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread
Merge commit '1738252a596c71851cabf5835acb3584ad6b3191'

* commit '1738252a596c71851cabf5835acb3584ad6b3191':
  Don't enter DISCONNECTING state when the call/connection is not alive
2010-09-28 10:56:34 -07:00
Hung-ying Tyan
f7e13400b2 am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR
Merge commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c' into gingerbread-plus-aosp

* commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c':
  SIP: add DisconnectCause.SERVER_ERROR
2010-09-27 23:58:08 -07:00
Hung-ying Tyan
624d5b4e8c SIP: add DisconnectCause.SERVER_ERROR
and fix how SipErrorCode.SERVER_ERROR is determinted from server response, not
from local exceptions.

http://b/issue?id=3041332

Change-Id: Idce67e29858d5c7573b98b7fa1fac074913d71d6
2010-09-28 14:54:13 +08:00
Chung-yih Wang
4a64afd288 am 24547592: Fix the startAudio order for 3-way calls.
Merge commit '245475925eff61ee76bde58de69253a889e39d0a' into gingerbread-plus-aosp

* commit '245475925eff61ee76bde58de69253a889e39d0a':
  Fix the startAudio order for 3-way calls.
2010-09-27 22:58:59 -07:00
Chung-yih Wang
245475925e Fix the startAudio order for 3-way calls.
Change-Id: Ib387b4b1f641f9bf52dd6007d23aee08f0925811
2010-09-28 12:46:04 +08:00
Hung-ying Tyan
159cceaae2 am 368d796e: Fix build.
Merge commit '368d796e2e28ecd738362c7a4566cb3eb219ab26' into gingerbread-plus-aosp

* commit '368d796e2e28ecd738362c7a4566cb3eb219ab26':
  Fix build.
2010-09-27 21:09:56 -07:00
Hung-ying Tyan
368d796e2e Fix build.
Change-Id: I30f2615bc080db2c672e0391fd8bc735de17fcbf
2010-09-28 12:05:40 +08:00
Hung-ying Tyan
1738252a59 am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread
Merge commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp

* commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4':
  Don't enter DISCONNECTING state when the call/connection is not alive
2010-09-27 19:26:11 -07:00
Hung-ying Tyan
2b4f5cfd9b Don't enter DISCONNECTING state when the call/connection is not alive
http://b/issue?id=3027719

Change-Id: I1b52418a3695e96b48538fbf14497e34d2cfdda9
2010-09-28 09:01:26 +08:00
Hung-ying Tyan
6cf8f64be3 am c5027642: am 025a39af: SIP: misc fixes
Merge commit 'c5027642ff3909911d27e4abaa5e3abf1615b38d'

* commit 'c5027642ff3909911d27e4abaa5e3abf1615b38d':
  SIP: misc fixes
2010-09-27 11:47:37 -07:00
Hung-ying Tyan
031d878682 am fe2d279c: am 00a22064: SipService: handle cross-domain authentication error
Merge commit 'fe2d279c5ef571340f20d433badd9f68072299af'

* commit 'fe2d279c5ef571340f20d433badd9f68072299af':
  SipService: handle cross-domain authentication error
2010-09-27 11:47:32 -07:00
Hung-ying Tyan
c5027642ff am 025a39af: SIP: misc fixes
Merge commit '025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp

* commit '025a39af346f39743c1e384b9000ce1baee36562':
  SIP: misc fixes
2010-09-27 11:20:30 -07:00
Hung-ying Tyan
fe2d279c5e am 00a22064: SipService: handle cross-domain authentication error
Merge commit '00a22064efef4f574e439079aae2deae1a087a31' into gingerbread-plus-aosp

* commit '00a22064efef4f574e439079aae2deae1a087a31':
  SipService: handle cross-domain authentication error
2010-09-27 11:20:24 -07:00
Hung-ying Tyan
025a39af34 SIP: misc fixes
+ check REQUEST_TERMINATED response on INVITE not CANCEL,
+ check if a TransactionTerminatedEvent matches the ongoing transaction,
+ add log to track SipConnection disconnect events.

Change-Id: I28325be62ac44e4a7507d3c4b5b78b066c0ea2ad
2010-09-28 01:52:42 +08:00
Hung-ying Tyan
00a22064ef SipService: handle cross-domain authentication error
and add new CROSS_DOMAIN_AUTHENTICATION error code and OUT_OF_NETWORK
DisconnectCause.

http://b/issue?id=3020185

Change-Id: Icc0a341599d5a72b7cb2d43675fbddc516544978
2010-09-27 10:45:24 -07:00
Chung-yih Wang
5e18ad0c53 am 4a04a312: am bd229420: Fix the unhold issue especially if one is behind NAT.
Merge commit '4a04a3129bd30a996dd302b982aeca8f228f57e8'

* commit '4a04a3129bd30a996dd302b982aeca8f228f57e8':
  Fix the unhold issue especially if one is behind NAT.
2010-09-27 09:07:43 -07:00
Chung-yih Wang
4a04a3129b am bd229420: Fix the unhold issue especially if one is behind NAT.
Merge commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627' into gingerbread-plus-aosp

* commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627':
  Fix the unhold issue especially if one is behind NAT.
2010-09-27 09:03:01 -07:00
Chung-yih Wang
bd2294204e Fix the unhold issue especially if one is behind NAT.
+call startAudio() when call is established.

Change-Id: Ib6a1e34017fb83007ce275da1991058e8b803833
2010-09-27 23:53:39 +08:00
John Wang
33b5830ece am becc9148: am 8f5a1211: Merge "Add debug functions." into gingerbread
Merge commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62'

* commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62':
  Add debug functions.
2010-09-26 14:16:29 -07:00
John Wang
becc9148e3 am 8f5a1211: Merge "Add debug functions." into gingerbread
Merge commit '8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e' into gingerbread-plus-aosp

* commit '8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e':
  Add debug functions.
2010-09-26 13:58:02 -07:00
John Wang
8f5a1211dc Merge "Add debug functions." into gingerbread 2010-09-26 13:53:33 -07:00
John Wang
55bc084bf4 Add debug functions.
Enable more debug in CallManager.

Change-Id: Iaf66e31dc67f7ca9123fe5d8b351a21b1ec8b987
2010-09-26 13:39:55 -07:00
Hung-ying Tyan
3011b66172 am d6d83279: am 194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit 'd6d83279183db749de07bfdac79fe4180fc848d0'

* commit 'd6d83279183db749de07bfdac79fe4180fc848d0':
  SIP: longer timeout for making call, shorter for cancelling
2010-09-24 15:58:09 -07:00
Hung-ying Tyan
d6d8327918 am 194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit '194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp

* commit '194bbcce9ba15634500f542b9ea017b2cf154b45':
  SIP: longer timeout for making call, shorter for cancelling
2010-09-24 15:19:05 -07:00
Hung-ying Tyan
194bbcce9b SIP: longer timeout for making call, shorter for cancelling
http://b/3021865

Change-Id: I354ebcc00f1ac68e4b7b466745c36aeb314f9138
2010-09-25 06:09:00 +08:00
Hung-ying Tyan
22a62d1342 resolved conflicts for merge of ee813bae to master
Change-Id: I84ca961fb18b29313b5ec6041a79ca87a1a1cd68
2010-09-24 13:45:43 +08:00
Hung-ying Tyan
ee813baee4 am 84a357bb: Refactoring SIP classes to get ready for API review.
Merge commit '84a357bb6a8005e1c5e924e96a8ecf310e77c47c' into gingerbread-plus-aosp

* commit '84a357bb6a8005e1c5e924e96a8ecf310e77c47c':
  Refactoring SIP classes to get ready for API review.
2010-09-23 19:10:49 -07:00
Hung-ying Tyan
84a357bb6a Refactoring SIP classes to get ready for API review.
+ replace SipAudioCall and its Listener interfaces with real implementations,
  + remove SipAudioCallImpl.java, most of it is has become part of SipAudioCall,
+ add SipSession and its Listener classes to wrap ISipSession and ISipSessionListener,
+ move SipSessionState to SipSession.State,
+ make SipManager keep context and remove the context argument from many methods of its,
+ rename SipManager.getInstance() to newInstance(),
+ rename constant names for action strings and extra keys to follow conventions,
+ set thread names for debugging purpose.

Change-Id: Ie1790dc0e8f49c06c7fc80d33fec0f673a9c3044
2010-09-24 10:06:59 +08:00
Amith Yamasani
ad450be78b Add an AUTO_TIME_ZONE setting so that we can switch timezones while keeping correct time.
Have the NITZ provider honor the new setting before updating the time zone.
2010-09-22 10:15:35 -07:00
Chung-yih Wang
cef2590bda am 83af4fbb: am 4c571a62: Fix the build.
Merge commit '83af4fbb0e5c28506a77fc508056c5022b9a71eb'

* commit '83af4fbb0e5c28506a77fc508056c5022b9a71eb':
  Fix the build.
2010-09-21 10:43:47 -07:00
Chung-yih Wang
6b15ecf278 am 232bc085: am 708e4251: Merge "Revert the ANSWERING state." into gingerbread
Merge commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7'

* commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7':
  Revert the ANSWERING state.
2010-09-21 10:43:24 -07:00
Chung-yih Wang
83af4fbb0e am 4c571a62: Fix the build.
Merge commit '4c571a62b1a4fb71585179bce84246b55097b47e' into gingerbread-plus-aosp

* commit '4c571a62b1a4fb71585179bce84246b55097b47e':
  Fix the build.
2010-09-20 22:48:09 -07:00
Chung-yih Wang
4c571a62b1 Fix the build.
Change-Id: I6e3f683be22ab834ca1b83a1dbb0b3acd62645d2
2010-09-21 13:38:17 +08:00
Chung-yih Wang
232bc085fc am 708e4251: Merge "Revert the ANSWERING state." into gingerbread
Merge commit '708e42512a8b14202cd872d96d1f071ccb4cf915' into gingerbread-plus-aosp

* commit '708e42512a8b14202cd872d96d1f071ccb4cf915':
  Revert the ANSWERING state.
2010-09-20 22:06:49 -07:00
Chung-yih Wang
9779b714f4 Revert the ANSWERING state.
+fix the unknown call flash for answering an incoming call and
updating the screen if the background call got dropped.
+change the getFirstActiveBgCall to return the call if the state
is not IDLE. This will help to fix unknown flash if the background
call got dropped.

Change-Id: I9803ccebd919acbd5296e7dfde7dc5f29cc9f180
2010-09-21 11:51:51 +08:00
John Wang
31fde0de8b am 48ab3991: am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread
Merge commit '48ab3991647040d540d295a40247367f6707f4c2'

* commit '48ab3991647040d540d295a40247367f6707f4c2':
  Use PhoneBase in the phone list.
2010-09-20 19:32:11 -07:00
John Wang
48ab399164 am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread
Merge commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6' into gingerbread-plus-aosp

* commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6':
  Use PhoneBase in the phone list.
2010-09-20 15:38:40 -07:00
John Wang
ee2ef3220f Merge "Use PhoneBase in the phone list." into gingerbread 2010-09-20 15:35:02 -07:00
Dmitri Plotnikov
6cb73f2a72 Merge "Format the phone number with the number country's convention." 2010-09-20 10:43:34 -07:00
Bai Tao
6a3d188f18 Format the phone number with the number country's convention.
If the phone number doesn't have country code, the current country's convention will be used.

Change-Id: I3f6ea0104d1a67071bd3beadb667c7159e915eef
2010-09-20 18:18:41 +08:00
Hung-ying Tyan
5491c7a076 am 852e5354: am 8544560c: SipPhone: fix missing-call DisconnectCause feedback
Merge commit '852e5354f60a0131692c46f509c2e9901b0b6810'

* commit '852e5354f60a0131692c46f509c2e9901b0b6810':
  SipPhone: fix missing-call DisconnectCause feedback
2010-09-20 00:58:08 -07:00
Hung-ying Tyan
852e5354f6 am 8544560c: SipPhone: fix missing-call DisconnectCause feedback
Merge commit '8544560ccc43de7ff49d91866f461f5572f0b147' into gingerbread-plus-aosp

* commit '8544560ccc43de7ff49d91866f461f5572f0b147':
  SipPhone: fix missing-call DisconnectCause feedback
2010-09-20 00:51:07 -07:00
Hung-ying Tyan
8544560ccc SipPhone: fix missing-call DisconnectCause feedback
also fix delivering bad news before closing a SipAudioCallImpl object so that
apps can get the current audio-call object state before it's closed:

http://b/issue?id=3009262

Change-Id: I94c19dae8b4f252de869e614ec462b19b4ff2077
2010-09-20 13:06:30 +08:00
Hung-ying Tyan
2417132611 am 37d1b249: am 97963794: SIP: convert enum to static final int.
Merge commit '37d1b2496ed4e636062d8bb451e723b975c80920'

* commit '37d1b2496ed4e636062d8bb451e723b975c80920':
  SIP: convert enum to static final int.
2010-09-19 18:59:43 -07:00