summaryrefslogtreecommitdiffstats
path: root/telephony
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus ↵Evan Charlton2014-05-162-9/+11
| | | | | | | | instead of sendEnvelope."" This reverts commit f743b163fc764b7ebf701a9e65b13d308530d750. Change-Id: Ie274a024d2cdb6f11082e6bf391732a304863074
* Revert "Revert "Expose sendEnvelope.""Evan Charlton2014-05-162-4/+45
| | | | This reverts commit 23745256000bffaad4038ad9fe6e2b0941074a53.
* Merge "Remove obsolete ThirdPartyCall APIs"Evan Charlton2014-05-146-407/+0
|\
| * Remove obsolete ThirdPartyCall APIsEvan Charlton2014-05-146-407/+0
| | | | | | | | | | | | | | These should have been reverted long ago. Additional cleanup will need to happen, but this is a good first pass. Change-Id: I6d3c2919299c0a0b9714ffecd30da68e5c880b6a
* | Merge "Revert "Expose sendEnvelope.""Evan Charlton2014-05-142-45/+4
|\ \ | |/
| * Revert "Expose sendEnvelope."Evan Charlton2014-05-142-45/+4
| | | | | | | | | | | | This reverts commit 6eac2ee0fc8a652c4cb1e7ca6602a080d4f82dbd. Change-Id: Ie04a873bb1d4935208e687917e86cbe80312a6d1
* | Merge "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus ↵Evan Charlton2014-05-142-11/+9
|\ \ | |/ | | | | instead of sendEnvelope.""
| * Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of ↵Evan Charlton2014-05-142-11/+9
| | | | | | | | | | | | sendEnvelope." This reverts commit 37384dedab38239433a41641fe87fc3e51bb6976.
* | Merge "Handle normalization of a "null" phone number."Andrew Lee2014-05-141-0/+4
|\ \ | |/ |/|
| * Handle normalization of a "null" phone number.Andrew Lee2014-05-141-0/+4
| | | | | | | | | | Bug: 14900155 Change-Id: I1c4c5c6dec4c4c470b436102c72a7476d3d5237c
* | merge master nova by hand, skipped translationsEd Heyl2014-05-1417-8/+848
|\ \ | |/ |/| | | Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb
| * am 192384bb: am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for ↵Wink Saville2014-05-012-0/+7
| |\ | | | | | | | | | | | | | | | | | | NETWORK_TYPE_GSM" * commit '192384bb2708c49ca6c91432b8c848f43557429a': Add support for NETWORK_TYPE_GSM
| * \ am e9c9547e: am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add ↵Wink Saville2014-04-262-2/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | functionality to handle ICC IO error" * commit 'e9c9547e899a7095f3fb420df7d4d809ab13ea57': Telephony: Add functionality to handle ICC IO error
| * \ \ resolved conflicts for merge of 806047ca to master-novaEvan Charlton2014-04-242-52/+62
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I6754198919b952bd733733572f64a316cb41b101
| * \ \ \ resolved conflicts for merge of 8d966e42 to master-novaEvan Charlton2014-04-165-1/+195
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ibcc7d1eb4f0349e90b8e97d5235a08efb8226ef6
| * \ \ \ \ am 7217f380: Correct some comments (LTE->CDMA)Brian Williammee2014-04-111-2/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7217f3805819b6feca7ec1cc378a9ca56cf2d275': Correct some comments (LTE->CDMA)
| * | | | | | Add disconnect cause to setDisconnected.Santos Cordon2014-03-311-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ba9b8f47a942b82b7a3d4bed43c0ca945957592
| * | | | | | am 83ee4429: am 7bce23f7: am aee03bb1: am 49c06150: Merge "Remove duplicate ↵Anders Kristensen2014-03-281-0/+85
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call disconnect codes." * commit '83ee4429f13896c82f3f29c8164888f1f6fe8309': Remove duplicate call disconnect codes.
| * \ \ \ \ \ \ am db0dca82: resolved conflicts for merge of c1edfc2c to masterGabriel Peal2014-03-251-11/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db0dca826d992af1adfa53e10c31f08d3197bb0b': resolved conflicts for merge of c1edfc2c to master
| * \ \ \ \ \ \ \ resolved conflicts for merge of 5e44cadf to master-novaSailesh Nepal2014-03-251-205/+136
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieacfbba60109a60b268c116a40e598c0745e8a3b
| * \ \ \ \ \ \ \ \ resolved conflicts for merge of 2d72d000 to master-novaSailesh Nepal2014-03-254-2/+629
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icfb617ffab2da2f8805e4628e75e006c620b479d
| * | | | | | | | | | Modify TelephonyManager to expose sendEnvelopeWithStatus instead of ↵Shishir Agrawal2014-03-142-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sendEnvelope. The RIL sendEnvelope command does not return the response from the SIM while the sendEnvelopeWithStatus does. Since the response is required for certain envelope commands, its better to expose sendEnvelopeWithStatus. Change-Id: I209bfc59e396bb6f91345d6f99c51cfa35f2d650
| * | | | | | | | | | resolved conflicts for merge 322f7d6e to master-novaEvan Charlton2014-03-062-0/+54
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31de6084253ce21f50224582f82b7f7e630ef34e
| * \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 786e71ab to master-novaJake Hamby2014-02-243-37/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe5e0a68f59d95c4a8c721d9e21626714d33ccd0
| * | | | | | | | | | | | Delete telephony's CallServiceEvan Charlton2014-02-201-165/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moved to telecomm; kill it again. Change-Id: I6ae581ac3fe5417f3a17f10f8615caacc69a21ad
| * | | | | | | | | | | | Add abstract base implementation of CallService.Sailesh Nepal2014-02-202-1/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base implementation takes care of a lot of boilerplate code. Change-Id: Iaf5a16f5718727cee0f7efb4af53a021536f50d8
| * | | | | | | | | | | | Add interface definitions for CallService/PhoneServiceSailesh Nepal2014-02-204-0/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interfaces are meant to replace ThirdParty*.aidl/java files in same directory long term. The differences in methods are on purpose and reflect more recent design directions. Change-Id: Ia98603a1d0b6d07a3393c5f7c5aa040f9e3916e4
| * | | | | | | | | | | | Remove the telecomm entries now that we have ↵Ben Gilad2014-02-205-383/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://googleplex-android-review.git.corp.google.com/#/c/398927 DO NOT SUBMIT until the above CL is uploaded. Change-Id: I4e4f19175b502ba81c882d1379d1d225b0e6ba67
| * | | | | | | | | | | | am c1e0f9be: am df10f02a: am e574f7de: am ea56c795: am bbba8211: Merge ↵Wink Saville2014-02-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Telephony: Handle DATA_CALL_LIST in DCC." * commit 'c1e0f9be09750055914f873e690d334821739909': Telephony: Handle DATA_CALL_LIST in DCC.
| * | | | | | | | | | | | | Fix the inconsistent name on @param and the real param.Derek Tan2014-02-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If9853e91f55c0be89cdf77ae7c4369f274a45bb6
| * | | | | | | | | | | | | Merge "Expose sendEnvelope." into master-novaDerek Tan2014-02-132-4/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Expose sendEnvelope.Derek Tan2014-02-122-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I21565fae9ba8f163aed9104db355aecf9bae1796
| * | | | | | | | | | | | | | am 00515148: resolved conflicts for merge of 396b9e79 to masterNarayan Kamath2014-02-1311-0/+1167
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '005151484546fb0bf7f83c5a6ee065715230bf26': Telephony API extension v2
| * | | | | | | | | | | | | | Update TelephonyManager.WifiCallingChoices APISailesh Nepal2014-02-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL updates the order of the WifiCallingChoices values to match the wifi_calling_choice_values resource. Change-Id: Iaa643d7a70938877c760ff4a65f737a4c1c750da
| * | | | | | | | | | | | | | Add abstract base implementation of CallService.Sailesh Nepal2014-02-112-1/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base implementation takes care of a lot of boilerplate code. Change-Id: Iaf5a16f5718727cee0f7efb4af53a021536f50d8
| * | | | | | | | | | | | | | Add interface definitions for CallService/PhoneServiceSailesh Nepal2014-02-114-0/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interfaces are meant to replace ThirdParty*.aidl/java files in same directory long term. The differences in methods are on purpose and reflect more recent design directions. Change-Id: Ia98603a1d0b6d07a3393c5f7c5aa040f9e3916e4
| * | | | | | | | | | | | | | Add Wi-Fi calling state setting to telephony interfacesSailesh Nepal2014-02-112-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01029ade0eb1ff981cb92a536d042a02129a053f
| * | | | | | | | | | | | | | DO NOT MERGE ThirdPartyCallSendDtmfCallBack APISailesh Nepal2014-02-114-5/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This API is needed to implement post dial. Change-Id: Iefdeae81d0eae6be86e7ee1e8ab0251ae43ed079
| * | | | | | | | | | | | | | ThirdPartyPhone: DTMF & callerDisplayName API DO NOT MERGESailesh Nepal2014-02-114-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL extends the ThirdPartyCall API to support DTMF and callerDisplayname. Change-Id: Ia3b4730e852a95d0c11fbddfbe1b780aec39dbb5
| * | | | | | | | | | | | | | Add new phone type (public API) DO NOT MERGESailesh Nepal2014-02-119-39/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds a new public API to allow services to implement calls. Change-Id: I4d30eb4d91bd342506cad4ced059bd8446c2bec4
| * | | | | | | | | | | | | | Revert "Add new phone type (public API) DO NOT MERGE"Sailesh Nepal2014-02-124-37/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0590ac70a93c713c6cf28c3bcbce287d9864f037. Change-Id: I1f4b34c0f8246bb601e2ba5f14eabe9c36d33d94
| * | | | | | | | | | | | | | Add new phone type (public API) DO NOT MERGESailesh Nepal2014-02-114-32/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds a new public API to allow services to implement calls. Change-Id: If6fef93aebc8b199880ad44d35b7d8ae69f71f9e
* | | | | | | | | | | | | | | Replace LinkCapabilities with NetworkCapabilitiesRobert Greenwalt2014-05-122-3/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove unused LinkSocket and LinkSocketNotifier. bug:13885501 Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3
* | | | | | | | | | | | | | am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"Wink Saville2014-05-012-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '437994578272f9770748b152c53ec655059d19ec': Add support for NETWORK_TYPE_GSM
| * | | | | | | | | | | | | am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"Wink Saville2014-05-012-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e411f74efe6dd383e59634760cccd96da1c209b': Add support for NETWORK_TYPE_GSM
| | * | | | | | | | | | | | | Add support for NETWORK_TYPE_GSMSandeep Kunta2014-05-012-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for NETWORK_TYPE_GSM in TelephonyManager and corresponding mapping in ServicState.java so that when application queries for getVoiceNetworkType() and currently camped rat is GSM, they get network mode as GSM instead of network mode unknown. Change-Id: Ibe4672b04a5044710d63499c4cf2b6ebe91444bf
| * | | | | | | | | | | | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-294-2/+543
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly ↵Gabriel Peal2014-03-224-2/+543
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | supported APIs that are not useful for 3rd party developers. * commit 'e05077d78c9abde054a754db53e71c647b9a705c': Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality ↵Wink Saville2014-04-262-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to handle ICC IO error" * commit 'c79963c3cb6d0127e2fc9ce5bf000fa05811504d': Telephony: Add functionality to handle ICC IO error
| * | | | | | | | | | | | | | | am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC ↵Wink Saville2014-04-262-2/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IO error" * commit '1c1827a6402c3a1f38ba077289a9022f6e6d3f73': Telephony: Add functionality to handle ICC IO error