1027 Commits

Author SHA1 Message Date
Hung-ying Tyan
026284745b am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
Merge commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f'

* commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f':
  CallManager/SipPhone: fix reject a ringing call
2010-10-08 10:25:50 -07:00
Hung-ying Tyan
f209cd7062 am a785a59c: am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Merge commit 'a785a59c831256f274627f8f8eb77f9d54508916'

* commit 'a785a59c831256f274627f8f8eb77f9d54508916':
  SIP: add SERVER_UNREACHABLE error code.
2010-10-06 17:08:43 -07:00
Irfan Sheriff
ed5d7d17c9 Add LinkAddress
LinkAddress stores IP address + prefix for a network link

Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
2010-10-06 11:04:05 -07:00
Hung-ying Tyan
88b4bd5f3e am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
Merge commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc' into gingerbread-plus-aosp

* commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc':
  CallManager/SipPhone: fix reject a ringing call
2010-10-05 18:37:14 -07:00
Hung-ying Tyan
fc7e7766e7 Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread 2010-10-05 18:33:22 -07:00
Hung-ying Tyan
17956e626b CallManager/SipPhone: fix reject a ringing call
+ CallManager: fix getFirstActiveRingingCall(), getActiveFgCall(), getFirstActiveBgCall()
+ Set DisconnectCause to be INCOMING_REJECTED when a call is rejected

http://b/issue?id=3049671

Change-Id: Ica1d81ca4b71ab0ceb2ab437b82bbb4ccf86fe92
2010-10-06 09:31:44 +08:00
Mike Lockwood
2f65a99fdc Merge changes Ic5551c94,I0207f7f7 into gingerbread
* changes:
  GPS: Clean up GPS API extension initialization in JNI code.
  GPS: Add support for AGpsRilInterface.
2010-10-05 12:36:34 -07:00
Robert Greenwalt
b81b89f1bf am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread
Merge commit '45a8901dc3ae12ad818ac2afdd63fe712769cb3b' into gingerbread-plus-aosp

* commit '45a8901dc3ae12ad818ac2afdd63fe712769cb3b':
  Add supporting MCC=450(Korea)
2010-10-05 12:24:47 -07:00
Robert Greenwalt
45a8901dc3 Merge "Add supporting MCC=450(Korea)" into gingerbread 2010-10-05 11:46:12 -07:00
Miguel Torroja
1e84da822e GPS: Add support for AGpsRilInterface.
Adding changes to be able to have access to missing data to SUPL
(celld, imsi, WAP_PUSH and SMS)

Change-Id: I0207f7f7ea6595ed3fd7021cb732feddf52e4cf9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-05 13:15:37 -04:00
Hung-ying Tyan
a785a59c83 am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Merge commit '718e0033e69fa7d1db12242324ab9098ac430bf5' into gingerbread-plus-aosp

* commit '718e0033e69fa7d1db12242324ab9098ac430bf5':
  SIP: add SERVER_UNREACHABLE error code.
2010-10-04 23:07:43 -07:00
Hung-ying Tyan
c6548fd9ed SIP: add SERVER_UNREACHABLE error code.
Let SipSession return it when UnknownHostException is caught.
Add DisconnectCause.SERVER_UNREACHABLE in Connection and have SipPhone report
it when receiving SERVER_UNREACHABLE from SipSession.

http://b/issue?id=3061691

Change-Id: I944328ba3ee30c0a9386e89b5c4696d4d9bde000
2010-10-05 13:30:28 +08:00
Hung-ying Tyan
aeba1bc0c3 Revert "Revert "resolved conflicts for merge of 8788d140 to master""
This reverts commit bdf11be97bd732e8891ae19342c937da6e659afa.
Fix a missing import from manual merge.

Change-Id: If373626f07250cbfe07e5c04cf02ad9ee5a0ab2a
2010-10-03 01:18:34 +08:00
Jason Chen
bdf11be97b Revert "resolved conflicts for merge of 8788d140 to master"
This reverts commit 2874c3dec4f9ffd59b2be3de62c1148534396828, reversing
changes made to 7afbb30d636351334d101fd0caef391fa409230d.
2010-10-01 22:49:42 -07:00
Hung-ying Tyan
2874c3dec4 resolved conflicts for merge of 8788d140 to master
Change-Id: I7eaf2b7fe968e8d4cf6c5a2a4e66b8584c1dc78c
2010-10-02 12:42:23 +08:00
Jake Hamby
cc8c6496b7 resolved conflicts for merge of 3543a40b to master
Change-Id: I307c8f1277b84763e537ced0ac3410ec06fce431
2010-10-01 18:35:13 -07:00
Hung-ying Tyan
8788d14036 am 306137d9: SIP telephony cleanup.
Merge commit '306137d97f40a4f807c54a75210343c9262360d1' into gingerbread-plus-aosp

* commit '306137d97f40a4f807c54a75210343c9262360d1':
  SIP telephony cleanup.
2010-10-01 18:32:03 -07:00
Jake Hamby
3543a40b24 am 7888486d: Merge "Add subaddress to SMS fingerprint calculation."
Merge commit '7888486d1c930301535069bd90bb0bf3525b2bb5' into gingerbread-plus-aosp

* commit '7888486d1c930301535069bd90bb0bf3525b2bb5':
  Add subaddress to SMS fingerprint calculation.
2010-10-01 18:13:58 -07:00
Jake Hamby
7888486d1c Merge "Add subaddress to SMS fingerprint calculation." 2010-10-01 18:04:22 -07:00
Hung-ying Tyan
306137d97f SIP telephony cleanup.
+ Remove unused classes.
+ Remove unused imports.
+ Remove unused code.
+ add DEBUG flag.

Change-Id: Ie1236d909d971093b68b066d3d8c1857ac89f56f
2010-10-02 08:30:48 +08:00
Jake Hamby
3621be68a2 am edec27a1: am d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x."
Merge commit 'edec27a1e9ffc022e68f0d6200ba90499da4b9e9'

* commit 'edec27a1e9ffc022e68f0d6200ba90499da4b9e9':
  Do not explicity disconnect Data during power down for 1x.
2010-10-01 17:07:58 -07:00
Hung-ying Tyan
b6153a067c am 86a12d46: am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
Merge commit '86a12d465fca7d25d99a788abda33fde5154a739'

* commit '86a12d465fca7d25d99a788abda33fde5154a739':
  Add CallManager/Phone.setEchoSuppressionEnabled().
2010-10-01 17:07:48 -07:00
Jake Hamby
edec27a1e9 am d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x."
Merge commit 'd531c9ebe18f0b554d29d3c3b8e4a00f84dae97a' into gingerbread-plus-aosp

* commit 'd531c9ebe18f0b554d29d3c3b8e4a00f84dae97a':
  Do not explicity disconnect Data during power down for 1x.
2010-10-01 16:02:16 -07:00
Hung-ying Tyan
86a12d465f am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
Merge commit '10e2120bdd2d99e100db187d49ac6a8495c7f956' into gingerbread-plus-aosp

* commit '10e2120bdd2d99e100db187d49ac6a8495c7f956':
  Add CallManager/Phone.setEchoSuppressionEnabled().
2010-10-01 15:56:02 -07:00
Hung-ying Tyan
10e2120bdd Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread 2010-10-01 14:52:00 -07:00
Dianne Hackborn
dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master
Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
2010-09-30 20:34:34 -07:00
Sang-il, Lee
64cb04a9e6 Add supporting MCC=450(Korea)
Change-Id: I009f77b064b8bb7f5bd055ac6e7c55a8f608e9d7
2010-10-01 11:46:55 +09:00
Jake Hamby
980d40b568 resolved conflicts for merge of 738aadd7 to master
Change-Id: I8810cc6dbd532de002d6a623ad93e86afb48c0b4
2010-09-30 19:33:43 -07:00
Dianne Hackborn
6a3eddb469 am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread
Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp

* commit '0a69f597604254bc37721b135ab612eaacdd0cbd':
  Rub in a little 'ol log-b-gone.
2010-09-30 19:12:11 -07:00
Dianne Hackborn
0a69f59760 Merge "Rub in a little 'ol log-b-gone." into gingerbread 2010-09-30 19:03:38 -07:00
Dianne Hackborn
cef65eeb03 Rub in a little 'ol log-b-gone.
Mmmmmm...  great fresh scent!

Change-Id: I050e70b31b5d4a9c6731f15a4b51a3620a33a78d
2010-09-30 18:27:22 -07:00
Jake Hamby
738aadd70f resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp
Change-Id: Id8dc5038edc214b4433bdf690243f2f5fe5b4812
2010-09-30 16:29:13 -07:00
Jake Hamby
f51eadaf1f Typo fixes in comments and minor code cleanups.
* Fix some typos in Javadoc and log messages.
* Remove redundant initializer in BluetoothAdapter.readOutOfBandData()
* Use canonical "UTF-8" charset name instead of "UTF8" in
    BluetoothDevice.convertPinToBytes()

Change-Id: I58cd5dc48a7ad0053d204c5f590b4b3d438d8672
2010-09-30 15:43:34 -07:00
Hung-ying Tyan
db9e87b988 am 49c13e51: am 0e412304: Catch exceptions in SipPhone.canTake().
Merge commit '49c13e512c675b27099783ccf2d20c9ef46c99db'

* commit '49c13e512c675b27099783ccf2d20c9ef46c99db':
  Catch exceptions in SipPhone.canTake().
2010-09-30 12:01:56 -07:00
Hung-ying Tyan
bd407edc47 am 2c457326: am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnection.
Merge commit '2c4573263a97cc80f441824a75d6502ae04292a8'

* commit '2c4573263a97cc80f441824a75d6502ae04292a8':
  SipPhone: revise hangup() in SipCall and SipConnection.
2010-09-30 12:01:48 -07:00
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
Hung-ying Tyan
49c13e512c am 0e412304: Catch exceptions in SipPhone.canTake().
Merge commit '0e412304813ccd3a3fb6a643836e4f0922d1dc44' into gingerbread-plus-aosp

* commit '0e412304813ccd3a3fb6a643836e4f0922d1dc44':
  Catch exceptions in SipPhone.canTake().
2010-09-30 10:09:39 -07:00
Hung-ying Tyan
2c4573263a am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnection.
Merge commit '421c34c162098efe870574844a7ee49812bbb929' into gingerbread-plus-aosp

* commit '421c34c162098efe870574844a7ee49812bbb929':
  SipPhone: revise hangup() in SipCall and SipConnection.
2010-09-30 10:09:33 -07:00
Hung-ying Tyan
23f21600d0 Add CallManager/Phone.setEchoSuppressionEnabled().
Change-Id: I7bc6241e6fa815787799a53d6f3a076567edc361
2010-09-30 12:34:41 +08:00
Hung-ying Tyan
0e41230481 Catch exceptions in SipPhone.canTake().
Exceptions may throw during canTake() as the peer may cancel the call and
result in a race with this method call.

Change-Id: I61903d601d8f9b2dcb4c4fbe1586e2c1a1069109
http://b/issue?id=3033868
2010-09-30 08:30:36 +08:00
Hung-ying Tyan
421c34c162 SipPhone: revise hangup() in SipCall and SipConnection.
Make them DISCONNECTED immediately. Don't enter DISCONNECTING state and wait
until SipSession ends the session. SipSession will get timed out eventually
but PhoneApp/user don't need to know this detail and wait.

This should fix the bug:
http://b/issue?id=3027719

Change-Id: Ida5a1bd09d08b9d591721384b4978127619aab51
2010-09-30 08:26:59 +08: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