summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Expand)AuthorAgeFilesLines
* am 965d5337: am 38f53488: Merge "NullPointerException at handleMessage(GSMPho...Jean-Baptiste Queru2010-10-101-1/+2
|\
| * am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)"Jean-Baptiste Queru2010-10-081-1/+2
| |\
| | * NullPointerException at handleMessage(GSMPhone.java)Babis Triantafyllou2010-10-081-1/+2
| * | am e1c8e388: Merge "Port mock ril controller and tests to GB. DO NOT MERGE" i...Xia Wang2010-10-076-0/+486
| |\ \
| | * \ Merge "Port mock ril controller and tests to GB. DO NOT MERGE" into gingerbreadXia Wang2010-10-076-0/+486
| | |\ \
| | | * | Port mock ril controller and tests to GB. DO NOT MERGEXia Wang2010-10-076-0/+486
* | | | | resolved conflicts for merge of 5df4b5a7 to masterJean-Baptiste Queru2010-10-101-2/+8
|\ \ \ \ \ | |/ / / /
| * | | | am 08fb5851: Merge "Add flag to skip restoring network seletion." into ginger...John Wang2010-10-071-2/+8
| |\ \ \ \ | | |/ / /
| | * | | Add flag to skip restoring network seletion.John Wang2010-10-071-2/+8
* | | | | am 2e99245e: am bbc80d34: Merge "Changed handling of onQueryCompelete to not ...Wink Saville2010-10-101-18/+18
|\ \ \ \ \ | |/ / / /
| * | | | am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType....Wink Saville2010-10-071-18/+18
| |\ \ \ \ | | |/ / /
| | * | | Changed handling of onQueryCompelete to not use mimeType.Wink Saville2010-10-071-18/+18
| | |/ /
* | | | am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing c...Hung-ying Tyan2010-10-082-17/+34
|\ \ \ \ | |/ / /
| * | | am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gin...Hung-ying Tyan2010-10-052-17/+34
| |\ \ \ | | |/ /
| | * | Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbreadHung-ying Tyan2010-10-052-17/+34
| | |\ \
| | | * | CallManager/SipPhone: fix reject a ringing callHung-ying Tyan2010-10-062-17/+34
| | * | | Merge changes Ic5551c94,I0207f7f7 into gingerbreadMike Lockwood2010-10-052-0/+7
| | |\ \ \
| | | * | | GPS: Add support for AGpsRilInterface.Miguel Torroja2010-10-052-0/+7
| | | |/ /
| * | | | am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbreadRobert Greenwalt2010-10-051-13/+15
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add supporting MCC=450(Korea)" into gingerbreadRobert Greenwalt2010-10-051-13/+15
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add supporting MCC=450(Korea)Sang-il, Lee2010-10-011-13/+15
* | | | | am a785a59c: am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." int...Hung-ying Tyan2010-10-062-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbreadHung-ying Tyan2010-10-042-0/+4
| |\ \ \ \ | | |/ / /
| | * | | SIP: add SERVER_UNREACHABLE error code.Hung-ying Tyan2010-10-052-0/+4
* | | | | Add LinkAddressIrfan Sheriff2010-10-061-17/+17
* | | | | Revert "Revert "resolved conflicts for merge of 8788d140 to master""Hung-ying Tyan2010-10-038-720/+49
* | | | | Revert "resolved conflicts for merge of 8788d140 to master"Jason Chen2010-10-018-48/+720
* | | | | resolved conflicts for merge of 8788d140 to masterHung-ying Tyan2010-10-028-720/+48
|\ \ \ \ \ | |/ / / /
| * | | | am 306137d9: SIP telephony cleanup.Hung-ying Tyan2010-10-018-716/+48
| |\ \ \ \ | | |/ / /
| | * | | SIP telephony cleanup.Hung-ying Tyan2010-10-028-716/+48
* | | | | resolved conflicts for merge of 3543a40b to masterJake Hamby2010-10-013-9/+58
|\ \ \ \ \ | |/ / / /
| * | | | am 7888486d: Merge "Add subaddress to SMS fingerprint calculation."Jake Hamby2010-10-013-9/+58
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Add subaddress to SMS fingerprint calculation."Jake Hamby2010-10-013-9/+58
| | |\ \ \
| | | * | | Add subaddress to SMS fingerprint calculation.Naveen Kalla2010-09-263-9/+58
* | | | | | am edec27a1: am d531c9eb: Merge "Do not explicity disconnect Data during powe...Jake Hamby2010-10-011-20/+41
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x."Jake Hamby2010-10-011-20/+41
| |\ \ \ \ \ | | |/ / / /
| | * | | | Do not explicity disconnect Data during power down for 1x.Naveen Kalla2010-09-201-20/+41
| | |/ / /
* | | | | am 86a12d46: am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnab...Hung-ying Tyan2010-10-015-0/+46
|\ \ \ \ \ | |/ / / /
| * | | | am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into ...Hung-ying Tyan2010-10-015-0/+46
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbreadHung-ying Tyan2010-10-015-0/+46
| | |\ \ \
| | | * | | Add CallManager/Phone.setEchoSuppressionEnabled().Hung-ying Tyan2010-09-305-0/+46
| | | | |/ | | | |/|
* | | | | resolved conflicts for merge of 6a3eddb4 to masterDianne Hackborn2010-09-301-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbreadDianne Hackborn2010-09-301-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Rub in a little 'ol log-b-gone." into gingerbreadDianne Hackborn2010-09-301-1/+1
| | |\ \ \
| | | * | | Rub in a little 'ol log-b-gone.Dianne Hackborn2010-09-301-1/+1
| | | |/ /
* | | | | resolved conflicts for merge of 738aadd7 to masterJake Hamby2010-09-301-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of 0a972acf to gingerbread-plus-aospJake Hamby2010-09-303-7/+7
| |\ \ \ \ | | |/ / /
| | * | | Typo fixes in comments and minor code cleanups.Jake Hamby2010-09-303-7/+7
| | |/ /
* | | | am 49c13e51: am 0e412304: Catch exceptions in SipPhone.canTake().Hung-ying Tyan2010-09-301-8/+26
|\ \ \ \ | |/ / /
| * | | am 0e412304: Catch exceptions in SipPhone.canTake().Hung-ying Tyan2010-09-301-8/+26
| |\ \ \ | | |/ /