summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Expand)AuthorAgeFilesLines
* merge master nova by hand, skipped translationsEd Heyl2014-05-1417-8/+848
|\
| * am 192384bb: am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NE...Wink Saville2014-05-012-0/+7
| |\
| * \ am e9c9547e: am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add fun...Wink Saville2014-04-262-2/+13
| |\ \
| * \ \ resolved conflicts for merge of 806047ca to master-novaEvan Charlton2014-04-242-52/+62
| |\ \ \
| * \ \ \ resolved conflicts for merge of 8d966e42 to master-novaEvan Charlton2014-04-165-1/+195
| |\ \ \ \
| * \ \ \ \ am 7217f380: Correct some comments (LTE->CDMA)Brian Williammee2014-04-111-2/+1
| |\ \ \ \ \
| * | | | | | Add disconnect cause to setDisconnected.Santos Cordon2014-03-311-4/+1
| * | | | | | am 83ee4429: am 7bce23f7: am aee03bb1: am 49c06150: Merge "Remove duplicate c...Anders Kristensen2014-03-281-0/+85
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am db0dca82: resolved conflicts for merge of c1edfc2c to masterGabriel Peal2014-03-251-11/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ resolved conflicts for merge of 5e44cadf to master-novaSailesh Nepal2014-03-251-205/+136
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ resolved conflicts for merge of 2d72d000 to master-novaSailesh Nepal2014-03-254-2/+629
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvel...Shishir Agrawal2014-03-142-9/+11
| * | | | | | | | | | resolved conflicts for merge 322f7d6e to master-novaEvan Charlton2014-03-062-0/+54
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 786e71ab to master-novaJake Hamby2014-02-243-37/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Delete telephony's CallServiceEvan Charlton2014-02-201-165/+0
| * | | | | | | | | | | | Add abstract base implementation of CallService.Sailesh Nepal2014-02-202-1/+166
| * | | | | | | | | | | | Add interface definitions for CallService/PhoneServiceSailesh Nepal2014-02-204-0/+218
| * | | | | | | | | | | | Remove the telecomm entries now that we have https://googleplex-android-revie...Ben Gilad2014-02-205-383/+0
| * | | | | | | | | | | | am c1e0f9be: am df10f02a: am e574f7de: am ea56c795: am bbba8211: Merge "Telep...Wink Saville2014-02-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix the inconsistent name on @param and the real param.Derek Tan2014-02-131-3/+3
| * | | | | | | | | | | | | Merge "Expose sendEnvelope." into master-novaDerek Tan2014-02-132-4/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Expose sendEnvelope.Derek Tan2014-02-122-4/+45
| * | | | | | | | | | | | | | am 00515148: resolved conflicts for merge of 396b9e79 to masterNarayan Kamath2014-02-1311-0/+1167
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Update TelephonyManager.WifiCallingChoices APISailesh Nepal2014-02-111-3/+4
| * | | | | | | | | | | | | | Add abstract base implementation of CallService.Sailesh Nepal2014-02-112-1/+166
| * | | | | | | | | | | | | | Add interface definitions for CallService/PhoneServiceSailesh Nepal2014-02-114-0/+218
| * | | | | | | | | | | | | | Add Wi-Fi calling state setting to telephony interfacesSailesh Nepal2014-02-112-0/+54
| * | | | | | | | | | | | | | DO NOT MERGE ThirdPartyCallSendDtmfCallBack APISailesh Nepal2014-02-114-5/+82
| * | | | | | | | | | | | | | ThirdPartyPhone: DTMF & callerDisplayName API DO NOT MERGESailesh Nepal2014-02-114-3/+30
| * | | | | | | | | | | | | | Add new phone type (public API) DO NOT MERGESailesh Nepal2014-02-119-39/+52
| * | | | | | | | | | | | | | Revert "Add new phone type (public API) DO NOT MERGE"Sailesh Nepal2014-02-124-37/+32
| * | | | | | | | | | | | | | Add new phone type (public API) DO NOT MERGESailesh Nepal2014-02-114-32/+37
* | | | | | | | | | | | | | | Replace LinkCapabilities with NetworkCapabilitiesRobert Greenwalt2014-05-122-3/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"Wink Saville2014-05-012-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"Wink Saville2014-05-012-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add support for NETWORK_TYPE_GSMSandeep Kunta2014-05-012-0/+7
| * | | | | | | | | | | | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-294-2/+543
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly s...Gabriel Peal2014-03-224-2/+543
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to...Wink Saville2014-04-262-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC I...Wink Saville2014-04-262-2/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge "Telephony: Add functionality to handle ICC IO error"Wink Saville2014-04-252-2/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Telephony: Add functionality to handle ICC IO errorRakesh Pallerla2014-03-122-2/+13
* | | | | | | | | | | | | | | | | Start collecting mobile radio activity from the radio.Dianne Hackborn2014-04-242-52/+62
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen eventWink Saville2014-04-155-1/+195
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Correct some comments (LTE->CDMA)Brian Williammee2014-04-111-2/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | am 7bce23f7: am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnec...Anders Kristensen2014-03-281-0/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes."Anders Kristensen2014-03-281-0/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Remove duplicate call disconnect codes.Anders Kristensen2014-03-051-0/+85
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | am 8ee4491d: am e05077d7: am 83da75d9: Added a private apis jar that includes...Gabriel Peal2014-03-254-2/+543
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly s...Gabriel Peal2014-03-254-2/+543
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
generated by cgit v1.1 at 2025-01-08 08:30:15 +0000