summaryrefslogtreecommitdiffstats
path: root/telephony/java/android
Commit message (Expand)AuthorAgeFilesLines
* am 22165bb5: am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerb...Jake Hamby2011-06-092-13/+133
|\
| * am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aospJake Hamby2011-06-072-13/+133
| |\
| | * resolved conflicts for merge of 66040bbb to gingerbread-plus-aospJake Hamby2011-06-072-13/+133
| | |\
| | | * Fixes for SMS Cell Broadcast support.Jake Hamby2011-06-062-13/+133
* | | | am 229d3a0c: am fc94d45f: Merge "Make getDeviceId return null for Non-phone d...John Wang2011-06-091-0/+4
|\ \ \ \ | |/ / /
| * | | am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into ...John Wang2011-06-071-0/+4
| |\ \ \
| | * \ \ Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTEJohn Wang2011-06-071-0/+4
| | |\ \ \
| | | * | | Make getDeviceId return null for Non-phone device.John Wang2011-06-071-0/+4
* | | | | | resolved conflicts for merge of 7ca13deb to masterJake Hamby2011-06-083-1/+183
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aospJake Hamby2011-06-073-1/+183
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | resolved conflicts for merge of ab79ee4a to gingerbread-plus-aospJake Hamby2011-06-063-2/+183
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Enable full support for SMS Cell Broadcast.Jake Hamby2011-06-013-2/+579
* | | | | | resolved conflicts for merge of e139167c to masterRobert Greenwalt2011-06-081-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTERobert Greenwalt2011-06-071-2/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | resolved conflicts for merge of 8de47a2f to honeycomb-LTERobert Greenwalt2011-06-071-2/+4
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Reveal some network constants.Robert Greenwalt2011-05-311-2/+4
* | | | | | Map network identity using ConnectivityService.Jeff Sharkey2011-06-071-1/+46
|/ / / / /
* | | | | am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in...Jean-Baptiste Queru2011-06-061-16/+85
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Adding support for parsing of SMS-CB pdus in UMTS format."Jean-Baptiste Queru2011-05-251-16/+85
| |\ \ \ \
| | * | | | Adding support for parsing of SMS-CB pdus in UMTS format.Henrik Hall2011-01-111-16/+85
* | | | | | am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology...Wink Saville2011-06-031-54/+69
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Refactor ServiceStateTracker handling of radio technology.Wink Saville2011-06-031-54/+69
* | | | | | am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" in...Wink Saville2011-06-021-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | CdmaLte: Use SPN from SIM card if SIM card is presendKazuhiro Ondo2011-06-021-1/+1
* | | | | | am 55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTEWink Saville2011-05-131-1/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add getLteOnCdamMode.Wink Saville2011-05-121-1/+22
* | | | | | resolved conflicts for merge of 18cc814c to honeycomb-plus-aospJake Hamby2011-05-102-34/+15
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 4d53cb02: Merge "Enable support for SMS national language shift tables." i...Jake Hamby2011-05-052-34/+15
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Enable support for SMS national language shift tables.Jake Hamby2011-04-062-34/+15
* | | | | | am 45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTEWink Saville2011-05-091-13/+21
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Telephony: Signal Strength Changes.Ramesh Sudini2011-05-091-13/+21
* | | | | | am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter."Conley Owens2011-04-291-3/+5
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Fixing wrong Japanese phone formatter.Keiji Ariyama2011-03-111-3/+5
| * | | | am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into ...Robert Greenwalt2011-01-291-1/+4
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
* | | | am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1Wink Saville2011-03-171-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Change stopship to todo.Wink Saville2011-03-171-3/+3
* | | | Do not merge: Telephony: Corrections to LTE and eHRPD constant values.Ramesh Sudini2011-03-141-4/+9
* | | | Do not merge: Revert the revert of "LTE Changes for Telephony including Multi...Wink Saville2011-03-141-0/+10
|/ / /
* | | DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN suppor...Wink Saville2011-03-031-10/+0
* | | LTE Changes for Telephony including Multiple PDN support and IPV6 supportWink Saville2011-02-241-0/+10
* | | Changes for ril.h version 6.Wink Saville2011-02-181-19/+406
* | | Merge "Add new network type for HSPA+."Robert Greenwalt2011-02-021-0/+3
|\ \ \
| * | | Add new network type for HSPA+.Robert Greenwalt2011-02-021-0/+3
* | | | Have SmsMessage use getCurrentPhoneTypeWink Saville2011-02-022-24/+24
* | | | Use a cached context when possible.Robert Greenwalt2011-02-021-9/+20
* | | | Add TelephonyManager.getCurrentPhoneTypeWink Saville2011-02-012-10/+24
|/ / /
* | | Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.Wink Saville2011-01-311-0/+3
* | | Merge 6b739dc7 from gingerbreadJean-Baptiste Queru2011-01-291-1/+0
|\ \ \ | | |/ | |/|
| * | Add some network types that OEM's are asking for.Robert Greenwalt2011-01-281-1/+4
* | | Block SMS service for non-sms-capable device.John Wang2010-12-101-0/+16