summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of d4e3bf4d to masterXia Wang2010-10-122-3/+192
|\
| * am c8511af0: Merge "Add mock ril control commands and tests" into gingerbreadXia Wang2010-10-112-9/+178
| |\
| | * 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
* | | | am 5bf55c80: am 0e430ccc: Merge "Telephony: Fix radio state printing"Jean-Baptiste Queru2010-10-111-16/+21
|\ \ \ \ | |/ / /
| * | | am 0e430ccc: Merge "Telephony: Fix radio state printing"Jean-Baptiste Queru2010-10-101-16/+21
| |\ \ \
| | * \ \ Merge "Telephony: Fix radio state printing"Jean-Baptiste Queru2010-10-101-16/+21
| | |\ \ \
| | | * | | Telephony: Fix radio state printingAlex Yakavenka2010-09-281-16/+21
| | * | | | Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"Jean-Baptiste Queru2010-10-101-1/+0
| | |\ \ \ \
| | | * | | | Telephony: Remove unused mRuimFileHandler reference from CDMAPhoneAlex Yakavenka2010-09-281-1/+0
| | | |/ / /
* | | | | | am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from SipP...David Brown2010-10-112-47/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d07833f5: Don\'t manually create CallerInfo objects from SipPhoneDavid Brown2010-10-102-47/+11
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Don't manually create CallerInfo objects from SipPhoneDavid Brown2010-10-102-47/+11
| | | |_|/ | | |/| |
* | | | | am 5a41b3f8: am df512214: Merge "Fix startDtmf." into gingerbreadJohn Wang2010-10-111-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am df512214: Merge "Fix startDtmf." into gingerbreadJohn Wang2010-10-101-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix startDtmf.John Wang2010-10-101-1/+1
* | | | | 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
| | | | |_|/ | | | |/| |