summaryrefslogtreecommitdiffstats
path: root/telephony/java
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge commit 'e0df2c4f' into fix-merge-conflictWink Saville2012-08-131-124/+151
|\ \ \ | |/ /
| * | am eca64977: Merge "Telephony: Signal Strength cleanup & LTE support"Wink Saville2012-08-131-56/+159
| |\ \ | | |/
| | * Merge "Telephony: Signal Strength cleanup & LTE support"Wink Saville2012-08-131-56/+159
| | |\
| | | * Telephony: Signal Strength cleanup & LTE supportUma Maheswari Ramalingam2012-08-101-56/+159
* | | | am eb2257cc: am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard"Wink Saville2012-08-081-0/+1
|\ \ \ \ | |/ / /
| * | | am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard"Wink Saville2012-08-081-0/+1
| |\ \ \ | | |/ /
| | * | Telephony: Dynamically instantiate IccCardAlex Yakavenka2012-08-081-0/+1
* | | | am 8f82961f: am 98853623: Merge "Telephony: Move AdnRecord.aidl into opt/tele...Wink Saville2012-08-041-20/+0
|\ \ \ \ | |/ / /
| * | | am 98853623: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"Wink Saville2012-08-041-20/+0
| |\ \ \ | | |/ /
| | * | Telephony: Move AdnRecord.aidl into opt/telephonyAlex Yakavenka2012-08-031-20/+0
| | |/
| | * Create telephony-common and mms-common - DO NOT MERGEWink Saville2012-07-17202-75369/+635
* | | Merge "Unhide the new location API's" into jb-mr1-devWink Saville2012-08-0114-31/+19
|\ \ \
| * | | Unhide the new location API'sWink Saville2012-07-2614-31/+19
* | | | Reduce log spam.Robert Greenwalt2012-07-271-1/+1
|/ / /
* | | am 0c8a7768: am 893d93d2: Implement CMAS service category program results.Jake Hamby2012-07-252-9/+153
|\ \ \ | |/ /
| * | Implement CMAS service category program results.Jake Hamby2012-07-252-9/+153
* | | Revise and update CellInfo API'sWink Saville2012-07-2518-402/+2187
|/ /
* | Create telephony-common and mms-commonWink Saville2012-07-11202-75443/+635
* | am d2246930: Merge "Preserve retryCount when retrying." into jb-devWink Saville2012-07-105-28/+100
|\ \
| * \ Merge "Preserve retryCount when retrying." into jb-devWink Saville2012-07-105-28/+100
| |\ \
| | * | Preserve retryCount when retrying.Wink Saville2012-06-285-28/+100
* | | | am e87c71f8: Merge "When reconnecting disassociate dc and apnContext." into j...Wink Saville2012-07-101-0/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge "When reconnecting disassociate dc and apnContext." into jb-devWink Saville2012-07-101-0/+2
| |\ \ | | |/
| | * When reconnecting disassociate dc and apnContext.Wink Saville2012-06-271-0/+2
* | | Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-...Jean-Baptiste Queru2012-07-021-0/+55
|\ \ \
| * | | Revert "DO NOT MERGE: Remove SMS shortcode warning feature."Jean-Baptiste Queru2012-07-021-0/+55
* | | | Merge "Revert "DO NOT MERGE: Remove SMS shortcode warning feature."" into jb-...Jean-Baptiste Queru2012-07-022-9/+373
|\ \ \ \ | |/ / /
| * | | Revert "DO NOT MERGE: Remove SMS shortcode warning feature."Jean-Baptiste Queru2012-07-022-9/+373
* | | | Merge "Fix a bad comment. - DO NOT MERGE" into jb-dev-plus-aospJean-Baptiste Queru2012-07-021-1/+1
|\ \ \ \ | |/ / /
| * | | Fix a bad comment. - DO NOT MERGESantos Cordon2012-07-021-1/+1
* | | | Merge "Telephony Capability-Distinguish dialing & connect - DO NOT MERGE" int...Jean-Baptiste Queru2012-07-021-0/+11
|\ \ \ \ | |/ / /
| * | | Telephony Capability-Distinguish dialing & connect - DO NOT MERGESantos Cordon2012-07-021-0/+11
* | | | Merge "When we disconnect shutdown the StateMachine. DO NOT MERGE" into jb-de...Jean-Baptiste Queru2012-07-023-20/+31
|\ \ \ \ | |/ / /
| * | | When we disconnect shutdown the StateMachine. DO NOT MERGEWink Saville2012-07-023-20/+31
* | | | Merge "Enhance StateMachine Quitting and logging support. DO NOT MERGE" into ...Jean-Baptiste Queru2012-07-021-4/+4
|\ \ \ \ | |/ / /
| * | | Enhance StateMachine Quitting and logging support. DO NOT MERGEWink Saville2012-07-021-4/+4
* | | | am 46c923af: Merge "Fix country code for Netherlands Antilles." into jb-devJohn Huang2012-07-021-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix country code for Netherlands Antilles.Wink Saville2012-07-021-1/+1
| |/
* | am ca2c7b7d: Merge "Fix detection of CDMA CMAS cell broadcasts." into jb-devJake Hamby2012-06-271-2/+1
|\ \ | |/
| * Fix detection of CDMA CMAS cell broadcasts.Jake Hamby2012-06-251-2/+1
* | am 2dd63ccd: am d8ccd712: Merge "Parcel compRequired flag correctly."Jean-Baptiste Queru2012-06-151-2/+3
|\ \
| * \ Merge "Parcel compRequired flag correctly."Jean-Baptiste Queru2012-06-151-2/+3
| |\ \
| | * | Parcel compRequired flag correctly.Danny Baumann2012-06-011-2/+3
* | | | am 15319ded: am 460abe97: Merge "Add support for Caller Name Display"Robert Greenwalt2012-06-123-14/+29
|\ \ \ \ | |/ / /
| * | | Merge "Add support for Caller Name Display"Robert Greenwalt2012-06-123-14/+29
| |\ \ \
| | * | | Add support for Caller Name Displaykenshin2012-06-043-14/+29
| | |/ /
| | * | Merge "Revert "Telephony: Register/Unregister Phones with CallManager""Conley Owens2012-05-041-5/+0
| | |\ \
| | | * | Revert "Telephony: Register/Unregister Phones with CallManager"Conley Owens2012-05-041-5/+0
| | * | | Merge "Telephony: Register/Unregister Phones with CallManager"Conley Owens2012-05-041-0/+5
| | |\ \ \ | | | |/ /
| | | * | Telephony: Register/Unregister Phones with CallManagerJaime Lopez2011-01-141-0/+5