summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-7.1.1_r4' into cm-14.1cm-14.1_prerebaseDan Pasanen2016-12-0516-4/+105
|\ | | | | | | | | | | Android 7.1.1 release 4 Change-Id: Ie00d0a4a9b738531c72a663c22a049c6d6560d5c
| * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-260-0/+0
| |\
| | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-160-0/+0
| | |\
| | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-110-0/+0
| | | |\
| | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-210-0/+0
| | | | |\
| | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-180-0/+0
| | | | | |\
| | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-110-0/+0
| | | | | | |\
| * | | | | | | Bell: enable WPASVineeta Srivastava2016-10-191-1/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bell is going to turn on cmas in near future. Bug: 31316405 Change-Id: I019b70bae1533da87e3ab5c2c75ed8bbcffb296e
| * / / / / / disable LAUNCH_BROWSER for sprintSooraj Sasindran2016-10-141-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LAUNCH BROWSER STK command needs to be disabled as sprint would not want the default behavior. Test: Swapped the sprint sim cards and verified that browser launch do not happen Merged-in: I2cc1978cceca914087399b70cefe78dc62e5c3c5 BUG=31257758 Change-Id: I2cc1978cceca914087399b70cefe78dc62e5c3c5
| * / / / / Removed mms from the metered APN type list for VerizonJack Yu2016-10-103-0/+30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MMS is not charged as data on Verizon network, roaming or not roaming. Test: Manual tested with Vzw SIM. Confirmed sending MMS will not increase the data usage in Settings->Data Usage ->Cellular data usage. bug: 31233558 Change-Id: Iaa44ce5385e845a99ce8149be8353e4bf6fad293
| * | | | Merge "Mark APN fields as uneditable for vzw per their requirement." into ↵TreeHugger Robot2016-09-213-0/+24
| |\ \ \ \ | | | | | | | | | | | | | | | | | | nyc-mr1-dev
| | * | | | Mark APN fields as uneditable for vzw per their requirement.Amit Mahajan2016-09-203-0/+24
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fields marked uneditable are: type, protocol, bearer, carrier_enabled Bug: 30457714 Change-Id: I0d3f1af25e52d48c25ebedfffa37b708dd23fcf5
| * / / / Make APNs read-only for certain carriers.Amit Mahajan2016-09-207-0/+31
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change is for Canadian carriers - Telus, Bell, Rogers, Fido. And Vodafone UK. Bug: 31074581 Bug: 31003310 Change-Id: Ica60905aa0ce3c0c8a635db55c86f31bcc09a9df
| * | | Merge "Fixed that carrier specific messages were not treated as emergency" ↵Jack Yu2016-09-161-3/+3
| |\ \ \ | | | | | | | | | | | | | | | into nyc-mr1-dev
| | * | | Fixed that carrier specific messages were not treated as emergencyJack Yu2016-09-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an emergency flag to other channel managers. The carrier's specific cell broadcast messages can be marked as emergency or non-emergency. bug: 31172048 Change-Id: I77bfd9f32933f3ae136cca8c90ff2f4d65e9a78c
| * | | | Merge "Adding a config to hide the conference 'swap' button for USCC" into ↵Michael Dooley2016-09-151-0/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | nyc-mr1-dev
| | * | | Adding a config to hide the conference 'swap' button for USCCmike dooley2016-09-021-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change the behavior after making a 2nd outgoing call is to show a 'merge' button but no 'swap' button. After receiving a 2nd incoming call there is a 'swap' button but no 'merge' button (same behavior as before). This change affects all users (ie. not just Nova users). Moving this cl from the nyc-dr1-dev branch to nyc-mr1-dev (see ag/1379938) Bug: 31028053 Change-Id: I94297705bfb4223ec99d95e1f59e51d472737d08
| * / / Added SPN override entries for Virgin mobile.Jack Yu2016-09-083-0/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MVNO Virgin mobile shares the same MCC/MNC (234/30, 234/33, 234/38) with EE. The only difference is that Virgin mobile has GID1 2800000. Using carrier config to override the service provider name so Virgin users can see the right SPN displayed. bug: 30209814 Change-Id: Ic012d1f3ed4e910b58fc5655a6b561094c40c2af
* | | Resolve NZ roaming entryAbhisek Devkota2016-11-061-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 53024 force roams on 53001 CYNGNOS-2534 Change-Id: I69ffaa4124489b3dd1b55645ec214f2ab36e4289 (cherry picked from commit 1477e7055a7b8e9ab3b01a34285d38f389002611)
* | | Merge tag 'android-7.1.0_r4' of ↵Steve Kondik2016-10-2542-85/+283
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/CarrierConfig into 71 Android 7.1.0 release 4 Change-Id: Ia17f6e07b39025d6bf9581cc11e12878c7867388
| * \ \ merge in nyc-dr1-release history after reset to nyc-dr1-devgitbuildkicker2016-08-210-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | merge in nyc-dr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-270-0/+0
| | |\ \
| * | \ \ merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-180-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-170-0/+0
| | |\ \ \
| | | * \ \ merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-140-0/+0
| | | |\ \ \
| | | | * | | Use correct SPN format for VZW WFC.Amit Mahajan2016-08-113-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 30474919 Change-Id: I0f0dbda86fb441d2b8c10a2934650b9ecec63e19
| | | | * | | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-110-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-270-0/+0
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | | * | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-240-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-210-0/+0
| | | | | | | |\ \
| | | | | | | | * | merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-200-0/+0
| | | | | | | | |\|
| | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-140-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-130-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * Fix "num" in the carrier config to be 5 vs 4.Tyler Gunn2016-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I95035c8dc113e0a984fa57d3c9aebe6117481ec2
| | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-07-120-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devThe Android Automerger2016-06-280-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Disallow merge of wifi calls when vowifi off for VZW.Tyler Gunn2016-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 29059073 Change-Id: I167f21f2d08c814da5cc04a5cf956dd4c826c849
| | | | | | | | | | | | | * Make the WFC prefence non-editable for Verizon.pkanwar2016-06-233-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/28989849: The default WiFi calling preference for Verizon should be cellular preferred per Carrier Requirements. Change-Id: Ief9c01e2fee918942580296c2fa3159ce2a7f8a3
| | | | | | | | | | | | | * Enabled carrier logic for Verizon.Tyler Gunn2016-06-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 29275420 Change-Id: Ie7f562257a48c5af737b7072e73acb963fba9b6c
| * | | | | | | | | | | | | Merge "Add config for notifying of handover from wifi to LTE." into nyc-mr1-devTyler Gunn2016-08-171-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Add config for notifying of handover from wifi to LTE.Tyler Gunn2016-08-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For VZW, turn on option to notify the user when a video call hands over from wifi to LTE. Change-Id: Id5097b5308d08e2d2e560e999dc69fde73421982
| * | | | | | | | | | | | | Merge "Add CNAP filtering String array to 311480" into nyc-mr1-devBrad Ebinger2016-08-161-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Add CNAP filtering String array to 311480Brad Ebinger2016-08-161-0/+4
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a CNAP filtering String array to 311480 in order to filter out CNAP caller id information that is not helpful. Bug: 30142293 Change-Id: Ic3f81afb571b335bfc82949772d418360a70fcf0
| * / / / / / / / / / / / Disable support for downgrade from video to audio for VZW.Tyler Gunn2016-08-121-0/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 30702393 Change-Id: I36e415465c00150830566fa239531ed07ab690eb
| * | | | | | | | | | | Merge "Adding another simultaneous call limit mapping for VZW." into nyc-mr1-devTyler Gunn2016-08-121-1/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Adding another simultaneous call limit mapping for VZW.Tyler Gunn2016-08-101-1/+2
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 30793629 Change-Id: I0ad29427b6db1797b45575a93e55f6e4b7edaf19
| * | | | | | | | | | | Use correct SPN format for VZW WFC.Amit Mahajan2016-08-113-0/+3
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 30474919 Change-Id: I0f0dbda86fb441d2b8c10a2934650b9ecec63e19
| * | | | | | | | | | Enable VT handover to wifi checking for VZW.Tyler Gunn2016-08-091-0/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 30697460 Change-Id: I73e7aa86d283b869c1cea0663699cba64b528d5b
| * / / / / / / / / Add more disconnect code mapping for multi-endpoint.Tyler Gunn2016-07-221-1/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding what should be the final remapping for disconnect causes for multi-endpoint. These are based on observations in testing. Bug: 28813047 Change-Id: I19c78671458258e6030ea59297807ab1f85eeb4b
| * | | | | | | | Merge "Adds option to not support hold during IMS calls" into nyc-mr1-devBrad Ebinger2016-07-211-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |