summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android/telecom
Commit message (Expand)AuthorAgeFilesLines
* Merge "Remove TODO in TelecomManager." into lmp-mr1-devTyler Gunn2014-10-231-1/+0
|\
| * Remove TODO in TelecomManager.Tyler Gunn2014-10-231-1/+0
* | Merge "Remove SystemApi annotations." into lmp-mr1-devSantos Cordon2014-10-231-5/+0
|\ \
| * | Remove SystemApi annotations.Santos Cordon2014-10-231-5/+0
* | | am 0145e17d: Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAc...Nancy Chen2014-10-231-0/+27
|\ \ \
| * | | Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount.Nancy Chen2014-10-221-0/+27
* | | | am df0ace26: Merge "Add an option to set the selected phone account as the de...Nancy Chen2014-10-232-8/+10
|\ \ \ \ | |/ / /
| * | | Merge "Add an option to set the selected phone account as the default. (1/3)"...Nancy Chen2014-10-232-8/+10
| |\ \ \
| | * | | Add an option to set the selected phone account as the default. (1/3)Nancy Chen2014-10-222-8/+10
* | | | | am 40f15895: am 028217eb: Merge "Add hidden method to access a connection\'s ...Santos Cordon2014-10-221-0/+7
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am 028217eb: Merge "Add hidden method to access a connection\'s service." int...Santos Cordon2014-10-211-0/+7
| |\ \ \ | | |/ / | |/| |
| | * | Add hidden method to access a connection's service.Santos Cordon2014-10-201-0/+7
* | | | Fire onConferenceChanged after reseting conference.Andrew Lee2014-10-211-0/+1
* | | | Merge "Add functions to update on conference changes." into lmp-mr1-devAndrew Lee2014-10-182-0/+17
|\ \ \ \
| * | | | Add functions to update on conference changes.Andrew Lee2014-10-172-0/+17
* | | | | am a6a1c52f: Merge "Use Telecom API for checking if a number is voicemail (1/...Nancy Chen2014-10-171-0/+21
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Use Telecom API for checking if a number is voicemail (1/2)Nancy Chen2014-10-161-0/+21
* | | | | am c913c2de: Merge "Revert "Add API method to extract subscription ID from ph...Nancy Chen2014-10-171-44/+0
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Merge "Revert "Add API method to extract subscription ID from phone account (...Nancy Chen2014-10-161-44/+0
| |\ \ \
| | * | | Revert "Add API method to extract subscription ID from phone account (1/3)"Nancy Chen2014-10-161-44/+0
* | | | | Merge "Remove unused onConferenceWith method" into lmp-mr1-devJay Shrauner2014-10-151-10/+0
|\ \ \ \ \
| * | | | | Remove unused onConferenceWith methodJay Shrauner2014-10-151-10/+0
* | | | | | Merge "Add helper method for checking phone capabilities." into lmp-mr1-devAndrew Lee2014-10-151-12/+23
|\ \ \ \ \ \
| * | | | | | Add helper method for checking phone capabilities.Andrew Lee2014-10-141-12/+23
| | |_|_|_|/ | |/| | | |
* | | | | | am 9faf13b4: Merge "Add API method to extract subscription ID from phone acco...Nancy Chen2014-10-151-0/+44
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge "Add API method to extract subscription ID from phone account (1/3)" in...Nancy Chen2014-10-151-0/+44
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add API method to extract subscription ID from phone account (1/3)Nancy Chen2014-10-131-0/+44
* | | | | Merge "MR1 - Adding more Telecom state dumping." into lmp-mr1-devTyler Gunn2014-10-152-1/+18
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | MR1 - Adding more Telecom state dumping.Tyler Gunn2014-09-302-1/+18
* | | | | am f5afb4d6: Revert "Add color to PhoneAccount objects (1/3)"Ihab Awad2014-10-121-22/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Revert "Add color to PhoneAccount objects (1/3)"Ihab Awad2014-10-111-22/+0
* | | | | am a516e445: Merge "Add color to PhoneAccount objects (1/3)" into lmp-sprout-devIhab Awad2014-10-111-0/+22
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add color to PhoneAccount objects (1/3)" into lmp-sprout-devIhab Awad2014-10-101-0/+22
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add color to PhoneAccount objects (1/3)Ihab Awad2014-10-101-0/+22
| | | |/ | | |/|
* | | | am 3175824a: am 879142bf: Fix hangouts conference calling regression.mike dooley2014-10-091-1/+1
|\ \ \ \ | |/ / /
| * | | Fix hangouts conference calling regression.mike dooley2014-10-091-1/+1
* | | | am 329bd662: am 3bde32e6: Merge "Fixing where call goes from disconnecting to...Tyler Gunn2014-10-072-0/+21
|\ \ \ \ | |/ / /
| * | | Fixing where call goes from disconnecting to active to disconnecting state.Tyler Gunn2014-10-072-0/+21
| * | | Fix build breakYorke Lee2014-10-061-0/+2
* | | | am 770ed6ec: Fix build breakYorke Lee2014-10-071-0/+2
|\ \ \ \
| * | | | Fix build breakYorke Lee2014-10-071-0/+2
| |/ / /
* | | | am 7e552595: am 4c334f3d: Merge "Add ability to add sim-initiated MO call to ...Yorke Lee2014-10-073-8/+67
|\ \ \ \ | |/ / /
| * | | Add ability to add sim-initiated MO call to UI (2/4)Yorke Lee2014-10-063-8/+67
| |/ /
* | | am 25b85bcc: am 8f8bffa1: Merge "Add @SystemApi to missing TelecomManager met...Evan Charlton2014-10-021-0/+3
|\ \ \ | |/ /
| * | Add @SystemApi to missing TelecomManager methodsEvan Charlton2014-10-021-0/+3
* | | resolved conflicts for merge of ead63f02 to lmp-mr1-devIhab Awad2014-10-015-11/+114
|\ \ \ | |/ / | | / | |/ |/|
| * Refine implementation of GSM conferences (1/3)Ihab Awad2014-09-305-11/+114
* | Don't print error log if phone account icon is missingSailesh Nepal2014-09-261-1/+6
* | am 5926650d: am 7461b5a0: Merge "Adding support for Cdma conference calling."...Sailesh Nepal2014-09-261-0/+14
|\ \ | |/
| * Adding support for Cdma conference calling.mike dooley2014-09-251-0/+14