{"push_id":1390627569,"size":3,"distinct_size":3,"ref":"refs/heads/master","head":"22b3904998b4709891eaf82a9b7d80fc54af8b04","before":"136d33db9db9cf2e534a140892332eec276b42fd","commits":[{"sha":"f8341dc157cfe4c28a5e31881c407ecac6241ca1","author":{"name":"gitbuildkicker","email":"9b25b6abe487101296afe90396c9eb82d6d0122f@google.com"},"message":"merge in nyc-dr1-release history after reset to nyc-dr1-dev","distinct":true,"url":"https://api.github.com/repos/UBERROMS/packages_services_Telephony/commits/f8341dc157cfe4c28a5e31881c407ecac6241ca1"},{"sha":"45e0fc27cb5ff9804d28c87f3e1e712fe19c1df9","author":{"name":"Tyler Gunn","email":"0395bdd32d364922e9e0ffef0e10702f7b147f7f@google.com"},"message":"Cleanup Connections in conference controllers on CDMA<-->GSM change.\n\nWhen a call switches technology between CDMA and GSM, the\nTelephonyConnectionService will end up re-adding it to the appropriate\nconference controller due to the original connection change.  This is\nproblematic, as it means that the connection will still be tracked by the\nconference controller of its previous technology.  Worse yet, if a call\nmakes a GSM-->CDMA-->GSM transition, it will be added again to the\nGSM call tracker.\n\nThere is still an underlying issue in that the TelephonyConnection subclass\ntype doesn't change when the radio technology changes -- that is a larger\nissue to solve and should be addressed at some point (ie not now).\n\nTo fix this, added code to ensure that connections are removed from other\nconference controllers when added, and also to prevent adding duplicates.\n\nBug: 31288401\nChange-Id: I5e95d4f72be6af473eeec1b92f47ad77a783c9b2\n(cherry picked from commit be89962c279f43a49fd66d8af8345767a9f23039)","distinct":true,"url":"https://api.github.com/repos/UBERROMS/packages_services_Telephony/commits/45e0fc27cb5ff9804d28c87f3e1e712fe19c1df9"},{"sha":"22b3904998b4709891eaf82a9b7d80fc54af8b04","author":{"name":"Chad Cormier Roussel","email":"7b5fc3fd357a716b3b3c66b82dc7702d0aded97e@gmail.com"},"message":"Merge tag 'android-7.1.0_r7' of https://android.googlesource.com/platform/packages/services/Telephony\n\nAndroid 7.1.0 release 7","distinct":true,"url":"https://api.github.com/repos/UBERROMS/packages_services_Telephony/commits/22b3904998b4709891eaf82a9b7d80fc54af8b04"}]}
{"actor":{"display_login":"chadouming"}}