summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Expand)AuthorAgeFilesLines
* am eb182d78: am f3ee6f87: Telephony: Remove references to mExitECMRunnable ob...Banavathu, Srinivas Naik2010-08-261-0/+2
|\
| * am f3ee6f87: Telephony: Remove references to mExitECMRunnable object.Banavathu, Srinivas Naik2010-08-261-0/+2
| |\
| | * Telephony: Remove references to mExitECMRunnable object.Banavathu, Srinivas Naik2010-08-231-0/+2
* | | am d06e641d: am 108a06c9: Merge "CallManager: remove unused Phone argument fr...Hung-ying Tyan2010-08-251-3/+3
|\ \ \ | |/ /
| * | am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf()...Hung-ying Tyan2010-08-251-3/+3
| |\ \
| | * | CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()Hung-ying Tyan2010-08-251-3/+3
* | | | am 1537637c: am 3294d44b: Add confcall management to SIP callsHung-ying Tyan2010-08-244-76/+97
|\ \ \ \ | |/ / /
| * | | am 3294d44b: Add confcall management to SIP callsHung-ying Tyan2010-08-244-76/+97
| |\ \ \ | | |/ /
| | * | Add confcall management to SIP callsHung-ying Tyan2010-08-244-76/+97
* | | | am 360ab1df: am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 ...Jean-Baptiste Queru2010-08-241-13/+67
|\ \ \ \ | |/ / /
| * | | am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call."Jean-Baptiste Queru2010-08-231-13/+67
| |\ \ \ | | | |/ | | |/|
| | * | Adds the ability to Android to initiate a 2 Digit Call.Georgios Katsaros2010-08-171-13/+67
* | | | am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return...Wink Saville2010-08-242-3/+8
|\ \ \ \ | |/ / /
| * | | am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.Wink Saville2010-08-202-3/+8
| |\ \ \ | | | |/ | | |/|
| | * | am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.Wink Saville2010-08-202-3/+8
| | |\ \
| | | * | Change CDMAPhone.getDeviceId to return MEID or ESN.Wink Saville2010-08-202-3/+8
| * | | | am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbreadRobert Greenwalt2010-08-204-3/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge "DO NOT MERGE Fixing Connectivity" into gingerbreadRobert Greenwalt2010-08-204-3/+7
| | |\ \ \
| | | * | | DO NOT MERGE Fixing ConnectivityRobert Greenwalt2010-08-204-3/+7
* | | | | | am d457053a: am 07936528: Merge "Cosmetic cleanups to SMSDispatcher classes."...Jake Hamby2010-08-233-53/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 07936528: Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerb...Jake Hamby2010-08-193-62/+45
| |\ \ \ \ \ | | |/ / / /
| | * | | | Cosmetic cleanups to SMSDispatcher classes.Jake Hamby2010-08-193-62/+45
| | |/ / /
* | | | | Merge "Move the "voice_capable" resource into the framework."David Brown2010-08-181-0/+21
|\ \ \ \ \
| * | | | | Move the "voice_capable" resource into the framework.David Brown2010-08-181-0/+21
* | | | | | am fa9a38c5: am 6ab94608: Merge "CallManager: add setAudioMode()" into ginger...Hung-ying Tyan2010-08-181-4/+29
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 6ab94608: Merge "CallManager: add setAudioMode()" into gingerbreadHung-ying Tyan2010-08-181-4/+29
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | CallManager: add setAudioMode()Hung-ying Tyan2010-08-181-4/+29
* | | | | | am dc7d7378: am 8eac20ea: SIP: implement conference callHung-ying Tyan2010-08-182-5/+51
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 8eac20ea: SIP: implement conference callHung-ying Tyan2010-08-182-5/+51
| |\ \ \ \ \ | | |/ / / /
| | * | | | SIP: implement conference callHung-ying Tyan2010-08-182-5/+51
* | | | | | am 16848a15: am f6354aca: Merge "CallManager: do not deliver ring event if fg...Hung-ying Tyan2010-08-181-1/+4
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live...Hung-ying Tyan2010-08-181-1/+4
| |\ \ \ \ | | |/ / /
| | * | | CallManager: do not deliver ring event if fg call is live.Hung-ying Tyan2010-08-171-1/+4
* | | | | Merge "Add setRadioState to MockRilController and the corresponding test case...Xia Wang2010-08-183-0/+63
|\ \ \ \ \
| * | | | | Add setRadioState to MockRilController and the corresponding test case.Xia Wang2010-08-093-0/+63
* | | | | | resolved conflicts for merge of 31202b1a to masterJake Hamby2010-08-165-17/+215
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 3f442ece: Merge "Fix character count bug and Javadoc typos in SMS (with te...Jake Hamby2010-08-136-23/+220
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix character count bug and Javadoc typos in SMS (with test cases)Jake Hamby2010-08-136-23/+220
* | | | | | am 164eb050: am 4f170821: Merge "Fix typo and bug in CTS test class." into gi...Jake Hamby2010-08-161-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbreadJake Hamby2010-08-132-2/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix typo and bug in CTS test class.Jake Hamby2010-08-132-2/+1
* | | | | | Keep the '+' when normalizing the phone numberDmitri Plotnikov2010-08-132-3/+4
* | | | | | am 2835391c: am 686a9505: Merge "Update switch call and accept call." into gi...John Wang2010-08-124-7/+121
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 686a9505: Merge "Update switch call and accept call." into gingerbreadJohn Wang2010-08-124-8/+122
| |\ \ \ \ \ | | |/ / / /
| | * | | | Update switch call and accept call.John Wang2010-08-124-8/+122
* | | | | | am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Typ...John Huang2010-08-123-189/+1257
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"John Huang2010-08-123-189/+1257
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Enhance WspTypeDecoder to decode Content Type Parameters"John Huang2010-08-123-189/+1257
| | |\ \ \ \
| | | * | | | Enhance WspTypeDecoder to decode Content Type ParametersDan Griffin2010-08-023-189/+1257
* | | | | | | SIP: remove unused file.Hung-ying Tyan2010-08-122-764/+1