| a35827a8e92c79e200610e93549d7191fe701b19 |
|
22-Oct-2010 |
John Huang <jsh@google.com> |
am 33051ad1: am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread
Merge commit '33051ad1785a84ad5d814d6acf337b54d5fab36c'
* commit '33051ad1785a84ad5d814d6acf337b54d5fab36c':
Fix connect duration for un-established SIP calls.
|
| 5d9e3bbb9d076544b20032372a07ac26d7a86709 |
|
21-Oct-2010 |
Hung-ying Tyan <tyanh@google.com> |
Fix connect duration for un-established SIP calls.
Bug: 3118364
Change-Id: I931b675de04a3aac70b45d6bae27ab42a84f2d1e
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java
|
| 99f92ac7a4e5907553cf737817bef06e429534a3 |
|
14-Oct-2010 |
Hung-ying Tyan <tyanh@google.com> |
am f5b7c855: am f5201ab7: Keep original phone number in SipConnection.
Merge commit 'f5b7c855fbb69e8614dab5ca15639228a2428784'
* commit 'f5b7c855fbb69e8614dab5ca15639228a2428784':
Keep original phone number in SipConnection.
|
| f5201ab71ff4d104265ab126e86afc6b81da8011 |
|
12-Oct-2010 |
Hung-ying Tyan <tyanh@google.com> |
Keep original phone number in SipConnection.
In case it's a PSTN number carried by an Internet call, the phone app can still
get the original phone number from Connection.getAddress() instead of getting a
SIP URI.
http://b/issue?id=3085996
Change-Id: Ie6c66100a4b5b2ce3f73baa1b446761cd51d7727
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java
|
| aeba1bc0c333f145469fc17a10c0bbcebd6dc30b |
|
02-Oct-2010 |
Hung-ying Tyan <tyanh@google.com> |
Revert "Revert "resolved conflicts for merge of 8788d140 to master""
This reverts commit bdf11be97bd732e8891ae19342c937da6e659afa.
Fix a missing import from manual merge.
Change-Id: If373626f07250cbfe07e5c04cf02ad9ee5a0ab2a
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java
|
| bdf11be97bd732e8891ae19342c937da6e659afa |
|
02-Oct-2010 |
Jason Chen <jasonchen@google.com> |
Revert "resolved conflicts for merge of 8788d140 to master"
This reverts commit 2874c3dec4f9ffd59b2be3de62c1148534396828, reversing
changes made to 7afbb30d636351334d101fd0caef391fa409230d.
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java
|
| 2874c3dec4f9ffd59b2be3de62c1148534396828 |
|
01-Oct-2010 |
Hung-ying Tyan <tyanh@google.com> |
resolved conflicts for merge of 8788d140 to master
Change-Id: I7eaf2b7fe968e8d4cf6c5a2a4e66b8584c1dc78c
|
| 306137d97f40a4f807c54a75210343c9262360d1 |
|
01-Oct-2010 |
Hung-ying Tyan <tyanh@google.com> |
SIP telephony cleanup.
+ Remove unused classes.
+ Remove unused imports.
+ Remove unused code.
+ add DEBUG flag.
Change-Id: Ie1236d909d971093b68b066d3d8c1857ac89f56f
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java
|
| 63134b3aee2143c6df1ae9e2f8e4d516e26a0e2a |
|
24-Aug-2010 |
Hung-ying Tyan <tyanh@google.com> |
am 1537637c: am 3294d44b: Add confcall management to SIP calls
Merge commit '1537637cc443a48e9afb8091b6f2ce329318f2d7'
* commit '1537637cc443a48e9afb8091b6f2ce329318f2d7':
Add confcall management to SIP calls
|
| 3294d44b96f63f647fba3a03604eb028e28a42bc |
|
18-Aug-2010 |
Hung-ying Tyan <tyanh@google.com> |
Add confcall management to SIP calls
and fix the bug of re-assigning connectTime's in SipConnection,
and adding synchronization for SipPhone to be thread-safe,
and set normal audio mode when call not on hold instead of on hold in SipAudioCallImpl,
and fix re-entrance problem in CallManager.setAudioMode() for in-call mode.
Change-Id: I54f39dab052062de1ce141e5358d892d30453a3a
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java
|
| 88e590fb370d80d863417aae9330c8c2218f3175 |
|
06-Aug-2010 |
Chung-yih Wang <cywang@google.com> |
Fix the SipPhone codes related to the ITelephone interface change.
Change-Id: Id8ab7a6e4feaac67cd09e8412af61b40c6e774b4
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java
|
| ccd0b6953f5f77d1da5f540a3ba5ea71116e14f0 |
|
05-Aug-2010 |
Chung-yih Wang <cywang@google.com> |
Revert "Revert "Move SIP telephony related codes to framework.""
This reverts commit cde66df44240cfe5a7bec12ac52464c3bf26c14f.
Change-Id: I87da883b45350ec8f7da71e9bd392b075ea30ca7
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java
|
| cde66df44240cfe5a7bec12ac52464c3bf26c14f |
|
05-Aug-2010 |
Chung-yih Wang <cywang@google.com> |
Revert "Move SIP telephony related codes to framework."
This reverts commit b631dcf3eb449ddec756bea330f4e70b996ffb9e.
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java
|
| b631dcf3eb449ddec756bea330f4e70b996ffb9e |
|
05-Aug-2010 |
Chung-yih Wang <cywang@google.com> |
Move SIP telephony related codes to framework.
+ hardcode the sip service for build dependency.
Change-Id: Ib0e9717c9b87eb6e06ffa3a7b01ae31184de61bb
/frameworks/base/telephony/java/com/android/internal/telephony/sip/SipConnectionBase.java
|