135474 2014-07-31 14:38:13 -0700 Remove shadowPseudoId() override from the shadow media controls 2014-07-31 20:44:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim jer.noble philipj sergio oldest_to_newest 1026067 0 benjamin 2014-07-31 14:38:13 -0700 Remove shadowPseudoId() override from the shadow media controls 1026069 1 235844 benjamin 2014-07-31 14:38:45 -0700 Created attachment 235844 Patch 1026177 2 235844 benjamin 2014-07-31 20:44:06 -0700 Comment on attachment 235844 Patch Clearing flags on attachment: 235844 Committed r171907: <http://trac.webkit.org/changeset/171907> 1026178 3 benjamin 2014-07-31 20:44:09 -0700 All reviewed patches have been landed. Closing bug. 235844 2014-07-31 14:38:45 -0700 2014-07-31 20:44:05 -0700 Patch bug-135474-20140731143727.patch text/plain 38908 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxODM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjM0MWY1Mzk5MDA1ZTNm NjYyZTliNTEyOGFjNjI2ZTdmZDcyNDUzYy4uYjExODY5ODg1ODcxOTg5MGU3NTFjNDM1YjAyNTkz N2E2NTVkNzg3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDczIEBACisyMDE0LTA3LTMxICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSBzaGFk b3dQc2V1ZG9JZCgpIG92ZXJyaWRlIGZyb20gdGhlIHNoYWRvdyBtZWRpYSBjb250cm9scworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1NDc0CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU21hbGwgY2xlYW51 cC4KKworICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5oOgor ICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6TWVkaWFDb250cm9sUGFuZWxFbGVt ZW50KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFBhbmVsRW5jbG9zdXJlRWxlbWVu dDo6TWVkaWFDb250cm9sUGFuZWxFbmNsb3N1cmVFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhQ29udHJvbE92ZXJsYXlFbmNsb3N1cmVFbGVtZW50OjpNZWRpYUNvbnRyb2xPdmVybGF5 RW5jbG9zdXJlRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xUaW1lbGlu ZUNvbnRhaW5lckVsZW1lbnQ6Ok1lZGlhQ29udHJvbFRpbWVsaW5lQ29udGFpbmVyRWxlbWVudCk6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xWb2x1bWVTbGlkZXJDb250YWluZXJFbGVt ZW50OjpNZWRpYUNvbnRyb2xWb2x1bWVTbGlkZXJDb250YWluZXJFbGVtZW50KToKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhQ29udHJvbFN0YXR1c0Rpc3BsYXlFbGVtZW50OjpNZWRpYUNvbnRyb2xT dGF0dXNEaXNwbGF5RWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQYW5l bE11dGVCdXR0b25FbGVtZW50OjpNZWRpYUNvbnRyb2xQYW5lbE11dGVCdXR0b25FbGVtZW50KToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFZvbHVtZVNsaWRlck11dGVCdXR0b25FbGVt ZW50OjpNZWRpYUNvbnRyb2xWb2x1bWVTbGlkZXJNdXRlQnV0dG9uRWxlbWVudCk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQbGF5QnV0dG9uRWxlbWVudDo6TWVkaWFDb250cm9sUGxh eUJ1dHRvbkVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sT3ZlcmxheVBs YXlCdXR0b25FbGVtZW50OjpNZWRpYUNvbnRyb2xPdmVybGF5UGxheUJ1dHRvbkVsZW1lbnQpOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sU2Vla0ZvcndhcmRCdXR0b25FbGVtZW50OjpN ZWRpYUNvbnRyb2xTZWVrRm9yd2FyZEJ1dHRvbkVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFDb250cm9sU2Vla0JhY2tCdXR0b25FbGVtZW50OjpNZWRpYUNvbnRyb2xTZWVrQmFja0J1 dHRvbkVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUmV3aW5kQnV0dG9u RWxlbWVudDo6TWVkaWFDb250cm9sUmV3aW5kQnV0dG9uRWxlbWVudCk6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYUNvbnRyb2xSZXR1cm5Ub1JlYWx0aW1lQnV0dG9uRWxlbWVudDo6TWVkaWFDb250 cm9sUmV0dXJuVG9SZWFsdGltZUJ1dHRvbkVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFDb250cm9sVG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCdXR0b25FbGVtZW50OjpNZWRpYUNvbnRyb2xU b2dnbGVDbG9zZWRDYXB0aW9uc0J1dHRvbkVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFDb250cm9sQ2xvc2VkQ2FwdGlvbnNDb250YWluZXJFbGVtZW50OjpNZWRpYUNvbnRyb2xDbG9z ZWRDYXB0aW9uc0NvbnRhaW5lckVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250 cm9sQ2xvc2VkQ2FwdGlvbnNUcmFja0xpc3RFbGVtZW50OjpNZWRpYUNvbnRyb2xDbG9zZWRDYXB0 aW9uc1RyYWNrTGlzdEVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGlt ZWxpbmVFbGVtZW50OjpNZWRpYUNvbnRyb2xUaW1lbGluZUVsZW1lbnQpOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFDb250cm9sUGFuZWxWb2x1bWVTbGlkZXJFbGVtZW50OjpNZWRpYUNvbnRyb2xQ YW5lbFZvbHVtZVNsaWRlckVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9s RnVsbHNjcmVlblZvbHVtZVNsaWRlckVsZW1lbnQ6Ok1lZGlhQ29udHJvbEZ1bGxzY3JlZW5Wb2x1 bWVTbGlkZXJFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbEZ1bGxzY3Jl ZW5CdXR0b25FbGVtZW50OjpNZWRpYUNvbnRyb2xGdWxsc2NyZWVuQnV0dG9uRWxlbWVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1lTWluQnV0dG9uRWxl bWVudDo6TWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZU1pbkJ1dHRvbkVsZW1lbnQpOgorICAg ICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZU1heEJ1dHRvbkVsZW1l bnQ6Ok1lZGlhQ29udHJvbEZ1bGxzY3JlZW5Wb2x1bWVNYXhCdXR0b25FbGVtZW50KToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFRpbWVSZW1haW5pbmdEaXNwbGF5RWxlbWVudDo6TWVk aWFDb250cm9sVGltZVJlbWFpbmluZ0Rpc3BsYXlFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhQ29udHJvbEN1cnJlbnRUaW1lRGlzcGxheUVsZW1lbnQ6Ok1lZGlhQ29udHJvbEN1cnJl bnRUaW1lRGlzcGxheUVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4 dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxl bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6OnNoYWRv d1BzZXVkb0lkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFBhbmVs RW5jbG9zdXJlRWxlbWVudDo6c2hhZG93UHNldWRvSWQpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFDb250cm9sT3ZlcmxheUVuY2xvc3VyZUVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lk KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFRpbWVsaW5lQ29udGFp bmVyRWxlbWVudDo6c2hhZG93UHNldWRvSWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFDb250cm9sVm9sdW1lU2xpZGVyQ29udGFpbmVyRWxlbWVudDo6c2hhZG93UHNldWRvSWQp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sU3RhdHVzRGlzcGxheUVs ZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh Q29udHJvbFBhbmVsTXV0ZUJ1dHRvbkVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFZvbHVtZVNsaWRlck11dGVCdXR0b25FbGVt ZW50OjpzaGFkb3dQc2V1ZG9JZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNv bnRyb2xQbGF5QnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFDb250cm9sT3ZlcmxheVBsYXlCdXR0b25FbGVtZW50OjpzaGFkb3dQ c2V1ZG9JZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xTZWVrRm9y d2FyZEJ1dHRvbkVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhQ29udHJvbFNlZWtCYWNrQnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUmV3aW5kQnV0dG9uRWxl bWVudDo6c2hhZG93UHNldWRvSWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFD b250cm9sUmV0dXJuVG9SZWFsdGltZUJ1dHRvbkVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFRvZ2dsZUNsb3NlZENhcHRpb25z QnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFDb250cm9sQ2xvc2VkQ2FwdGlvbnNDb250YWluZXJFbGVtZW50OjpzaGFkb3dQc2V1 ZG9JZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xDbG9zZWRDYXB0 aW9uc1RyYWNrTGlzdEVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhQ29udHJvbFRpbWVsaW5lRWxlbWVudDo6c2hhZG93UHNldWRvSWQpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUGFuZWxWb2x1bWVTbGlkZXJF bGVtZW50OjpzaGFkb3dQc2V1ZG9JZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpNZWRp YUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1lU2xpZGVyRWxlbWVudDo6c2hhZG93UHNldWRvSWQpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sRnVsbHNjcmVlbkJ1dHRvbkVs ZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh Q29udHJvbEZ1bGxzY3JlZW5Wb2x1bWVNaW5CdXR0b25FbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1l TWF4QnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFDb250cm9sVGltZVJlbWFpbmluZ0Rpc3BsYXlFbGVtZW50OjpzaGFkb3dQc2V1 ZG9JZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xDdXJyZW50VGlt ZURpc3BsYXlFbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50Ojp0ZXh0VHJhY2tDb250 YWluZXJFbGVtZW50U2hhZG93UHNldWRvSWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6c2hhZG93UHNldWRvSWQpOiBE ZWxldGVkLgorICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmg6Cisg ICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFDb250cm9scy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYUNvbnRyb2xzOjpNZWRpYUNvbnRyb2xzKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh Q29udHJvbHM6OnNoYWRvd1BzZXVkb0lkKTogRGVsZXRlZC4KKyAgICAgICAgKiBodG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xzLmg6CisKIDIwMTQtMDctMzAgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5q YW1pbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEVsZW1lbnRSdWxlQ29sbGVjdG9yOiBncm91cCB0 aGUgc2hhZG93IHRyZWUgY29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFk b3cvTWVkaWFDb250cm9sRWxlbWVudFR5cGVzLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xFbGVtZW50VHlwZXMuaAppbmRleCA1Y2NlNjY5NDBhNzU4YjA3NDMxNjQ5 NzIwNDBiMmM1OTYzN2JkOTBlLi5hMzViNDUwYWI2NWNiMmFhMjlhNDNjMDBhOWQ1ODkyNDNkZTQ0 MjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xF bGVtZW50VHlwZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRy b2xFbGVtZW50VHlwZXMuaApAQCAtODgsNyArODgsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBi b29sIGlzU2hvd2luZygpIGNvbnN0OwogCiAgICAgdmlydHVhbCBNZWRpYUNvbnRyb2xFbGVtZW50 VHlwZSBkaXNwbGF5VHlwZSgpIHsgcmV0dXJuIG1fZGlzcGxheVR5cGU7IH0KLSAgICB2aXJ0dWFs IGNvbnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNldWRvSWQoKSBjb25zdCA9IDA7CiAKICAgICB2 aXJ0dWFsIHZvaWQgc2V0TWVkaWFDb250cm9sbGVyKE1lZGlhQ29udHJvbGxlckludGVyZmFjZSog Y29udHJvbGxlcikgeyBtX21lZGlhQ29udHJvbGxlciA9IGNvbnRyb2xsZXI7IH0KICAgICB2aXJ0 dWFsIE1lZGlhQ29udHJvbGxlckludGVyZmFjZSogbWVkaWFDb250cm9sbGVyKCkgY29uc3QgeyBy ZXR1cm4gbV9tZWRpYUNvbnRyb2xsZXI7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv c2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAppbmRleCA4YWRiNzkwMGFkYzQzY2FmZWY1 NDRlN2M4NDU1YTgwZTNjN2RlMjE3Li40ZjQzNWMyMDlkZDFkZWQxYzk3MDJiMTAwYTJmYTBlZjJk ZmMxMDdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRy b2xFbGVtZW50cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250 cm9sRWxlbWVudHMuY3BwCkBAIC03NSw3ICs3NSw3IEBAIE1lZGlhQ29udHJvbFBhbmVsRWxlbWVu dDo6TWVkaWFDb250cm9sUGFuZWxFbGVtZW50KERvY3VtZW50JiBkb2N1bWVudCkKICAgICAsIG1f b3BhcXVlKHRydWUpCiAgICAgLCBtX3RyYW5zaXRpb25UaW1lcih0aGlzLCAmTWVkaWFDb250cm9s UGFuZWxFbGVtZW50Ojp0cmFuc2l0aW9uVGltZXJGaXJlZCkKIHsKLSAgICBzZXRQc2V1ZG8oc2hh ZG93UHNldWRvSWQoKSk7CisgICAgc2V0UHNldWRvKEF0b21pY1N0cmluZygiLXdlYmtpdC1tZWRp YS1jb250cm9scy1wYW5lbCIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsK IH0KIAogUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ+IE1lZGlhQ29udHJvbFBh bmVsRWxlbWVudDo6Y3JlYXRlKERvY3VtZW50JiBkb2N1bWVudCkKQEAgLTgzLDEyICs4Myw2IEBA IFBhc3NSZWZQdHI8TWVkaWFDb250cm9sUGFuZWxFbGVtZW50PiBNZWRpYUNvbnRyb2xQYW5lbEVs ZW1lbnQ6OmNyZWF0ZShEb2N1bWVudCYKICAgICByZXR1cm4gYWRvcHRSZWYobmV3IE1lZGlhQ29u dHJvbFBhbmVsRWxlbWVudChkb2N1bWVudCkpOwogfQogCi1jb25zdCBBdG9taWNTdHJpbmcmIE1l ZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAotewotICAgIERF UFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIGlkLCAoIi13ZWJraXQt bWVkaWEtY29udHJvbHMtcGFuZWwiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFs KSk7Ci0gICAgcmV0dXJuIGlkOwotfQotCiB2b2lkIE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6 c3RhcnREcmFnKGNvbnN0IExheW91dFBvaW50JiBldmVudExvY2F0aW9uKQogewogICAgIGlmICgh bV9jYW5CZURyYWdnZWQpCkBAIC0yNjMsNyArMjU3LDcgQEAgTWVkaWFDb250cm9sUGFuZWxFbmNs b3N1cmVFbGVtZW50OjpNZWRpYUNvbnRyb2xQYW5lbEVuY2xvc3VyZUVsZW1lbnQoRG9jdW1lbnQm IGQKICAgICAvLyBNYXBwaW5nIG9udG8gc2FtZSBNZWRpYUNvbnRyb2xFbGVtZW50VHlwZSBhcyBw YW5lbCBlbGVtZW50LCBzaW5jZSBpdCBoYXMgc2ltaWxhciBwcm9wZXJ0aWVzLgogICAgIDogTWVk aWFDb250cm9sRGl2RWxlbWVudChkb2N1bWVudCwgTWVkaWFDb250cm9sc1BhbmVsKQogewotICAg IHNldFBzZXVkbyhzaGFkb3dQc2V1ZG9JZCgpKTsKKyAgICBzZXRQc2V1ZG8oQXRvbWljU3RyaW5n KCItd2Via2l0LW1lZGlhLWNvbnRyb2xzLWVuY2xvc3VyZSIsIEF0b21pY1N0cmluZzo6Q29uc3Ry dWN0RnJvbUxpdGVyYWwpKTsKIH0KIAogUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xQYW5lbEVuY2xv c3VyZUVsZW1lbnQ+IE1lZGlhQ29udHJvbFBhbmVsRW5jbG9zdXJlRWxlbWVudDo6Y3JlYXRlKERv Y3VtZW50JiBkb2N1bWVudCkKQEAgLTI3MSwxOCArMjY1LDEzIEBAIFBhc3NSZWZQdHI8TWVkaWFD b250cm9sUGFuZWxFbmNsb3N1cmVFbGVtZW50PiBNZWRpYUNvbnRyb2xQYW5lbEVuY2xvc3VyZUVs ZW1lbnQ6CiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBNZWRpYUNvbnRyb2xQYW5lbEVuY2xvc3Vy ZUVsZW1lbnQoZG9jdW1lbnQpKTsKIH0KIAotY29uc3QgQXRvbWljU3RyaW5nJiBNZWRpYUNvbnRy b2xQYW5lbEVuY2xvc3VyZUVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKCkgY29uc3QKLXsKLSAgICBE RVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCBpZCwgKCItd2Via2l0 LW1lZGlhLWNvbnRyb2xzLWVuY2xvc3VyZSIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxp dGVyYWwpKTsKLSAgICByZXR1cm4gaWQ7Ci19Ci0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KIAogTWVkaWFDb250cm9sT3ZlcmxheUVuY2xvc3VyZUVsZW1lbnQ6Ok1lZGlhQ29udHJv bE92ZXJsYXlFbmNsb3N1cmVFbGVtZW50KERvY3VtZW50JiBkb2N1bWVudCkKICAgICAvLyBNYXBw aW5nIG9udG8gc2FtZSBNZWRpYUNvbnRyb2xFbGVtZW50VHlwZSBhcyBwYW5lbCBlbGVtZW50LCBz aW5jZSBpdCBoYXMgc2ltaWxhciBwcm9wZXJ0aWVzLgogICAgIDogTWVkaWFDb250cm9sRGl2RWxl bWVudChkb2N1bWVudCwgTWVkaWFDb250cm9sc1BhbmVsKQogeworICAgIHNldFBzZXVkbyhBdG9t aWNTdHJpbmcoIi13ZWJraXQtbWVkaWEtY29udHJvbHMtb3ZlcmxheS1lbmNsb3N1cmUiLCBBdG9t aWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7CiB9CiAKIFBhc3NSZWZQdHI8TWVkaWFD b250cm9sT3ZlcmxheUVuY2xvc3VyZUVsZW1lbnQ+IE1lZGlhQ29udHJvbE92ZXJsYXlFbmNsb3N1 cmVFbGVtZW50OjpjcmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50KQpAQCAtMjkwLDE4ICsyNzksMTIg QEAgUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xPdmVybGF5RW5jbG9zdXJlRWxlbWVudD4gTWVkaWFD b250cm9sT3ZlcmxheUVuY2xvc3VyZUVsZW0KICAgICByZXR1cm4gYWRvcHRSZWYobmV3IE1lZGlh Q29udHJvbE92ZXJsYXlFbmNsb3N1cmVFbGVtZW50KGRvY3VtZW50KSk7CiB9CiAKLWNvbnN0IEF0 b21pY1N0cmluZyYgTWVkaWFDb250cm9sT3ZlcmxheUVuY2xvc3VyZUVsZW1lbnQ6OnNoYWRvd1Bz ZXVkb0lkKCkgY29uc3QKLXsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoQXRv bWljU3RyaW5nLCBpZCwgKCItd2Via2l0LW1lZGlhLWNvbnRyb2xzLW92ZXJsYXktZW5jbG9zdXJl IiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwotICAgIHJldHVybiBpZDsK LX0KLQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiBNZWRpYUNvbnRyb2xUaW1l bGluZUNvbnRhaW5lckVsZW1lbnQ6Ok1lZGlhQ29udHJvbFRpbWVsaW5lQ29udGFpbmVyRWxlbWVu dChEb2N1bWVudCYgZG9jdW1lbnQpCiAgICAgOiBNZWRpYUNvbnRyb2xEaXZFbGVtZW50KGRvY3Vt ZW50LCBNZWRpYVRpbWVsaW5lQ29udGFpbmVyKQogewotICAgIHNldFBzZXVkbyhzaGFkb3dQc2V1 ZG9JZCgpKTsKKyAgICBzZXRQc2V1ZG8oQXRvbWljU3RyaW5nKCItd2Via2l0LW1lZGlhLWNvbnRy b2xzLXRpbWVsaW5lLWNvbnRhaW5lciIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVy YWwpKTsKIH0KIAogUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xUaW1lbGluZUNvbnRhaW5lckVsZW1l bnQ+IE1lZGlhQ29udHJvbFRpbWVsaW5lQ29udGFpbmVyRWxlbWVudDo6Y3JlYXRlKERvY3VtZW50 JiBkb2N1bWVudCkKQEAgLTMxMSwxMiArMjk0LDYgQEAgUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xU aW1lbGluZUNvbnRhaW5lckVsZW1lbnQ+IE1lZGlhQ29udHJvbFRpbWVsaW5lQ29udGFpbmVyRWwK ICAgICByZXR1cm4gZWxlbWVudC5yZWxlYXNlKCk7CiB9CiAKLWNvbnN0IEF0b21pY1N0cmluZyYg TWVkaWFDb250cm9sVGltZWxpbmVDb250YWluZXJFbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCgpIGNv bnN0Ci17Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywg aWQsICgiLXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZS1jb250YWluZXIiLCBBdG9taWNT dHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7Ci0gICAgcmV0dXJuIGlkOwotfQotCiB2b2lk IE1lZGlhQ29udHJvbFRpbWVsaW5lQ29udGFpbmVyRWxlbWVudDo6c2V0VGltZURpc3BsYXlzSGlk ZGVuKGJvb2wgaGlkZGVuKQogewogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBjaGlsZE5v ZGVDb3VudCgpOyArK2kpIHsKQEAgLTM0Niw3ICszMjMsNyBAQCBSZW5kZXJQdHI8UmVuZGVyRWxl bWVudD4gTWVkaWFDb250cm9sVGltZWxpbmVDb250YWluZXJFbGVtZW50OjpjcmVhdGVFbGVtZW50 UmVuZAogTWVkaWFDb250cm9sVm9sdW1lU2xpZGVyQ29udGFpbmVyRWxlbWVudDo6TWVkaWFDb250 cm9sVm9sdW1lU2xpZGVyQ29udGFpbmVyRWxlbWVudChEb2N1bWVudCYgZG9jdW1lbnQpCiAgICAg OiBNZWRpYUNvbnRyb2xEaXZFbGVtZW50KGRvY3VtZW50LCBNZWRpYVZvbHVtZVNsaWRlckNvbnRh aW5lcikKIHsKLSAgICBzZXRQc2V1ZG8oc2hhZG93UHNldWRvSWQoKSk7CisgICAgc2V0UHNldWRv KEF0b21pY1N0cmluZygiLXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyLWNvbnRh aW5lciIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKIH0KIAogUGFzc1Jl ZlB0cjxNZWRpYUNvbnRyb2xWb2x1bWVTbGlkZXJDb250YWluZXJFbGVtZW50PiBNZWRpYUNvbnRy b2xWb2x1bWVTbGlkZXJDb250YWluZXJFbGVtZW50OjpjcmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50 KQpAQCAtMzc4LDE5ICszNTUsMTMgQEAgdm9pZCBNZWRpYUNvbnRyb2xWb2x1bWVTbGlkZXJDb250 YWluZXJFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKICAgICBoaWRl KCk7CiB9CiAKLWNvbnN0IEF0b21pY1N0cmluZyYgTWVkaWFDb250cm9sVm9sdW1lU2xpZGVyQ29u dGFpbmVyRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAotewotICAgIERFUFJFQ0FURURf REVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIGlkLCAoIi13ZWJraXQtbWVkaWEtY29u dHJvbHMtdm9sdW1lLXNsaWRlci1jb250YWluZXIiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZy b21MaXRlcmFsKSk7Ci0gICAgcmV0dXJuIGlkOwotfQotCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAKIE1lZGlhQ29udHJvbFN0YXR1c0Rpc3BsYXlFbGVtZW50OjpNZWRpYUNvbnRy b2xTdGF0dXNEaXNwbGF5RWxlbWVudChEb2N1bWVudCYgZG9jdW1lbnQpCiAgICAgOiBNZWRpYUNv bnRyb2xEaXZFbGVtZW50KGRvY3VtZW50LCBNZWRpYVN0YXR1c0Rpc3BsYXkpCiAgICAgLCBtX3N0 YXRlQmVpbmdEaXNwbGF5ZWQoTm90aGluZykKIHsKLSAgICBzZXRQc2V1ZG8oc2hhZG93UHNldWRv SWQoKSk7CisgICAgc2V0UHNldWRvKEF0b21pY1N0cmluZygiLXdlYmtpdC1tZWRpYS1jb250cm9s cy1zdGF0dXMtZGlzcGxheSIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsK IH0KIAogUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xTdGF0dXNEaXNwbGF5RWxlbWVudD4gTWVkaWFD b250cm9sU3RhdHVzRGlzcGxheUVsZW1lbnQ6OmNyZWF0ZShEb2N1bWVudCYgZG9jdW1lbnQpCkBA IC00MzMsMjAgKzQwNCwxMyBAQCB2b2lkIE1lZGlhQ29udHJvbFN0YXR1c0Rpc3BsYXlFbGVtZW50 Ojp1cGRhdGUoKQogICAgIH0KIH0KIAotY29uc3QgQXRvbWljU3RyaW5nJiBNZWRpYUNvbnRyb2xT dGF0dXNEaXNwbGF5RWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAotewotICAgIERFUFJF Q0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIGlkLCAoIi13ZWJraXQtbWVk aWEtY29udHJvbHMtc3RhdHVzLWRpc3BsYXkiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21M aXRlcmFsKSk7Ci0gICAgcmV0dXJuIGlkOwotfQotCi0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIAogTWVkaWFDb250cm9sUGFuZWxNdXRlQnV0dG9uRWxlbWVudDo6TWVkaWFDb250 cm9sUGFuZWxNdXRlQnV0dG9uRWxlbWVudChEb2N1bWVudCYgZG9jdW1lbnQsIE1lZGlhQ29udHJv bHMqIGNvbnRyb2xzKQogICAgIDogTWVkaWFDb250cm9sTXV0ZUJ1dHRvbkVsZW1lbnQoZG9jdW1l bnQsIE1lZGlhTXV0ZUJ1dHRvbikKICAgICAsIG1fY29udHJvbHMoY29udHJvbHMpCiB7Ci0gICAg c2V0UHNldWRvKHNoYWRvd1BzZXVkb0lkKCkpOworICAgIHNldFBzZXVkbyhBdG9taWNTdHJpbmco Ii13ZWJraXQtbWVkaWEtY29udHJvbHMtbXV0ZS1idXR0b24iLCBBdG9taWNTdHJpbmc6OkNvbnN0 cnVjdEZyb21MaXRlcmFsKSk7CiB9CiAKIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sUGFuZWxNdXRl QnV0dG9uRWxlbWVudD4gTWVkaWFDb250cm9sUGFuZWxNdXRlQnV0dG9uRWxlbWVudDo6Y3JlYXRl KERvY3VtZW50JiBkb2N1bWVudCwgTWVkaWFDb250cm9scyogY29udHJvbHMpCkBAIC00NjcsMTgg KzQzMSwxMiBAQCB2b2lkIE1lZGlhQ29udHJvbFBhbmVsTXV0ZUJ1dHRvbkVsZW1lbnQ6OmRlZmF1 bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQogICAgIE1lZGlhQ29udHJvbE11dGVCdXR0b25F bGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKGV2ZW50KTsKIH0KIAotY29uc3QgQXRvbWljU3Ry aW5nJiBNZWRpYUNvbnRyb2xQYW5lbE11dGVCdXR0b25FbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCgp IGNvbnN0Ci17Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmlu ZywgaWQsICgiLXdlYmtpdC1tZWRpYS1jb250cm9scy1tdXRlLWJ1dHRvbiIsIEF0b21pY1N0cmlu Zzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICByZXR1cm4gaWQ7Ci19Ci0KIC8vIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogTWVkaWFDb250cm9sVm9sdW1lU2xpZGVyTXV0ZUJ1 dHRvbkVsZW1lbnQ6Ok1lZGlhQ29udHJvbFZvbHVtZVNsaWRlck11dGVCdXR0b25FbGVtZW50KERv Y3VtZW50JiBkb2N1bWVudCkKICAgICA6IE1lZGlhQ29udHJvbE11dGVCdXR0b25FbGVtZW50KGRv Y3VtZW50LCBNZWRpYU11dGVCdXR0b24pCiB7Ci0gICAgc2V0UHNldWRvKHNoYWRvd1BzZXVkb0lk KCkpOworICAgIHNldFBzZXVkbyhBdG9taWNTdHJpbmcoIi13ZWJraXQtbWVkaWEtY29udHJvbHMt dm9sdW1lLXNsaWRlci1tdXRlLWJ1dHRvbiIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxp dGVyYWwpKTsKIH0KIAogUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xWb2x1bWVTbGlkZXJNdXRlQnV0 dG9uRWxlbWVudD4gTWVkaWFDb250cm9sVm9sdW1lU2xpZGVyTXV0ZUJ1dHRvbkVsZW1lbnQ6OmNy ZWF0ZShEb2N1bWVudCYgZG9jdW1lbnQpCkBAIC00ODksMTggKzQ0NywxMiBAQCBQYXNzUmVmUHRy PE1lZGlhQ29udHJvbFZvbHVtZVNsaWRlck11dGVCdXR0b25FbGVtZW50PiBNZWRpYUNvbnRyb2xW b2x1bWVTbGlkZXJNdQogICAgIHJldHVybiBidXR0b24ucmVsZWFzZSgpOwogfQogCi1jb25zdCBB dG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbFZvbHVtZVNsaWRlck11dGVCdXR0b25FbGVtZW50Ojpz aGFkb3dQc2V1ZG9JZCgpIGNvbnN0Ci17Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xP Q0FMKEF0b21pY1N0cmluZywgaWQsICgiLXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xp ZGVyLW11dGUtYnV0dG9uIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwot ICAgIHJldHVybiBpZDsKLX0KLQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiBN ZWRpYUNvbnRyb2xQbGF5QnV0dG9uRWxlbWVudDo6TWVkaWFDb250cm9sUGxheUJ1dHRvbkVsZW1l bnQoRG9jdW1lbnQmIGRvY3VtZW50KQogICAgIDogTWVkaWFDb250cm9sSW5wdXRFbGVtZW50KGRv Y3VtZW50LCBNZWRpYVBsYXlCdXR0b24pCiB7Ci0gICAgc2V0UHNldWRvKHNoYWRvd1BzZXVkb0lk KCkpOworICAgIHNldFBzZXVkbyhBdG9taWNTdHJpbmcoIi13ZWJraXQtbWVkaWEtY29udHJvbHMt cGxheS1idXR0b24iLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7CiB9CiAK IFBhc3NSZWZQdHI8TWVkaWFDb250cm9sUGxheUJ1dHRvbkVsZW1lbnQ+IE1lZGlhQ29udHJvbFBs YXlCdXR0b25FbGVtZW50OjpjcmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50KQpAQCAtNTI5LDE4ICs0 ODEsMTIgQEAgdm9pZCBNZWRpYUNvbnRyb2xQbGF5QnV0dG9uRWxlbWVudDo6dXBkYXRlRGlzcGxh eVR5cGUoKQogICAgIHNldERpc3BsYXlUeXBlKG1lZGlhQ29udHJvbGxlcigpLT5jYW5QbGF5KCkg PyBNZWRpYVBsYXlCdXR0b24gOiBNZWRpYVBhdXNlQnV0dG9uKTsKIH0KIAotY29uc3QgQXRvbWlj U3RyaW5nJiBNZWRpYUNvbnRyb2xQbGF5QnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBj b25zdAotewotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcs IGlkLCAoIi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGxheS1idXR0b24iLCBBdG9taWNTdHJpbmc6 OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7Ci0gICAgcmV0dXJuIGlkOwotfQotCiAvLyAtLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIE1lZGlhQ29udHJvbE92ZXJsYXlQbGF5QnV0dG9uRWxl bWVudDo6TWVkaWFDb250cm9sT3ZlcmxheVBsYXlCdXR0b25FbGVtZW50KERvY3VtZW50JiBkb2N1 bWVudCkKICAgICA6IE1lZGlhQ29udHJvbElucHV0RWxlbWVudChkb2N1bWVudCwgTWVkaWFPdmVy bGF5UGxheUJ1dHRvbikKIHsKLSAgICBzZXRQc2V1ZG8oc2hhZG93UHNldWRvSWQoKSk7CisgICAg c2V0UHNldWRvKEF0b21pY1N0cmluZygiLXdlYmtpdC1tZWRpYS1jb250cm9scy1vdmVybGF5LXBs YXktYnV0dG9uIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwogfQogCiBQ YXNzUmVmUHRyPE1lZGlhQ29udHJvbE92ZXJsYXlQbGF5QnV0dG9uRWxlbWVudD4gTWVkaWFDb250 cm9sT3ZlcmxheVBsYXlCdXR0b25FbGVtZW50OjpjcmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50KQpA QCAtNTY5LDE5ICs1MTUsMTIgQEAgdm9pZCBNZWRpYUNvbnRyb2xPdmVybGF5UGxheUJ1dHRvbkVs ZW1lbnQ6OnVwZGF0ZURpc3BsYXlUeXBlKCkKICAgICAgICAgaGlkZSgpOwogfQogCi1jb25zdCBB dG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbE92ZXJsYXlQbGF5QnV0dG9uRWxlbWVudDo6c2hhZG93 UHNldWRvSWQoKSBjb25zdAotewotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChB dG9taWNTdHJpbmcsIGlkLCAoIi13ZWJraXQtbWVkaWEtY29udHJvbHMtb3ZlcmxheS1wbGF5LWJ1 dHRvbiIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICByZXR1cm4g aWQ7Ci19Ci0KLQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiBNZWRpYUNvbnRy b2xTZWVrRm9yd2FyZEJ1dHRvbkVsZW1lbnQ6Ok1lZGlhQ29udHJvbFNlZWtGb3J3YXJkQnV0dG9u RWxlbWVudChEb2N1bWVudCYgZG9jdW1lbnQpCiAgICAgOiBNZWRpYUNvbnRyb2xTZWVrQnV0dG9u RWxlbWVudChkb2N1bWVudCwgTWVkaWFTZWVrRm9yd2FyZEJ1dHRvbikKIHsKLSAgICBzZXRQc2V1 ZG8oc2hhZG93UHNldWRvSWQoKSk7CisgICAgc2V0UHNldWRvKEF0b21pY1N0cmluZygiLXdlYmtp dC1tZWRpYS1jb250cm9scy1zZWVrLWZvcndhcmQtYnV0dG9uIiwgQXRvbWljU3RyaW5nOjpDb25z dHJ1Y3RGcm9tTGl0ZXJhbCkpOwogfQogCiBQYXNzUmVmUHRyPE1lZGlhQ29udHJvbFNlZWtGb3J3 YXJkQnV0dG9uRWxlbWVudD4gTWVkaWFDb250cm9sU2Vla0ZvcndhcmRCdXR0b25FbGVtZW50Ojpj cmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50KQpAQCAtNTkyLDE4ICs1MzEsMTIgQEAgUGFzc1JlZlB0 cjxNZWRpYUNvbnRyb2xTZWVrRm9yd2FyZEJ1dHRvbkVsZW1lbnQ+IE1lZGlhQ29udHJvbFNlZWtG b3J3YXJkQnV0dG9uRWwKICAgICByZXR1cm4gYnV0dG9uLnJlbGVhc2UoKTsKIH0KIAotY29uc3Qg QXRvbWljU3RyaW5nJiBNZWRpYUNvbnRyb2xTZWVrRm9yd2FyZEJ1dHRvbkVsZW1lbnQ6OnNoYWRv d1BzZXVkb0lkKCkgY29uc3QKLXsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwo QXRvbWljU3RyaW5nLCBpZCwgKCItd2Via2l0LW1lZGlhLWNvbnRyb2xzLXNlZWstZm9yd2FyZC1i dXR0b24iLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7Ci0gICAgcmV0dXJu IGlkOwotfQotCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIE1lZGlhQ29udHJv bFNlZWtCYWNrQnV0dG9uRWxlbWVudDo6TWVkaWFDb250cm9sU2Vla0JhY2tCdXR0b25FbGVtZW50 KERvY3VtZW50JiBkb2N1bWVudCkKICAgICA6IE1lZGlhQ29udHJvbFNlZWtCdXR0b25FbGVtZW50 KGRvY3VtZW50LCBNZWRpYVNlZWtCYWNrQnV0dG9uKQogewotICAgIHNldFBzZXVkbyhzaGFkb3dQ c2V1ZG9JZCgpKTsKKyAgICBzZXRQc2V1ZG8oQXRvbWljU3RyaW5nKCItd2Via2l0LW1lZGlhLWNv bnRyb2xzLXNlZWstYmFjay1idXR0b24iLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRl cmFsKSk7CiB9CiAKIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sU2Vla0JhY2tCdXR0b25FbGVtZW50 PiBNZWRpYUNvbnRyb2xTZWVrQmFja0J1dHRvbkVsZW1lbnQ6OmNyZWF0ZShEb2N1bWVudCYgZG9j dW1lbnQpCkBAIC02MTQsMTggKzU0NywxMiBAQCBQYXNzUmVmUHRyPE1lZGlhQ29udHJvbFNlZWtC YWNrQnV0dG9uRWxlbWVudD4gTWVkaWFDb250cm9sU2Vla0JhY2tCdXR0b25FbGVtZW50OgogICAg IHJldHVybiBidXR0b24ucmVsZWFzZSgpOwogfQogCi1jb25zdCBBdG9taWNTdHJpbmcmIE1lZGlh Q29udHJvbFNlZWtCYWNrQnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAotewot ICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIGlkLCAoIi13 ZWJraXQtbWVkaWEtY29udHJvbHMtc2Vlay1iYWNrLWJ1dHRvbiIsIEF0b21pY1N0cmluZzo6Q29u c3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICByZXR1cm4gaWQ7Ci19Ci0KIC8vIC0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KIAogTWVkaWFDb250cm9sUmV3aW5kQnV0dG9uRWxlbWVudDo6TWVk aWFDb250cm9sUmV3aW5kQnV0dG9uRWxlbWVudChEb2N1bWVudCYgZG9jdW1lbnQpCiAgICAgOiBN ZWRpYUNvbnRyb2xJbnB1dEVsZW1lbnQoZG9jdW1lbnQsIE1lZGlhUmV3aW5kQnV0dG9uKQogewot ICAgIHNldFBzZXVkbyhzaGFkb3dQc2V1ZG9JZCgpKTsKKyAgICBzZXRQc2V1ZG8oQXRvbWljU3Ry aW5nKCItd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJld2luZC1idXR0b24iLCBBdG9taWNTdHJpbmc6 OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7CiB9CiAKIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sUmV3 aW5kQnV0dG9uRWxlbWVudD4gTWVkaWFDb250cm9sUmV3aW5kQnV0dG9uRWxlbWVudDo6Y3JlYXRl KERvY3VtZW50JiBkb2N1bWVudCkKQEAgLTY0NSwxOCArNTcyLDEyIEBAIHZvaWQgTWVkaWFDb250 cm9sUmV3aW5kQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQp CiAgICAgSFRNTElucHV0RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihldmVudCk7CiB9CiAK LWNvbnN0IEF0b21pY1N0cmluZyYgTWVkaWFDb250cm9sUmV3aW5kQnV0dG9uRWxlbWVudDo6c2hh ZG93UHNldWRvSWQoKSBjb25zdAotewotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NB TChBdG9taWNTdHJpbmcsIGlkLCAoIi13ZWJraXQtbWVkaWEtY29udHJvbHMtcmV3aW5kLWJ1dHRv biIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICByZXR1cm4gaWQ7 Ci19Ci0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogTWVkaWFDb250cm9sUmV0 dXJuVG9SZWFsdGltZUJ1dHRvbkVsZW1lbnQ6Ok1lZGlhQ29udHJvbFJldHVyblRvUmVhbHRpbWVC dXR0b25FbGVtZW50KERvY3VtZW50JiBkb2N1bWVudCkKICAgICA6IE1lZGlhQ29udHJvbElucHV0 RWxlbWVudChkb2N1bWVudCwgTWVkaWFSZXR1cm5Ub1JlYWx0aW1lQnV0dG9uKQogewotICAgIHNl dFBzZXVkbyhzaGFkb3dQc2V1ZG9JZCgpKTsKKyAgICBzZXRQc2V1ZG8oQXRvbWljU3RyaW5nKCIt d2Via2l0LW1lZGlhLWNvbnRyb2xzLXJldHVybi10by1yZWFsdGltZS1idXR0b24iLCBBdG9taWNT dHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7CiB9CiAKIFBhc3NSZWZQdHI8TWVkaWFDb250 cm9sUmV0dXJuVG9SZWFsdGltZUJ1dHRvbkVsZW1lbnQ+IE1lZGlhQ29udHJvbFJldHVyblRvUmVh bHRpbWVCdXR0b25FbGVtZW50OjpjcmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50KQpAQCAtNjc3LDEy ICs1OTgsNiBAQCB2b2lkIE1lZGlhQ29udHJvbFJldHVyblRvUmVhbHRpbWVCdXR0b25FbGVtZW50 OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudAogICAgIEhUTUxJbnB1dEVsZW1lbnQ6 OmRlZmF1bHRFdmVudEhhbmRsZXIoZXZlbnQpOwogfQogCi1jb25zdCBBdG9taWNTdHJpbmcmIE1l ZGlhQ29udHJvbFJldHVyblRvUmVhbHRpbWVCdXR0b25FbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCgp IGNvbnN0Ci17Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmlu ZywgaWQsICgiLXdlYmtpdC1tZWRpYS1jb250cm9scy1yZXR1cm4tdG8tcmVhbHRpbWUtYnV0dG9u IiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwotICAgIHJldHVybiBpZDsK LX0KLQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiBNZWRpYUNvbnRyb2xUb2dn bGVDbG9zZWRDYXB0aW9uc0J1dHRvbkVsZW1lbnQ6Ok1lZGlhQ29udHJvbFRvZ2dsZUNsb3NlZENh cHRpb25zQnV0dG9uRWxlbWVudChEb2N1bWVudCYgZG9jdW1lbnQsIE1lZGlhQ29udHJvbHMqIGNv bnRyb2xzKQpAQCAtNjk0LDcgKzYwOSw3IEBAIE1lZGlhQ29udHJvbFRvZ2dsZUNsb3NlZENhcHRp b25zQnV0dG9uRWxlbWVudDo6TWVkaWFDb250cm9sVG9nZ2xlQ2xvc2VkQ2FwdGlvbnNCCiAjaWYg IVBMQVRGT1JNKENPQ09BKSAmJiAhUExBVEZPUk0oV0lOKSB8fCAhUExBVEZPUk0oR1RLKQogICAg IFVOVVNFRF9QQVJBTShjb250cm9scyk7CiAjZW5kaWYKLSAgICBzZXRQc2V1ZG8oc2hhZG93UHNl dWRvSWQoKSk7CisgICAgc2V0UHNldWRvKEF0b21pY1N0cmluZygiLXdlYmtpdC1tZWRpYS1jb250 cm9scy10b2dnbGUtY2xvc2VkLWNhcHRpb25zLWJ1dHRvbiIsIEF0b21pY1N0cmluZzo6Q29uc3Ry dWN0RnJvbUxpdGVyYWwpKTsKIH0KIAogUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xUb2dnbGVDbG9z ZWRDYXB0aW9uc0J1dHRvbkVsZW1lbnQ+IE1lZGlhQ29udHJvbFRvZ2dsZUNsb3NlZENhcHRpb25z QnV0dG9uRWxlbWVudDo6Y3JlYXRlKERvY3VtZW50JiBkb2N1bWVudCwgTWVkaWFDb250cm9scyog Y29udHJvbHMpCkBAIC03MzUsMTggKzY1MCwxMiBAQCB2b2lkIE1lZGlhQ29udHJvbFRvZ2dsZUNs b3NlZENhcHRpb25zQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZQog ICAgIEhUTUxJbnB1dEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoZXZlbnQpOwogfQogCi1j b25zdCBBdG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbFRvZ2dsZUNsb3NlZENhcHRpb25zQnV0dG9u RWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAotewotICAgIERFUFJFQ0FURURfREVGSU5F X1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIGlkLCAoIi13ZWJraXQtbWVkaWEtY29udHJvbHMt dG9nZ2xlLWNsb3NlZC1jYXB0aW9ucy1idXR0b24iLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZy b21MaXRlcmFsKSk7Ci0gICAgcmV0dXJuIGlkOwotfQotCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiAKIE1lZGlhQ29udHJvbENsb3NlZENhcHRpb25zQ29udGFpbmVyRWxlbWVudDo6 TWVkaWFDb250cm9sQ2xvc2VkQ2FwdGlvbnNDb250YWluZXJFbGVtZW50KERvY3VtZW50JiBkb2N1 bWVudCkKICAgICA6IE1lZGlhQ29udHJvbERpdkVsZW1lbnQoZG9jdW1lbnQsIE1lZGlhQ2xvc2Vk Q2FwdGlvbnNDb250YWluZXIpCiB7Ci0gICAgc2V0UHNldWRvKHNoYWRvd1BzZXVkb0lkKCkpOwor ICAgIHNldFBzZXVkbyhBdG9taWNTdHJpbmcoIi13ZWJraXQtbWVkaWEtY29udHJvbHMtY2xvc2Vk LWNhcHRpb25zLWNvbnRhaW5lciIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwp KTsKIH0KIAogUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xDbG9zZWRDYXB0aW9uc0NvbnRhaW5lckVs ZW1lbnQ+IE1lZGlhQ29udHJvbENsb3NlZENhcHRpb25zQ29udGFpbmVyRWxlbWVudDo6Y3JlYXRl KERvY3VtZW50JiBkb2N1bWVudCkKQEAgLTc1NywxMiArNjY2LDYgQEAgUGFzc1JlZlB0cjxNZWRp YUNvbnRyb2xDbG9zZWRDYXB0aW9uc0NvbnRhaW5lckVsZW1lbnQ+IE1lZGlhQ29udHJvbENsb3Nl ZENhcHRpb24KICAgICByZXR1cm4gZWxlbWVudC5yZWxlYXNlKCk7CiB9CiAKLWNvbnN0IEF0b21p Y1N0cmluZyYgTWVkaWFDb250cm9sQ2xvc2VkQ2FwdGlvbnNDb250YWluZXJFbGVtZW50OjpzaGFk b3dQc2V1ZG9JZCgpIGNvbnN0Ci17Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FM KEF0b21pY1N0cmluZywgaWQsICgiLXdlYmtpdC1tZWRpYS1jb250cm9scy1jbG9zZWQtY2FwdGlv bnMtY29udGFpbmVyIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwotICAg IHJldHVybiBpZDsKLX0KLQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiBNZWRp YUNvbnRyb2xDbG9zZWRDYXB0aW9uc1RyYWNrTGlzdEVsZW1lbnQ6Ok1lZGlhQ29udHJvbENsb3Nl ZENhcHRpb25zVHJhY2tMaXN0RWxlbWVudChEb2N1bWVudCYgZG9jdW1lbnQsIE1lZGlhQ29udHJv bHMqIGNvbnRyb2xzKQpAQCAtNzc0LDcgKzY3Nyw3IEBAIE1lZGlhQ29udHJvbENsb3NlZENhcHRp b25zVHJhY2tMaXN0RWxlbWVudDo6TWVkaWFDb250cm9sQ2xvc2VkQ2FwdGlvbnNUcmFja0xpc3RF CiAjaWYgIUVOQUJMRShWSURFT19UUkFDSykKICAgICBVTlVTRURfUEFSQU0oY29udHJvbHMpOwog I2VuZGlmCi0gICAgc2V0UHNldWRvKHNoYWRvd1BzZXVkb0lkKCkpOworICAgIHNldFBzZXVkbyhB dG9taWNTdHJpbmcoIi13ZWJraXQtbWVkaWEtY29udHJvbHMtY2xvc2VkLWNhcHRpb25zLXRyYWNr LWxpc3QiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7CiB9CiAKIFBhc3NS ZWZQdHI8TWVkaWFDb250cm9sQ2xvc2VkQ2FwdGlvbnNUcmFja0xpc3RFbGVtZW50PiBNZWRpYUNv bnRyb2xDbG9zZWRDYXB0aW9uc1RyYWNrTGlzdEVsZW1lbnQ6OmNyZWF0ZShEb2N1bWVudCYgZG9j dW1lbnQsIE1lZGlhQ29udHJvbHMqIGNvbnRyb2xzKQpAQCAtODIxLDEyICs3MjQsNiBAQCB2b2lk IE1lZGlhQ29udHJvbENsb3NlZENhcHRpb25zVHJhY2tMaXN0RWxlbWVudDo6ZGVmYXVsdEV2ZW50 SGFuZGxlcihFdmVudCogZXZlbgogI2VuZGlmCiB9CiAKLWNvbnN0IEF0b21pY1N0cmluZyYgTWVk aWFDb250cm9sQ2xvc2VkQ2FwdGlvbnNUcmFja0xpc3RFbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCgp IGNvbnN0Ci17Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmlu ZywgaWQsICgiLXdlYmtpdC1tZWRpYS1jb250cm9scy1jbG9zZWQtY2FwdGlvbnMtdHJhY2stbGlz dCIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICByZXR1cm4gaWQ7 Ci19Ci0KIHZvaWQgTWVkaWFDb250cm9sQ2xvc2VkQ2FwdGlvbnNUcmFja0xpc3RFbGVtZW50Ojp1 cGRhdGVEaXNwbGF5KCkKIHsKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCkBAIC05NDAsNyArODM3 LDcgQEAgTWVkaWFDb250cm9sVGltZWxpbmVFbGVtZW50OjpNZWRpYUNvbnRyb2xUaW1lbGluZUVs ZW1lbnQoRG9jdW1lbnQmIGRvY3VtZW50LCBNZWQKICAgICA6IE1lZGlhQ29udHJvbElucHV0RWxl bWVudChkb2N1bWVudCwgTWVkaWFTbGlkZXIpCiAgICAgLCBtX2NvbnRyb2xzKGNvbnRyb2xzKQog ewotICAgIHNldFBzZXVkbyhzaGFkb3dQc2V1ZG9JZCgpKTsKKyAgICBzZXRQc2V1ZG8oQXRvbWlj U3RyaW5nKCItd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5lIiwgQXRvbWljU3RyaW5nOjpD b25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwogfQogCiBQYXNzUmVmUHRyPE1lZGlhQ29udHJvbFRpbWVs aW5lRWxlbWVudD4gTWVkaWFDb250cm9sVGltZWxpbmVFbGVtZW50OjpjcmVhdGUoRG9jdW1lbnQm IGRvY3VtZW50LCBNZWRpYUNvbnRyb2xzKiBjb250cm9scykKQEAgLTEwMDMsMTkgKzkwMCwxMiBA QCB2b2lkIE1lZGlhQ29udHJvbFRpbWVsaW5lRWxlbWVudDo6c2V0RHVyYXRpb24oZG91YmxlIGR1 cmF0aW9uKQogICAgIHNldEF0dHJpYnV0ZShtYXhBdHRyLCBBdG9taWNTdHJpbmc6Om51bWJlcihz dGQ6OmlzZmluaXRlKGR1cmF0aW9uKSA/IGR1cmF0aW9uIDogMCkpOwogfQogCi0KLWNvbnN0IEF0 b21pY1N0cmluZyYgTWVkaWFDb250cm9sVGltZWxpbmVFbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCgp IGNvbnN0Ci17Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmlu ZywgaWQsICgiLXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZSIsIEF0b21pY1N0cmluZzo6 Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICByZXR1cm4gaWQ7Ci19Ci0KIC8vIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogTWVkaWFDb250cm9sUGFuZWxWb2x1bWVTbGlkZXJFbGVt ZW50OjpNZWRpYUNvbnRyb2xQYW5lbFZvbHVtZVNsaWRlckVsZW1lbnQoRG9jdW1lbnQmIGRvY3Vt ZW50KQogICAgIDogTWVkaWFDb250cm9sVm9sdW1lU2xpZGVyRWxlbWVudChkb2N1bWVudCkKIHsK LSAgICBzZXRQc2V1ZG8oc2hhZG93UHNldWRvSWQoKSk7CisgICAgc2V0UHNldWRvKEF0b21pY1N0 cmluZygiLXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyIiwgQXRvbWljU3RyaW5n OjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwogfQogCiBQYXNzUmVmUHRyPE1lZGlhQ29udHJvbFBh bmVsVm9sdW1lU2xpZGVyRWxlbWVudD4gTWVkaWFDb250cm9sUGFuZWxWb2x1bWVTbGlkZXJFbGVt ZW50OjpjcmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50KQpAQCAtMTAyOCwxOCArOTE4LDEyIEBAIFBh c3NSZWZQdHI8TWVkaWFDb250cm9sUGFuZWxWb2x1bWVTbGlkZXJFbGVtZW50PiBNZWRpYUNvbnRy b2xQYW5lbFZvbHVtZVNsaWRlckVsCiAgICAgcmV0dXJuIHNsaWRlci5yZWxlYXNlKCk7CiB9CiAK LWNvbnN0IEF0b21pY1N0cmluZyYgTWVkaWFDb250cm9sUGFuZWxWb2x1bWVTbGlkZXJFbGVtZW50 OjpzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0Ci17Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElD X0xPQ0FMKEF0b21pY1N0cmluZywgaWQsICgiLXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUt c2xpZGVyIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwotICAgIHJldHVy biBpZDsKLX0KLQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiBNZWRpYUNvbnRy b2xGdWxsc2NyZWVuVm9sdW1lU2xpZGVyRWxlbWVudDo6TWVkaWFDb250cm9sRnVsbHNjcmVlblZv bHVtZVNsaWRlckVsZW1lbnQoRG9jdW1lbnQmIGRvY3VtZW50KQogICAgIDogTWVkaWFDb250cm9s Vm9sdW1lU2xpZGVyRWxlbWVudChkb2N1bWVudCkKIHsKLSAgICBzZXRQc2V1ZG8oc2hhZG93UHNl dWRvSWQoKSk7CisgICAgc2V0UHNldWRvKEF0b21pY1N0cmluZygiLXdlYmtpdC1tZWRpYS1jb250 cm9scy1mdWxsc2NyZWVuLXZvbHVtZS1zbGlkZXIiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZy b21MaXRlcmFsKSk7CiB9CiAKIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVt ZVNsaWRlckVsZW1lbnQ+IE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5Wb2x1bWVTbGlkZXJFbGVtZW50 OjpjcmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50KQpAQCAtMTA1MiwxOCArOTM2LDEyIEBAIFBhc3NS ZWZQdHI8TWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZVNsaWRlckVsZW1lbnQ+IE1lZGlhQ29u dHJvbEZ1bGxzY3JlZW5Wb2x1CiAgICAgcmV0dXJuIHNsaWRlci5yZWxlYXNlKCk7CiB9CiAKLWNv bnN0IEF0b21pY1N0cmluZyYgTWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZVNsaWRlckVsZW1l bnQ6OnNoYWRvd1BzZXVkb0lkKCkgY29uc3QKLXsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFU SUNfTE9DQUwoQXRvbWljU3RyaW5nLCBpZCwgKCItd2Via2l0LW1lZGlhLWNvbnRyb2xzLWZ1bGxz Y3JlZW4tdm9sdW1lLXNsaWRlciIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwp KTsKLSAgICByZXR1cm4gaWQ7Ci19Ci0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K IAogTWVkaWFDb250cm9sRnVsbHNjcmVlbkJ1dHRvbkVsZW1lbnQ6Ok1lZGlhQ29udHJvbEZ1bGxz Y3JlZW5CdXR0b25FbGVtZW50KERvY3VtZW50JiBkb2N1bWVudCkKICAgICA6IE1lZGlhQ29udHJv bElucHV0RWxlbWVudChkb2N1bWVudCwgTWVkaWFFbnRlckZ1bGxzY3JlZW5CdXR0b24pCiB7Ci0g ICAgc2V0UHNldWRvKHNoYWRvd1BzZXVkb0lkKCkpOworICAgIHNldFBzZXVkbyhBdG9taWNTdHJp bmcoIi13ZWJraXQtbWVkaWEtY29udHJvbHMtZnVsbHNjcmVlbi1idXR0b24iLCBBdG9taWNTdHJp bmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7CiB9CiAKIFBhc3NSZWZQdHI8TWVkaWFDb250cm9s RnVsbHNjcmVlbkJ1dHRvbkVsZW1lbnQ+IE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5CdXR0b25FbGVt ZW50OjpjcmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50KQpAQCAtMTA5NywxMiArOTc1LDYgQEAgdm9p ZCBNZWRpYUNvbnRyb2xGdWxsc2NyZWVuQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxl cihFdmVudCogZXZlbnQpCiAgICAgSFRNTElucHV0RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxl cihldmVudCk7CiB9CiAKLWNvbnN0IEF0b21pY1N0cmluZyYgTWVkaWFDb250cm9sRnVsbHNjcmVl bkJ1dHRvbkVsZW1lbnQ6OnNoYWRvd1BzZXVkb0lkKCkgY29uc3QKLXsKLSAgICBERVBSRUNBVEVE X0RFRklORV9TVEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCBpZCwgKCItd2Via2l0LW1lZGlhLWNv bnRyb2xzLWZ1bGxzY3JlZW4tYnV0dG9uIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0 ZXJhbCkpOwotICAgIHJldHVybiBpZDsKLX0KLQogdm9pZCBNZWRpYUNvbnRyb2xGdWxsc2NyZWVu QnV0dG9uRWxlbWVudDo6c2V0SXNGdWxsc2NyZWVuKGJvb2wgaXNGdWxsc2NyZWVuKQogewogICAg IHNldERpc3BsYXlUeXBlKGlzRnVsbHNjcmVlbiA/IE1lZGlhRXhpdEZ1bGxzY3JlZW5CdXR0b24g OiBNZWRpYUVudGVyRnVsbHNjcmVlbkJ1dHRvbik7CkBAIC0xMTEzLDcgKzk4NSw3IEBAIHZvaWQg TWVkaWFDb250cm9sRnVsbHNjcmVlbkJ1dHRvbkVsZW1lbnQ6OnNldElzRnVsbHNjcmVlbihib29s IGlzRnVsbHNjcmVlbikKIE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5Wb2x1bWVNaW5CdXR0b25FbGVt ZW50OjpNZWRpYUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1lTWluQnV0dG9uRWxlbWVudChEb2N1bWVu dCYgZG9jdW1lbnQpCiAgICAgOiBNZWRpYUNvbnRyb2xJbnB1dEVsZW1lbnQoZG9jdW1lbnQsIE1l ZGlhVW5NdXRlQnV0dG9uKQogewotICAgIHNldFBzZXVkbyhzaGFkb3dQc2V1ZG9JZCgpKTsKKyAg ICBzZXRQc2V1ZG8oQXRvbWljU3RyaW5nKCItd2Via2l0LW1lZGlhLWNvbnRyb2xzLWZ1bGxzY3Jl ZW4tdm9sdW1lLW1pbi1idXR0b24iLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFs KSk7CiB9CiAKIFBhc3NSZWZQdHI8TWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZU1pbkJ1dHRv bkVsZW1lbnQ+IE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5Wb2x1bWVNaW5CdXR0b25FbGVtZW50Ojpj cmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50KQpAQCAtMTEzNCwxOCArMTAwNiwxMiBAQCB2b2lkIE1l ZGlhQ29udHJvbEZ1bGxzY3JlZW5Wb2x1bWVNaW5CdXR0b25FbGVtZW50OjpkZWZhdWx0RXZlbnRI YW5kbGVyKEV2ZW50KiBldgogICAgIEhUTUxJbnB1dEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRs ZXIoZXZlbnQpOwogfQogCi1jb25zdCBBdG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbEZ1bGxzY3Jl ZW5Wb2x1bWVNaW5CdXR0b25FbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0Ci17Ci0gICAg REVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKEF0b21pY1N0cmluZywgaWQsICgiLXdlYmtp dC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVuLXZvbHVtZS1taW4tYnV0dG9uIiwgQXRvbWljU3Ry aW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwotICAgIHJldHVybiBpZDsKLX0KLQogLy8gLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiBNZWRpYUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1l TWF4QnV0dG9uRWxlbWVudDo6TWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZU1heEJ1dHRvbkVs ZW1lbnQoRG9jdW1lbnQmIGRvY3VtZW50KQogOiBNZWRpYUNvbnRyb2xJbnB1dEVsZW1lbnQoZG9j dW1lbnQsIE1lZGlhTXV0ZUJ1dHRvbikKIHsKLSAgICBzZXRQc2V1ZG8oc2hhZG93UHNldWRvSWQo KSk7CisgICAgc2V0UHNldWRvKEF0b21pY1N0cmluZygiLXdlYmtpdC1tZWRpYS1jb250cm9scy1m dWxsc2NyZWVuLXZvbHVtZS1tYXgtYnV0dG9uIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9t TGl0ZXJhbCkpOwogfQogCiBQYXNzUmVmUHRyPE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5Wb2x1bWVN YXhCdXR0b25FbGVtZW50PiBNZWRpYUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1lTWF4QnV0dG9uRWxl bWVudDo6Y3JlYXRlKERvY3VtZW50JiBkb2N1bWVudCkKQEAgLTExNjYsMTggKzEwMzIsMTIgQEAg dm9pZCBNZWRpYUNvbnRyb2xGdWxsc2NyZWVuVm9sdW1lTWF4QnV0dG9uRWxlbWVudDo6ZGVmYXVs dEV2ZW50SGFuZGxlcihFdmVudCogZXYKICAgICBIVE1MSW5wdXRFbGVtZW50OjpkZWZhdWx0RXZl bnRIYW5kbGVyKGV2ZW50KTsKIH0KIAotY29uc3QgQXRvbWljU3RyaW5nJiBNZWRpYUNvbnRyb2xG dWxsc2NyZWVuVm9sdW1lTWF4QnV0dG9uRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAot ewotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIGlkLCAo Ii13ZWJraXQtbWVkaWEtY29udHJvbHMtZnVsbHNjcmVlbi12b2x1bWUtbWF4LWJ1dHRvbiIsIEF0 b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICByZXR1cm4gaWQ7Ci19Ci0K IC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogTWVkaWFDb250cm9sVGltZVJlbWFp bmluZ0Rpc3BsYXlFbGVtZW50OjpNZWRpYUNvbnRyb2xUaW1lUmVtYWluaW5nRGlzcGxheUVsZW1l bnQoRG9jdW1lbnQmIGRvY3VtZW50KQogICAgIDogTWVkaWFDb250cm9sVGltZURpc3BsYXlFbGVt ZW50KGRvY3VtZW50LCBNZWRpYVRpbWVSZW1haW5pbmdEaXNwbGF5KQogewotICAgIHNldFBzZXVk byhzaGFkb3dQc2V1ZG9JZCgpKTsKKyAgICBzZXRQc2V1ZG8oZ2V0TWVkaWFDb250cm9sVGltZVJl bWFpbmluZ0Rpc3BsYXlFbGVtZW50U2hhZG93UHNldWRvSWQoKSk7CiB9CiAKIFBhc3NSZWZQdHI8 TWVkaWFDb250cm9sVGltZVJlbWFpbmluZ0Rpc3BsYXlFbGVtZW50PiBNZWRpYUNvbnRyb2xUaW1l UmVtYWluaW5nRGlzcGxheUVsZW1lbnQ6OmNyZWF0ZShEb2N1bWVudCYgZG9jdW1lbnQpCkBAIC0x MTkxLDE3ICsxMDUxLDEyIEBAIHN0YXRpYyBjb25zdCBBdG9taWNTdHJpbmcmIGdldE1lZGlhQ29u dHJvbFRpbWVSZW1haW5pbmdEaXNwbGF5RWxlbWVudFNoYWRvd1BzZXVkCiAgICAgcmV0dXJuIGlk OwogfQogCi1jb25zdCBBdG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbFRpbWVSZW1haW5pbmdEaXNw bGF5RWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAotewotICAgIHJldHVybiBnZXRNZWRp YUNvbnRyb2xUaW1lUmVtYWluaW5nRGlzcGxheUVsZW1lbnRTaGFkb3dQc2V1ZG9JZCgpOwotfQot CiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIE1lZGlhQ29udHJvbEN1cnJlbnRU aW1lRGlzcGxheUVsZW1lbnQ6Ok1lZGlhQ29udHJvbEN1cnJlbnRUaW1lRGlzcGxheUVsZW1lbnQo RG9jdW1lbnQmIGRvY3VtZW50KQogICAgIDogTWVkaWFDb250cm9sVGltZURpc3BsYXlFbGVtZW50 KGRvY3VtZW50LCBNZWRpYUN1cnJlbnRUaW1lRGlzcGxheSkKIHsKLSAgICBzZXRQc2V1ZG8oc2hh ZG93UHNldWRvSWQoKSk7CisgICAgc2V0UHNldWRvKGdldE1lZGlhQ29udHJvbEN1cnJlbnRUaW1l RGlzcGxheUVsZW1lbnRTaGFkb3dQc2V1ZG9JZCgpKTsKIH0KIAogUGFzc1JlZlB0cjxNZWRpYUNv bnRyb2xDdXJyZW50VGltZURpc3BsYXlFbGVtZW50PiBNZWRpYUNvbnRyb2xDdXJyZW50VGltZURp c3BsYXlFbGVtZW50OjpjcmVhdGUoRG9jdW1lbnQmIGRvY3VtZW50KQpAQCAtMTIxNSwxMSArMTA3 MCw2IEBAIHN0YXRpYyBjb25zdCBBdG9taWNTdHJpbmcmIGdldE1lZGlhQ29udHJvbEN1cnJlbnRU aW1lRGlzcGxheUVsZW1lbnRTaGFkb3dQc2V1ZG9JCiAgICAgcmV0dXJuIGlkOwogfQogCi1jb25z dCBBdG9taWNTdHJpbmcmIE1lZGlhQ29udHJvbEN1cnJlbnRUaW1lRGlzcGxheUVsZW1lbnQ6OnNo YWRvd1BzZXVkb0lkKCkgY29uc3QKLXsKLSAgICByZXR1cm4gZ2V0TWVkaWFDb250cm9sQ3VycmVu dFRpbWVEaXNwbGF5RWxlbWVudFNoYWRvd1BzZXVkb0lkKCk7Ci19Ci0KIC8vIC0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KIAogI2lmIEVOQUJMRShWSURFT19UUkFDSykKQEAgLTEyMzEsNyAr MTA4MSw3IEBAIE1lZGlhQ29udHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6Ok1lZGlhQ29u dHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQoRG9jCiAgICAgLCBtX2ZvbnRTaXplSXNJbXBv cnRhbnQoZmFsc2UpCiAgICAgLCBtX3VwZGF0ZVRleHRUcmFja1JlcHJlc2VudGF0aW9uU3R5bGUo ZmFsc2UpCiB7Ci0gICAgc2V0UHNldWRvKHNoYWRvd1BzZXVkb0lkKCkpOworICAgIHNldFBzZXVk byhBdG9taWNTdHJpbmcoIi13ZWJraXQtbWVkaWEtdGV4dC10cmFjay1jb250YWluZXIiLCBBdG9t aWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7CiB9CiAKIFBhc3NSZWZQdHI8TWVkaWFD b250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudD4gTWVkaWFDb250cm9sVGV4dFRyYWNrQ29u dGFpbmVyRWxlbWVudDo6Y3JlYXRlKERvY3VtZW50JiBkb2N1bWVudCkKQEAgLTEyNDYsMTcgKzEw OTYsNiBAQCBSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4gTWVkaWFDb250cm9sVGV4dFRyYWNrQ29u dGFpbmVyRWxlbWVudDo6Y3JlYXRlRWxlbWVudFJlbgogICAgIHJldHVybiBjcmVhdGVSZW5kZXJl cjxSZW5kZXJUZXh0VHJhY2tDb250YWluZXJFbGVtZW50PigqdGhpcywgV1RGOjptb3ZlKHN0eWxl KSk7CiB9CiAKLWNvbnN0IEF0b21pY1N0cmluZyYgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFp bmVyRWxlbWVudDo6dGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudFNoYWRvd1BzZXVkb0lkKCkKLXsK LSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoQXRvbWljU3RyaW5nLCBpZCwgKCIt d2Via2l0LW1lZGlhLXRleHQtdHJhY2stY29udGFpbmVyIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1 Y3RGcm9tTGl0ZXJhbCkpOwotICAgIHJldHVybiBpZDsKLX0KLSAgICAKLWNvbnN0IEF0b21pY1N0 cmluZyYgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6c2hhZG93UHNldWRv SWQoKSBjb25zdAotewotICAgIHJldHVybiB0ZXh0VHJhY2tDb250YWluZXJFbGVtZW50U2hhZG93 UHNldWRvSWQoKTsKLX0KLQogdm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVt ZW50Ojp1cGRhdGVEaXNwbGF5KCkKIHsKICAgICBpZiAoIW1lZGlhQ29udHJvbGxlcigpLT5jbG9z ZWRDYXB0aW9uc1Zpc2libGUoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9N ZWRpYUNvbnRyb2xFbGVtZW50cy5oCmluZGV4IGMyNGQzZTE0ZDFmNjc0MzA3NmExNWI2MmRjNjcz NmQ1NGI3ZGFkMWYuLjFhMzJkNmY1MjVlMGEzNWMwYTZiOGJiNzI2OTEwNzY5MmI4MjhmOWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRz LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMu aApAQCAtNTcsNyArNTcsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGV4cGxpY2l0IE1lZGlh Q29udHJvbFBhbmVsRWxlbWVudChEb2N1bWVudCYpOwogCi0gICAgdmlydHVhbCBjb25zdCBBdG9t aWNTdHJpbmcmIHNoYWRvd1BzZXVkb0lkKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2 b2lkIGRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqKSBvdmVycmlkZTsKIAogICAgIHZvaWQgc3Rh cnREcmFnKGNvbnN0IExheW91dFBvaW50JiBldmVudExvY2F0aW9uKTsKQEAgLTg4LDcgKzg3LDYg QEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IE1lZGlhQ29udHJvbFBhbmVsRW5j bG9zdXJlRWxlbWVudChEb2N1bWVudCYpOwotICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5n JiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0IG92ZXJyaWRlOwogfTsKIAogLy8gLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQpAQCAtOTksNyArOTcsNiBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAg ICAgZXhwbGljaXQgTWVkaWFDb250cm9sT3ZlcmxheUVuY2xvc3VyZUVsZW1lbnQoRG9jdW1lbnQm KTsKLSAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNldWRvSWQoKSBjb25z dCBvdmVycmlkZTsKIH07CiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTEx Miw3ICsxMDksNiBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgTWVkaWFDb250 cm9sVGltZWxpbmVDb250YWluZXJFbGVtZW50KERvY3VtZW50Jik7Ci0gICAgdmlydHVhbCBjb25z dCBBdG9taWNTdHJpbmcmIHNoYWRvd1BzZXVkb0lkKCkgY29uc3Qgb3ZlcnJpZGU7CiAKICAgICB2 aXJ0dWFsIFJlbmRlclB0cjxSZW5kZXJFbGVtZW50PiBjcmVhdGVFbGVtZW50UmVuZGVyZXIoUGFz c1JlZjxSZW5kZXJTdHlsZT4pIG92ZXJyaWRlOwogfTsKQEAgLTEzMCw3ICsxMjYsNiBAQCBwdWJs aWM6CiBwcml2YXRlOgogICAgIGV4cGxpY2l0IE1lZGlhQ29udHJvbFZvbHVtZVNsaWRlckNvbnRh aW5lckVsZW1lbnQoRG9jdW1lbnQmKTsKIAotICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5n JiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkZWZh dWx0RXZlbnRIYW5kbGVyKEV2ZW50Kikgb3ZlcnJpZGU7CiAKICAgICB2aXJ0dWFsIFJlbmRlclB0 cjxSZW5kZXJFbGVtZW50PiBjcmVhdGVFbGVtZW50UmVuZGVyZXIoUGFzc1JlZjxSZW5kZXJTdHls ZT4pIG92ZXJyaWRlOwpAQCAtMTQ2LDcgKzE0MSw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAg ICBleHBsaWNpdCBNZWRpYUNvbnRyb2xTdGF0dXNEaXNwbGF5RWxlbWVudChEb2N1bWVudCYpOwot ICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0IG92 ZXJyaWRlOwogCiAgICAgZW51bSBTdGF0ZUJlaW5nRGlzcGxheWVkIHsgTm90aGluZywgTG9hZGlu ZywgTGl2ZUJyb2FkY2FzdCB9OwogICAgIFN0YXRlQmVpbmdEaXNwbGF5ZWQgbV9zdGF0ZUJlaW5n RGlzcGxheWVkOwpAQCAtMTY1LDcgKzE1OSw2IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgZXhw bGljaXQgTWVkaWFDb250cm9sUGFuZWxNdXRlQnV0dG9uRWxlbWVudChEb2N1bWVudCYsIE1lZGlh Q29udHJvbHMqKTsKIAotICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBzaGFkb3dQc2V1 ZG9JZCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkZWZhdWx0RXZlbnRIYW5k bGVyKEV2ZW50Kikgb3ZlcnJpZGU7CiAKICAgICBNZWRpYUNvbnRyb2xzKiBtX2NvbnRyb2xzOwpA QCAtMTc5LDcgKzE3Miw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBNZWRp YUNvbnRyb2xWb2x1bWVTbGlkZXJNdXRlQnV0dG9uRWxlbWVudChEb2N1bWVudCYpOwotICAgIHZp cnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0IG92ZXJyaWRl OwogfTsKIAogCkBAIC0xOTgsNyArMTkwLDYgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBleHBs aWNpdCBNZWRpYUNvbnRyb2xQbGF5QnV0dG9uRWxlbWVudChEb2N1bWVudCYpOwogCi0gICAgdmly dHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIHNoYWRvd1BzZXVkb0lkKCkgY29uc3Qgb3ZlcnJpZGU7 CiAgICAgdmlydHVhbCB2b2lkIGRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqKSBvdmVycmlkZTsK IH07CiAKQEAgLTIxMyw3ICsyMDQsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGV4cGxpY2l0 IE1lZGlhQ29udHJvbE92ZXJsYXlQbGF5QnV0dG9uRWxlbWVudChEb2N1bWVudCYpOwogCi0gICAg dmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIHNoYWRvd1BzZXVkb0lkKCkgY29uc3Qgb3ZlcnJp ZGU7CiAgICAgdmlydHVhbCB2b2lkIGRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqKSBvdmVycmlk ZTsKIH07CiAKQEAgLTIyNSw3ICsyMTUsNiBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgZXhw bGljaXQgTWVkaWFDb250cm9sU2Vla0ZvcndhcmRCdXR0b25FbGVtZW50KERvY3VtZW50Jik7Ci0g ICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIHNoYWRvd1BzZXVkb0lkKCkgY29uc3Qgb3Zl cnJpZGU7CiAKICAgICB2aXJ0dWFsIGJvb2wgaXNGb3J3YXJkQnV0dG9uKCkgY29uc3Qgb3ZlcnJp ZGUgeyByZXR1cm4gdHJ1ZTsgfQogfTsKQEAgLTIzOCw3ICsyMjcsNiBAQCBwdWJsaWM6CiAKIHBy aXZhdGU6CiAgICAgZXhwbGljaXQgTWVkaWFDb250cm9sU2Vla0JhY2tCdXR0b25FbGVtZW50KERv Y3VtZW50Jik7Ci0gICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIHNoYWRvd1BzZXVkb0lk KCkgY29uc3Qgb3ZlcnJpZGU7CiAKICAgICB2aXJ0dWFsIGJvb2wgaXNGb3J3YXJkQnV0dG9uKCkg Y29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KIH07CkBAIC0yNTYsNyArMjQ0LDYgQEAg cHVibGljOgogcHJpdmF0ZToKICAgICBleHBsaWNpdCBNZWRpYUNvbnRyb2xSZXdpbmRCdXR0b25F bGVtZW50KERvY3VtZW50Jik7CiAKLSAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgc2hh ZG93UHNldWRvSWQoKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGVmYXVsdEV2 ZW50SGFuZGxlcihFdmVudCopIG92ZXJyaWRlOwogfTsKIApAQCAtMjczLDcgKzI2MCw2IEBAIHB1 YmxpYzoKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgTWVkaWFDb250cm9sUmV0dXJuVG9SZWFsdGlt ZUJ1dHRvbkVsZW1lbnQoRG9jdW1lbnQmKTsKIAotICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3Ry aW5nJiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBk ZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50Kikgb3ZlcnJpZGU7CiB9OwogCkBAIC0yOTIsNyArMjc4 LDYgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBleHBsaWNpdCBNZWRpYUNvbnRyb2xUb2dnbGVD bG9zZWRDYXB0aW9uc0J1dHRvbkVsZW1lbnQoRG9jdW1lbnQmLCBNZWRpYUNvbnRyb2xzKik7CiAK LSAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNldWRvSWQoKSBjb25zdCBv dmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCopIG92 ZXJyaWRlOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpIHx8IFBMQVRGT1JNKFdJTikgfHwgUExBVEZP Uk0oR1RLKQpAQCAtMzEyLDcgKzI5Nyw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBNZWRp YUNvbnRyb2xDbG9zZWRDYXB0aW9uc0NvbnRhaW5lckVsZW1lbnQoRG9jdW1lbnQmKTsKLSAgICB2 aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNldWRvSWQoKSBjb25zdCBvdmVycmlk ZTsKIH07CiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KQEAgLTMzMiw3ICszMTYs NiBAQCBwcml2YXRlOgogCiAgICAgdm9pZCByZWJ1aWxkVHJhY2tMaXN0TWVudSgpOwogCi0gICAg dmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIHNoYWRvd1BzZXVkb0lkKCkgY29uc3Qgb3ZlcnJp ZGU7CiAgICAgdmlydHVhbCB2b2lkIGRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqKSBvdmVycmlk ZTsKIAogICAgIHR5cGVkZWYgVmVjdG9yPFJlZlB0cjxFbGVtZW50Pj4gVHJhY2tNZW51SXRlbXM7 CkBAIC0zNjAsNyArMzQzLDYgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBleHBsaWNpdCBNZWRp YUNvbnRyb2xUaW1lbGluZUVsZW1lbnQoRG9jdW1lbnQmLCBNZWRpYUNvbnRyb2xzKik7CiAKLSAg ICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNldWRvSWQoKSBjb25zdCBvdmVy cmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCopIG92ZXJy aWRlOwogCiAgICAgTWVkaWFDb250cm9scyogbV9jb250cm9sczsKQEAgLTM4MSw3ICszNjMsNiBA QCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGV4cGxpY2l0IE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5C dXR0b25FbGVtZW50KERvY3VtZW50Jik7CiAKLSAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmlu ZyYgc2hhZG93UHNldWRvSWQoKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGVm YXVsdEV2ZW50SGFuZGxlcihFdmVudCopIG92ZXJyaWRlOwogfTsKIApAQCAtMzkzLDcgKzM3NCw2 IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBNZWRpYUNvbnRyb2xQYW5lbFZv bHVtZVNsaWRlckVsZW1lbnQoRG9jdW1lbnQmKTsKLSAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0 cmluZyYgc2hhZG93UHNldWRvSWQoKSBjb25zdCBvdmVycmlkZTsKIH07CiAvLyAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAKQEAgLTQwMyw3ICszODMsNiBAQCBwdWJsaWM6CiAKIHByaXZh dGU6CiAgICAgZXhwbGljaXQgTWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZVNsaWRlckVsZW1l bnQoRG9jdW1lbnQmKTsKLSAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNl dWRvSWQoKSBjb25zdCBvdmVycmlkZTsKIH07CiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KQEAgLTQxOCw3ICszOTcsNiBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgZXhwbGlj aXQgTWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZU1pbkJ1dHRvbkVsZW1lbnQoRG9jdW1lbnQm KTsKLSAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgc2hhZG93UHNldWRvSWQoKSBjb25z dCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCop IG92ZXJyaWRlOwogfTsKIApAQCAtNDM1LDcgKzQxMyw2IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAg ICAgZXhwbGljaXQgTWVkaWFDb250cm9sRnVsbHNjcmVlblZvbHVtZU1heEJ1dHRvbkVsZW1lbnQo RG9jdW1lbnQmKTsKIAotICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBzaGFkb3dQc2V1 ZG9JZCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkZWZhdWx0RXZlbnRIYW5k bGVyKEV2ZW50Kikgb3ZlcnJpZGU7CiB9OwogCkBAIC00NDgsNyArNDI1LDYgQEAgcHVibGljOgog CiBwcml2YXRlOgogICAgIGV4cGxpY2l0IE1lZGlhQ29udHJvbFRpbWVSZW1haW5pbmdEaXNwbGF5 RWxlbWVudChEb2N1bWVudCYpOwotICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBzaGFk b3dQc2V1ZG9JZCgpIGNvbnN0IG92ZXJyaWRlOwogfTsKIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQpAQCAtNDU5LDcgKzQzNSw2IEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBl eHBsaWNpdCBNZWRpYUNvbnRyb2xDdXJyZW50VGltZURpc3BsYXlFbGVtZW50KERvY3VtZW50Jik7 Ci0gICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcmIHNoYWRvd1BzZXVkb0lkKCkgY29uc3Qg b3ZlcnJpZGU7CiB9OwogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkBAIC00NzQs MTQgKzQ0OSwxMiBAQCBwdWJsaWM6CiAgICAgdm9pZCB1cGRhdGVTaXplcyhib29sIGZvcmNlVXBk YXRlID0gZmFsc2UpOwogICAgIHZvaWQgZW50ZXJlZEZ1bGxzY3JlZW4oKTsKICAgICB2b2lkIGV4 aXRlZEZ1bGxzY3JlZW4oKTsKLSAgICBzdGF0aWMgY29uc3QgQXRvbWljU3RyaW5nJiB0ZXh0VHJh Y2tDb250YWluZXJFbGVtZW50U2hhZG93UHNldWRvSWQoKTsKIAogcHJpdmF0ZToKICAgICB2b2lk IHVwZGF0ZVRpbWVyRmlyZWQoVGltZXI8TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxl bWVudD4mKTsKICAgICB2b2lkIHVwZGF0ZUFjdGl2ZUN1ZXNGb250U2l6ZSgpOwogCiAgICAgZXhw bGljaXQgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudChEb2N1bWVudCYpOwot ICAgIHZpcnR1YWwgY29uc3QgQXRvbWljU3RyaW5nJiBzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0IG92 ZXJyaWRlOwogCiAgICAgdmlydHVhbCBSZW5kZXJQdHI8UmVuZGVyRWxlbWVudD4gY3JlYXRlRWxl bWVudFJlbmRlcmVyKFBhc3NSZWY8UmVuZGVyU3R5bGU+KSBvdmVycmlkZTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9scy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzLmNwcAppbmRleCAzYmM3YjhmMmRhOGFk OGMwZDE3NGUwYjI1MWQwOTllYTk4MGI5Y2Y1Li5mYTFiZWJmNDM2MDMzMDAyOGYwZDVhMDI2NTc0 MjUzNzc2ZDhiYjFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRp YUNvbnRyb2xzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRy b2xzLmNwcApAQCAtNTIsNiArNTIsNyBAQCBNZWRpYUNvbnRyb2xzOjpNZWRpYUNvbnRyb2xzKERv Y3VtZW50JiBkb2N1bWVudCkKICAgICAsIG1faXNGdWxsc2NyZWVuKGZhbHNlKQogICAgICwgbV9p c01vdXNlT3ZlckNvbnRyb2xzKGZhbHNlKQogeworICAgIHNldFBzZXVkbyhBdG9taWNTdHJpbmco Ii13ZWJraXQtbWVkaWEtY29udHJvbHMiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRl cmFsKSk7CiB9CiAKIHZvaWQgTWVkaWFDb250cm9sczo6c2V0TWVkaWFDb250cm9sbGVyKE1lZGlh Q29udHJvbGxlckludGVyZmFjZSogY29udHJvbGxlcikKQEAgLTM2MywxMiArMzY0LDYgQEAgdm9p ZCBNZWRpYUNvbnRyb2xzOjpzdG9wSGlkZUZ1bGxzY3JlZW5Db250cm9sc1RpbWVyKCkKICAgICBt X2hpZGVGdWxsc2NyZWVuQ29udHJvbHNUaW1lci5zdG9wKCk7CiB9CiAKLWNvbnN0IEF0b21pY1N0 cmluZyYgTWVkaWFDb250cm9sczo6c2hhZG93UHNldWRvSWQoKSBjb25zdAotewotICAgIERFUFJF Q0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChBdG9taWNTdHJpbmcsIGlkLCAoIi13ZWJraXQtbWVk aWEtY29udHJvbHMiKSk7Ci0gICAgcmV0dXJuIGlkOwotfQotCiBib29sIE1lZGlhQ29udHJvbHM6 OmNvbnRhaW5zUmVsYXRlZFRhcmdldChFdmVudCogZXZlbnQpCiB7CiAgICAgaWYgKCFldmVudC0+ aXNNb3VzZUV2ZW50KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9N ZWRpYUNvbnRyb2xzLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xz LmgKaW5kZXggYTRhYjFiNGFiMWY1YTllYTFiNGE0Y2Q0Y2YyZTEzMDcwNDBjODIzOC4uYWQyMTYw NTY3ZGM4NTBmMjliNDYzYjI5NDg5NzdkOGQyMDYzMmYxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9scy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L01lZGlhQ29udHJvbHMuaApAQCAtMTQzLDggKzE0Myw2IEBAIHByb3RlY3RlZDoK IAogcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgaXNNZWRpYUNvbnRyb2xzKCkgY29uc3Qgb3Zl cnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQotCi0gICAgdmlydHVhbCBjb25zdCBBdG9taWNTdHJpbmcm IHNoYWRvd1BzZXVkb0lkKCkgY29uc3Qgb3ZlcnJpZGU7CiB9OwogCiBpbmxpbmUgTWVkaWFDb250 cm9scyogdG9NZWRpYUNvbnRyb2xzKE5vZGUqIG5vZGUpCg==