summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Collapse)AuthorAgeFilesLines
* am ecae8a43: am 1a58d9c3: Merge "Partial fix for issue 3124895." into ↵Eric Laurent2010-10-261-1/+1
|\ | | | | | | gingerbread
| * am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbreadEric Laurent2010-10-261-1/+1
| |\
| | * Partial fix for issue 3124895.Eric Laurent2010-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | When a SIP call is put on hold and no other call is active, the audio mode should not be switched to incall. Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
* | | am 33051ad1: am 7dc08fb0: Merge "Fix connect duration for un-established SIP ↵John Huang2010-10-211-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | calls." into gingerbread Merge commit '33051ad1785a84ad5d814d6acf337b54d5fab36c' * commit '33051ad1785a84ad5d814d6acf337b54d5fab36c': Fix connect duration for un-established SIP calls.
| * | am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into ↵John Huang2010-10-211-3/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '7dc08fb070ff7455e794fc81645ccb4349cd152f' into gingerbread-plus-aosp * commit '7dc08fb070ff7455e794fc81645ccb4349cd152f': Fix connect duration for un-established SIP calls.
| | * Fix connect duration for un-established SIP calls.Hung-ying Tyan2010-10-211-3/+3
| | | | | | | | | | | | | | | Bug: 3118364 Change-Id: I931b675de04a3aac70b45d6bae27ab42a84f2d1e
* | | am 940b4d1c: am 6037a056: Fix n-way conf call in SipPhone.Hung-ying Tyan2010-10-211-3/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8' * commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8': Fix n-way conf call in SipPhone.
| * | am 6037a056: Fix n-way conf call in SipPhone.Hung-ying Tyan2010-10-201-3/+20
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp * commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7': Fix n-way conf call in SipPhone.
| | * Fix n-way conf call in SipPhone.Hung-ying Tyan2010-10-211-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | + Avoid concurrent modification when forming >3-way conf call. + Revise SipConnection.separate() to put the newly separated call to foreground. Bug: 3114987 Change-Id: If6204e7e3cc05f4a516c33657a368b53a0ad014d
* | | am e55806a5: am 23392a84: Fix the build.Jeff Hamilton2010-10-211-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'e55806a55561c992086ddff717aca27206fa0c5d' * commit 'e55806a55561c992086ddff717aca27206fa0c5d': Fix the build.
| * | am 23392a84: Fix the build.Jeff Hamilton2010-10-201-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp * commit '23392a84bcb961d3fd50142ec40ce6ac6db89018': Fix the build.
| | * Fix the build.Jeff Hamilton2010-10-201-1/+1
| | | | | | | | | | | | Change-Id: Id5bfa0f91e6ec687201a320a1eb4d8a46050875e
* | | am d691b36c: am 6fe795ec: Do another contact lookup if the first one fails ↵Hung-ying Tyan2010-10-212-0/+34
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | and... Merge commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e' * commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e': Do another contact lookup if the first one fails and...
| * | am 6fe795ec: Do another contact lookup if the first one fails and...Hung-ying Tyan2010-10-202-0/+34
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '6fe795ecd35c4d49822d349424fc71b660577dfc' into gingerbread-plus-aosp * commit '6fe795ecd35c4d49822d349424fc71b660577dfc': Do another contact lookup if the first one fails and...
| | * Do another contact lookup if the first one fails and...Hung-ying Tyan2010-10-212-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | it's a SIP call and the peer's username is all numeric. The all-numeric username could be a PSTN number. Bug: 3105116 (case #2) Change-Id: I1de9cfac3aab1c4c89935176264d07693adb5e7d
* | | am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another ↵Hung-ying Tyan2010-10-211-2/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | call is dialing/ringing." into gingerbread Merge commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d' * commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d': Silently reject a ringing call when another call is dialing/ringing.
| * | am baced375: Merge "Silently reject a ringing call when another call is ↵Hung-ying Tyan2010-10-201-2/+20
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | dialing/ringing." into gingerbread Merge commit 'baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp * commit 'baced375ba5f374445c44a2115700d69693794a0': Silently reject a ringing call when another call is dialing/ringing.
| | * Silently reject a ringing call when another call is dialing/ringing.Hung-ying Tyan2010-10-211-2/+20
| | | | | | | | | | | | | | | | | | | | | http://b/issue?id=3109483 http://b/issue?id=3103072 Change-Id: I34f13225319c7f2a41e1ea9e25811866432ab809
* | | am 51028569: am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." ↵Hung-ying Tyan2010-10-211-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '5102856947595cffc1cceb11b9e4c5baf70b2e82' * commit '5102856947595cffc1cceb11b9e4c5baf70b2e82': Remove ringtone API from SipAudioCall.
| * | am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbreadHung-ying Tyan2010-10-201-1/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp * commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184': Remove ringtone API from SipAudioCall.
| | * Remove ringtone API from SipAudioCall.Hung-ying Tyan2010-10-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | (watch out auto-merge conflict for SipAudioCall). Bug: 3113033, related CL: https://android-git/g/#change,75185 Change-Id: Ib48d3b990e229e0b341e47e10e76934e1a50d10f
* | | am e894ff7a: am b595e094: Merge "Return display name in ↵Hung-ying Tyan2010-10-211-0/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | SipConnection.getCnapName()." into gingerbread Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38' * commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38': Return display name in SipConnection.getCnapName().
| * | am b595e094: Merge "Return display name in SipConnection.getCnapName()." ↵Hung-ying Tyan2010-10-191-0/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp * commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd': Return display name in SipConnection.getCnapName().
| | * Merge "Return display name in SipConnection.getCnapName()." into gingerbreadHung-ying Tyan2010-10-191-0/+13
| | |\
| | | * Return display name in SipConnection.getCnapName().Hung-ying Tyan2010-10-201-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 3105116 (case #1) Change-Id: Iedf3c8de07213c786cffb861bd52c3b4a768a86c
* | | | resolved conflicts for merge of 368fdba4 to masterBrad Fitzpatrick2010-10-211-24/+17
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
| * | | am bdf1706a: Merge "Reduce logging." into gingerbreadJoe Onorato2010-10-191-24/+17
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp * commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306': Reduce logging.
| | * | Reduce logging.Joe Onorato2010-10-191-24/+17
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Remember, the system and main logs are - Shared resources - Primarily for recording problems - To be used only for large grained events during normal operation Bug: 3104855 Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
* | | am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user ↵David Brown2010-10-151-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | builds (STOPSHIP cleanup)" into gingerbread Merge commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a' * commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a': Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
| * | am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds ↵David Brown2010-10-131-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | (STOPSHIP cleanup)" into gingerbread Merge commit 'cebe5b2e01f8ebbf9089aebc386caecea232df76' into gingerbread-plus-aosp * commit 'cebe5b2e01f8ebbf9089aebc386caecea232df76': Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
| | * Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)David Brown2010-10-131-2/+2
| | | | | | | | | | | | | | | | | | Bug: 3095005 Change-Id: Ide96756282d17252fac16a27cc184ea314a8b31a
* | | am 090ac9f7: am a3100314: Merge "Remove some PII." into gingerbreadWink Saville2010-10-133-13/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '090ac9f7dd883aa75c899745182471d409a2b762' * commit '090ac9f7dd883aa75c899745182471d409a2b762': Remove some PII.
| * | am a3100314: Merge "Remove some PII." into gingerbreadWink Saville2010-10-123-13/+27
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp * commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6': Remove some PII.
| | * Remove some PII.Wink Saville2010-10-123-13/+27
| | | | | | | | | | | | Change-Id: I4df27119b6bbd28bf950516fd6f44676a8e04f06
* | | am 7a26ebdf: am 844a6b3c: Turn off additional debug.John Wang2010-10-131-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef' * commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef': Turn off additional debug.
| * | am 844a6b3c: Turn off additional debug.John Wang2010-10-121-4/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e' into gingerbread-plus-aosp * commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e': Turn off additional debug.
| | * Turn off additional debug.John Wang2010-10-121-4/+4
| | | | | | | | | | | | | | | Bug:3038245 Change-Id: If3c894511b4bbfd0d3e95b51aeca299edbbcf55d
* | | am f5b7c855: am f5201ab7: Keep original phone number in SipConnection.Hung-ying Tyan2010-10-132-6/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'f5b7c855fbb69e8614dab5ca15639228a2428784' * commit 'f5b7c855fbb69e8614dab5ca15639228a2428784': Keep original phone number in SipConnection.
| * | am f5201ab7: Keep original phone number in SipConnection.Hung-ying Tyan2010-10-112-6/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'f5201ab71ff4d104265ab126e86afc6b81da8011' into gingerbread-plus-aosp * commit 'f5201ab71ff4d104265ab126e86afc6b81da8011': Keep original phone number in SipConnection.
| | * Keep original phone number in SipConnection.Hung-ying Tyan2010-10-122-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | am 15f7ff3c: Merge "Fix compile errors in telephony tests"Jean-Baptiste Queru2010-10-112-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f' into gingerbread-plus-aosp * commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f': Fix compile errors in telephony tests
| | * \ Merge "Fix compile errors in telephony tests"Jean-Baptiste Queru2010-10-112-2/+2
| | |\ \
| | | * | Fix compile errors in telephony testsMark Piper2010-08-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple fix of package names for two test cases, currently they do not compile in an IDE. Change-Id: Ia7cd4df70ff37875a02563cfddbe8dd4a16a5b01
* | | | | resolved conflicts for merge of d4e3bf4d to masterXia Wang2010-10-122-3/+192
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I41c0ae2b3f557f84b25c39e247894f66a4e7e702
| * | | | am c8511af0: Merge "Add mock ril control commands and tests" into gingerbreadXia Wang2010-10-112-9/+178
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit 'c8511af04a442551a204b1f47fabb317bcf54be0' into gingerbread-plus-aosp * commit 'c8511af04a442551a204b1f47fabb317bcf54be0': Add mock ril control commands and tests
| | * | | Merge "Add mock ril control commands and tests" into gingerbreadXia Wang2010-10-112-9/+178
| | |\ \ \
| | | * | | Add mock ril control commands and testsXia Wang2010-10-102-9/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add mock ril controller commands and test cases: - testStartIncomingCallAndHangup: test start incoming cal and hangup remote - testSetCallTransitionFlag: test call transition flag and call state transition Change-Id: I25ff8ef7931159ef7101b5e8638b9b7438db4f66
* | | | | | am 5bf55c80: am 0e430ccc: Merge "Telephony: Fix radio state printing"Jean-Baptiste Queru2010-10-111-16/+21
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5bf55c801dfd67e8cf98278f3590d352f9e6d64f' * commit '5bf55c801dfd67e8cf98278f3590d352f9e6d64f': Telephony: Fix radio state printing
| * | | | | am 0e430ccc: Merge "Telephony: Fix radio state printing"Jean-Baptiste Queru2010-10-101-16/+21
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0e430ccc2c8a4bb9d96002676d7742652bd28477' into gingerbread-plus-aosp * commit '0e430ccc2c8a4bb9d96002676d7742652bd28477': Telephony: Fix radio state printing
| | * | | | Merge "Telephony: Fix radio state printing"Jean-Baptiste Queru2010-10-101-16/+21
| | |\ \ \ \
generated by cgit v1.1 at 2025-01-27 10:53:47 +0000