summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fixing a comment (changing phoneId to subId)" into lmp-mr1-devAmit Mahajan2014-11-211-1/+1
|\
| * Fixing a comment (changing phoneId to subId)Amit Mahajan2014-11-181-1/+1
* | Merge "IMS SRVCC handling and call log cleanup." into lmp-mr1-devTyler Gunn2014-11-212-5/+79
|\ \
| * | IMS SRVCC handling and call log cleanup.Tyler Gunn2014-11-202-5/+79
* | | Merge "Use activity as context." into lmp-mr1-devAndrew Lee2014-11-211-5/+9
|\ \ \
| * | | Use activity as context.Andrew Lee2014-11-201-5/+9
* | | | Merge "Revert "Additional changes to SubscriptionManager API as per API counc...Wink Saville2014-11-204-56/+36
|\ \ \ \
| * | | | Revert "Additional changes to SubscriptionManager API as per API council."Wink Saville2014-11-204-56/+36
* | | | | Merge "Additional changes to SubscriptionManager API as per API council." int...Wink Saville2014-11-204-36/+56
|\| | | |
| * | | | Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-194-36/+56
| |/ / /
* | | | Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-devShishir Agrawal2014-11-201-7/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Carrierprivileges: Addressing API council suggestions.Shishir Agrawal2014-11-181-7/+7
* | | | Merge "Create IMSConference to represent IMS conference calls." into lmp-mr1-devTyler Gunn2014-11-207-204/+920
|\ \ \ \
| * | | | Create IMSConference to represent IMS conference calls.Tyler Gunn2014-11-187-204/+920
| |/ / /
* | | | Merge "Set GENERIC_CONFERENCE capability on CDMA conferences." into lmp-mr1-devAndrew Lee2014-11-192-7/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Set GENERIC_CONFERENCE capability on CDMA conferences.Andrew Lee2014-11-182-7/+7
| |/ /
* | | Merge "Change to not allow user to enable/disable LTE if LTE service forced i...Amit Mahajan2014-11-191-7/+38
|\ \ \
| * | | Change to not allow user to enable/disable LTE if LTE service forced is true.Amit Mahajan2014-11-181-7/+38
| |/ /
* | | Merge "Hide carrier related settings if HIDE_CARRIER_NETWORK_SETTINGS is set....Junda Liu2014-11-191-17/+26
|\ \ \ | |/ / |/| |
| * | Hide carrier related settings if HIDE_CARRIER_NETWORK_SETTINGS is set.Junda Liu2014-11-131-17/+26
* | | Merge "Add code to show a message when a conference merge fails." into lmp-mr...Anthony Lee2014-11-183-42/+90
|\ \ \ | |_|/ |/| |
| * | Add code to show a message when a conference merge fails.Anthony Lee2014-11-173-42/+90
* | | Merge "PhoneInterfaceManager: Adding a call to set voicemail number." into lm...Shishir Agrawal2014-11-171-2/+34
|\ \ \ | |/ / |/| |
| * | PhoneInterfaceManager: Adding a call to set voicemail number.Shishir Agrawal2014-11-121-2/+34
* | | Merge "Update DisconnectCause conversion for IMS merges." into lmp-mr1-devAndrew Lee2014-11-171-0/+3
|\ \ \
| * | | Update DisconnectCause conversion for IMS merges.Andrew Lee2014-11-121-0/+3
| |/ /
* | | Merge "Don't create if not primary user" into lmp-mr1-devJay Shrauner2014-11-171-0/+9
|\ \ \
| * | | Don't create if not primary userJay Shrauner2014-11-131-0/+9
| | |/ | |/|
* | | Disable 'Enhanced 4G LTE Mode' setting entry when in a call.Etan Cohen2014-11-141-0/+27
* | | Restored 4G LTE setting for Shamu.PauloftheWest2014-11-141-0/+1
|/ /
* | Merge "Get info from SubInfoRecord for color and icon." into lmp-mr1-devNancy Chen2014-11-121-39/+13
|\ \
| * | Get info from SubInfoRecord for color and icon.Nancy Chen2014-11-121-39/+13
| |/
* | Merge "Handle exceptions other than CommandException" into lmp-mr1-devAnthony Lee2014-11-121-3/+8
|\ \
| * | Handle exceptions other than CommandExceptionAnthony Lee2014-11-121-3/+8
* | | Merge "Created tabs for Multi-SIM Cellular Networks." into lmp-mr1-devPauloftheWest2014-11-122-50/+171
|\ \ \
| * | | Created tabs for Multi-SIM Cellular Networks.PauloftheWest2014-11-122-50/+171
| | |/ | |/|
* | | Merge "Fix NPE in onCreate" into lmp-mr1-devJay Shrauner2014-11-121-1/+1
|\ \ \ | |/ / |/| |
| * | Fix NPE in onCreateJay Shrauner2014-11-111-1/+1
* | | Merge "Update SubscriptionManager API as per API council." into lmp-mr1-devWink Saville2014-11-124-43/+23
|\ \ \
| * | | Update SubscriptionManager API as per API council.Wink Saville2014-11-114-43/+23
| | |/ | |/|
* | | Merge "Hide carrier network settings if HIDE_CARRIER_NETWORK_SETTINGS is 1." ...Junda Liu2014-11-122-32/+3
|\ \ \
| * | | Hide carrier network settings if HIDE_CARRIER_NETWORK_SETTINGS is 1.Junda Liu2014-11-072-32/+3
* | | | Merge "Update CDMA conference capabilities on recalculate." into lmp-mr1-devAndrew Lee2014-11-122-11/+13
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update CDMA conference capabilities on recalculate.Andrew Lee2014-11-102-11/+13
| | |/ | |/|
* / | Update PhoneAccount icon API (6/6)Ihab Awad2014-11-101-4/+1
|/ /
* | Merge "Add utility for voicemail dialogs." into lmp-mr1-devAndrew Lee2014-11-102-101/+129
|\ \
| * | Add utility for voicemail dialogs.Andrew Lee2014-11-072-101/+129
* | | Merge "Make add-call a global property of telecom. (3/4)" into lmp-mr1-devSantos Cordon2014-11-104-6/+0
|\ \ \
| * | | Make add-call a global property of telecom. (3/4)Santos Cordon2014-11-074-6/+0
* | | | Merge "Calculate conferenceable after conference." into lmp-mr1-devSantos Cordon2014-11-101-1/+2
|\ \ \ \