221938 2021-02-15 17:01:45 -0800 [iOS] the tracks button should be emphasized while the media controls context menu is showing 2021-02-17 13:37:16 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 221937 1 hi hi calvaris cdumez eric.carlson esprehn+autocc ews-watchlist glenn hi jer.noble joepeck kondapallykalyan philipj sergio webkit-bug-importer oldest_to_newest 1729467 0 hi 2021-02-15 17:01:45 -0800 this would make it clearer what originated the contextmenu 1729469 1 420397 hi 2021-02-15 17:08:09 -0800 Created attachment 420397 Patch 1729750 2 420397 eric.carlson 2021-02-16 10:04:22 -0800 Comment on attachment 420397 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420397&action=review > Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp:340 > + if (m_showMediaControlsContextMenuCallback) > + return false; If this condition is an error, it could be useful to have an ASSERT. 1730325 3 420397 hi 2021-02-17 09:45:12 -0800 Comment on attachment 420397 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420397&action=review >> Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp:340 >> + return false; > > If this condition is an error, it could be useful to have an ASSERT. This isn't an error condition. There's nothing to stop the user from tapping on the overflow button when the tracks contextmenu is already shown. This is a guard for that behavior. 1730326 4 420658 hi 2021-02-17 09:46:00 -0800 Created attachment 420658 Patch 1730497 5 ews-feeder 2021-02-17 13:36:21 -0800 Committed r273024: <https://commits.webkit.org/r273024> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420658. 1730498 6 webkit-bug-importer 2021-02-17 13:37:16 -0800 <rdar://problem/74447945> 420397 2021-02-15 17:08:09 -0800 2021-02-17 09:45:58 -0800 Patch 221938.diff text/plain 12390 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjOTA5N2M5YjMzNjYuLjM5MDllNGVmZjBkYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDM4IEBACisyMDIxLTAyLTE1ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KKworICAgICAgICBbaU9TXSB0aGUgdHJhY2tzIGJ1dHRvbiBzaG91bGQgYmUgZW1waGFzaXpl ZCB3aGlsZSB0aGUgbWVkaWEgY29udHJvbHMgY29udGV4dCBtZW51IGlzIHNob3dpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTkzOAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9kdWxlcy9tZWRp YWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlh Y29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhY29u dHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250 cm9sc0hvc3Q6On5NZWRpYUNvbnRyb2xzSG9zdCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFDb250cm9sc0hvc3Q6OnNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUpOgorICAgICAg ICBNb2RpZnkgYE1lZGlhQ29udHJvbHNIb3N0OjpzaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51 YCB0byByZXR1cm4gYSBgYm9vbGAgaW5kaWNhdGluZworICAgICAgICB3aGV0aGVyIHRoZSBtZWRp YSBjb250cm9scyBjb250ZXh0bWVudSB3YXMgYWJsZSB0byBiZSBzaG93biBhbmQgYWxzbyBhY2Nl cHQgYSBgVm9pZENhbGxiYWNrYAorICAgICAgICB0aGF0J3MgaW52b2tlZCB3aGVuIHRoZSBtZWRp YSBjb250cm9scyBjb250ZXh0bWVudSBpcyBkaXNtaXNzZWQuIEFsc28ga2VlcCB0cmFjayBvZiB3 aGV0aGVyCisgICAgICAgIGEgbWVkaWEgY29udHJvbHMgY29udGV4dG1lbnUgaXMgYWxyZWFkeSBz aG93aW5nIHNvIHRoYXQgdGhlIG1lZGlhIGNvbnRyb2xzIGRvbid0IGF0dGVtcHQgdG8KKyAgICAg ICAgc2hvdyBhbm90aGVyIG1lZGlhIGNvbnRyb2xzIGNvbnRleHRtZW51IHVudGlsIHRoZSBleGlz dGluZyBvbmUgaGFzIGJlZW4gZGlzbWlzc2VkLgorCisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4t bWVkaWEtY29udHJvbHMvbWVkaWEvbWVkaWEtY29udHJvbGxlci5qczoKKyAgICAgICAgKE1lZGlh Q29udHJvbGxlci5wcm90b3R5cGUuZ2V0IGNhblNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUp OiBBZGRlZC4KKyAgICAgICAgKE1lZGlhQ29udHJvbGxlci5wcm90b3R5cGUuc2hvd01lZGlhQ29u dHJvbHNDb250ZXh0TWVudSk6IEFkZGVkLgorICAgICAgICBBZGQgaGVscGVyIGZ1bmN0aW9ucyBm b3IgcXVlcnlpbmcgd2hldGhlciB0aGUgbWVkaWEgY29udHJvbHMgY29udGV4dG1lbnUgY2FuIGJl IHNob3duIGFuZAorICAgICAgICBmb3IgYWN0dWFsbHkgc2hvd2luZyB0aGUgbWVkaWEgY29udHJv bHMgY29udGV4dG1lbnUgKGJhc2VkIG9uIHRoZSBnaXZlbiBgQnV0dG9uYCdzIGBlbGVtZW50YAor ICAgICAgICBhbmQgYGNvbnRleHRNZW51T3B0aW9uc2ApIHdoaWNoIHdpbGwgZW1waGFzaXplIChg Lm9uID0gdHJ1ZWApIGlmIHNob3dpbmcgdGhlIG1lZGlhIGNvbnRyb2xzCisgICAgICAgIGNvbnRl eHRtZW51IHdhcyBzdWNjZXNzZnVsIGFuZCBkZS1lbXBoYXNpemUgKGAub24gPSBmYWxzZWApIG9u Y2UgdGhlIG1lZGlhIGNvbnRyb2xzCisgICAgICAgIGNvbnRleHRtZW51IGlzIGRpc21pc3NlZC4K KworICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL292ZXJmbG93 LXN1cHBvcnQuanM6CisgICAgICAgIChPdmVyZmxvd1N1cHBvcnQucHJvdG90eXBlLmJ1dHRvbldh c1ByZXNzZWQpOgorICAgICAgICAoT3ZlcmZsb3dTdXBwb3J0LnByb3RvdHlwZS5zeW5jQ29udHJv bCk6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvdHJhY2tz LXN1cHBvcnQuanM6CisgICAgICAgIChUcmFja3NTdXBwb3J0LnByb3RvdHlwZS5idXR0b25XYXNQ cmVzc2VkKToKKyAgICAgICAgKFRyYWNrc1N1cHBvcnQucHJvdG90eXBlLnN5bmNDb250cm9sKToK KyAgICAgICAgVXNlIHRoZSBgTWVkaWFDb250cm9sbGVyYCBoZWxwZXIgZnVuY3Rpb25zIGluc3Rl YWQgb2YgcXVlcnlpbmcgYE1lZGlhQ29udHJvbHNIb3N0YCBkaXJlY3RseS4KKwogMjAyMS0wMi0x NSAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gQWRk IGFuIG92ZXJmbG93IGJ1dHRvbiB0aGF0J3Mgc2hvd24gd2hlbiBjb250cm9scyBhcmUgZHJvcHBl ZCBzbyB0aGF0IGl0J3Mgc3RpbGwgcG9zc2libGUgdG8gdHJpZ2dlciB0aGUgZHJvcHBlZCBidXR0 b24ncyBhY3Rpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29u dHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcAppbmRleCA1OGYxMTEzYTk5Y2QuLjA5M2Q0 MjFiODdiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xz L01lZGlhQ29udHJvbHNIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh Y29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwCkBAIC00NCw4ICs0NCwxMCBAQAogI2luY2x1 ZGUgIlJlbmRlclRoZW1lLmgiCiAjaW5jbHVkZSAiVGV4dFRyYWNrLmgiCiAjaW5jbHVkZSAiVGV4 dFRyYWNrTGlzdC5oIgorI2luY2x1ZGUgIlZvaWRDYWxsYmFjay5oIgogI2luY2x1ZGUgPEphdmFT Y3JpcHRDb3JlL0pTQ0pTVmFsdWVJbmxpbmVzLmg+CiAjaW5jbHVkZSA8d3RmL0pTT05WYWx1ZXMu aD4KKyNpbmNsdWRlIDx3dGYvU2NvcGUuaD4KICNpbmNsdWRlIDx3dGYvVVVJRC5oPgogI2luY2x1 ZGUgPHd0Zi9WYXJpYW50Lmg+CiAKQEAgLTg5LDcgKzkxLDEzIEBAIE1lZGlhQ29udHJvbHNIb3N0 OjpNZWRpYUNvbnRyb2xzSG9zdChIVE1MTWVkaWFFbGVtZW50JiBtZWRpYUVsZW1lbnQpCiB7CiB9 CiAKLU1lZGlhQ29udHJvbHNIb3N0Ojp+TWVkaWFDb250cm9sc0hvc3QoKSA9IGRlZmF1bHQ7CitN ZWRpYUNvbnRyb2xzSG9zdDo6fk1lZGlhQ29udHJvbHNIb3N0KCkKK3sKKyNpZiBFTkFCTEUoTUVE SUFfQ09OVFJPTFNfQ09OVEVYVF9NRU5VUykKKyAgICBpZiAoYXV0byBzaG93TWVkaWFDb250cm9s c0NvbnRleHRNZW51Q2FsbGJhY2sgPSBzdGQ6OmV4Y2hhbmdlKG1fc2hvd01lZGlhQ29udHJvbHND b250ZXh0TWVudUNhbGxiYWNrLCBudWxscHRyKSkKKyAgICAgICAgc2hvd01lZGlhQ29udHJvbHND b250ZXh0TWVudUNhbGxiYWNrLT5oYW5kbGVFdmVudCgpOworI2VuZGlmIC8vIEVOQUJMRShNRURJ QV9DT05UUk9MU19DT05URVhUX01FTlVTKQorfQogCiBWZWN0b3I8UmVmUHRyPFRleHRUcmFjaz4+ IE1lZGlhQ29udHJvbHNIb3N0Ojpzb3J0ZWRUcmFja0xpc3RGb3JNZW51KFRleHRUcmFja0xpc3Qm IHRyYWNrTGlzdCkKIHsKQEAgLTMyNiwyNCArMzM0LDMzIEBAIFN0cmluZyBNZWRpYUNvbnRyb2xz SG9zdDo6Zm9ybWF0dGVkU3RyaW5nRm9yRHVyYXRpb24oZG91YmxlIGR1cmF0aW9uSW5TZWNvbmRz KQogI2RlZmluZSBNZWRpYUNvbnRyb2xzSG9zdEFkZGl0aW9uc19zaG93TWVkaWFDb250cm9sc0Nv bnRleHRNZW51X01lbnVEYXRhX3N3aXRjaE9uCiAjZW5kaWYKIAotdm9pZCBNZWRpYUNvbnRyb2xz SG9zdDo6c2hvd01lZGlhQ29udHJvbHNDb250ZXh0TWVudShIVE1MRWxlbWVudCYgdGFyZ2V0LCBT dHJpbmcmJiBvcHRpb25zSlNPTlN0cmluZykKK2Jvb2wgTWVkaWFDb250cm9sc0hvc3Q6OnNob3dN ZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUoSFRNTEVsZW1lbnQmIHRhcmdldCwgU3RyaW5nJiYgb3B0 aW9uc0pTT05TdHJpbmcsIFJlZjxWb2lkQ2FsbGJhY2s+JiYgY2FsbGJhY2spCiB7CisgICAgaWYg KG1fc2hvd01lZGlhQ29udHJvbHNDb250ZXh0TWVudUNhbGxiYWNrKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisKKyAgICBtX3Nob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnVDYWxsYmFjayA9IFdU Rk1vdmUoY2FsbGJhY2spOworCisgICAgYXV0byBpbnZva2VDYWxsYmFja0F0U2NvcGVFeGl0ID0g bWFrZVNjb3BlRXhpdChbJiwgcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpXSB7CisgICAg ICAgIHN0ZDo6ZXhjaGFuZ2UobV9zaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51Q2FsbGJhY2ss IG51bGxwdHIpLT5oYW5kbGVFdmVudCgpOworICAgIH0pOworCiAgICAgaWYgKCFtX21lZGlhRWxl bWVudCkKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBhdXRv JiBtZWRpYUVsZW1lbnQgPSAqbV9tZWRpYUVsZW1lbnQ7CiAKICAgICBhdXRvKiBwYWdlID0gbWVk aWFFbGVtZW50LmRvY3VtZW50KCkucGFnZSgpOwogICAgIGlmICghcGFnZSkKLSAgICAgICAgcmV0 dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBhdXRvIG9wdGlvbnNKU09OID0gSlNP Tjo6VmFsdWU6OnBhcnNlSlNPTihvcHRpb25zSlNPTlN0cmluZyk7CiAgICAgaWYgKCFvcHRpb25z SlNPTikKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBhdXRv IG9wdGlvbnNKU09OT2JqZWN0ID0gb3B0aW9uc0pTT04tPmFzT2JqZWN0KCk7CiAgICAgaWYgKCFv cHRpb25zSlNPTk9iamVjdCkKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICB1c2luZyBNZW51RGF0YSA9IFZhcmlhbnQ8UmVmUHRyPEF1ZGlvVHJhY2s+LCBSZWZQ dHI8VGV4dFRyYWNrPiBNZWRpYUNvbnRyb2xzSG9zdEFkZGl0aW9uc19zaG93TWVkaWFDb250cm9s c0NvbnRleHRNZW51X01lbnVEYXRhPjsKICAgICBIYXNoTWFwPE1lZGlhQ29udHJvbHNDb250ZXh0 TWVudUl0ZW06OklELCBNZW51RGF0YT4gaWRNYXA7CkBAIC00MTYsMTEgKzQzMywxMSBAQCB2b2lk IE1lZGlhQ29udHJvbHNIb3N0OjpzaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51KEhUTUxFbGVt ZW50JiB0YXJnZXQsIFN0cmluZwogI2VuZGlmCiAKICAgICBpZiAoaXRlbXMuaXNFbXB0eSgpKQot ICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIEFTU0VSVCghaWRN YXAuaXNFbXB0eSgpKTsKIAotICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLnNob3dNZWRpYUNv bnRyb2xzQ29udGV4dE1lbnUodGFyZ2V0LmJvdW5kc0luUm9vdFZpZXdTcGFjZSgpLCBXVEZNb3Zl KGl0ZW1zKSwgW3dlYWtNZWRpYUVsZW1lbnQgPSBtYWtlV2Vha1B0cihtZWRpYUVsZW1lbnQpLCBp ZE1hcCA9IFdURk1vdmUoaWRNYXApXSAoTWVkaWFDb250cm9sc0NvbnRleHRNZW51SXRlbTo6SUQg c2VsZWN0ZWRJdGVtSUQpIHsKKyAgICBwYWdlLT5jaHJvbWUoKS5jbGllbnQoKS5zaG93TWVkaWFD b250cm9sc0NvbnRleHRNZW51KHRhcmdldC5ib3VuZHNJblJvb3RWaWV3U3BhY2UoKSwgV1RGTW92 ZShpdGVtcyksIFt3ZWFrTWVkaWFFbGVtZW50ID0gbWFrZVdlYWtQdHIobWVkaWFFbGVtZW50KSwg aWRNYXAgPSBXVEZNb3ZlKGlkTWFwKSwgaW52b2tlQ2FsbGJhY2tBdFNjb3BlRXhpdCA9IFdURk1v dmUoaW52b2tlQ2FsbGJhY2tBdFNjb3BlRXhpdCldIChNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnVJ dGVtOjpJRCBzZWxlY3RlZEl0ZW1JRCkgewogICAgICAgICBpZiAoc2VsZWN0ZWRJdGVtSUQgPT0g TWVkaWFDb250cm9sc0NvbnRleHRNZW51SXRlbTo6aW52YWxpZElEKQogICAgICAgICAgICAgcmV0 dXJuOwogCkBAIC00NDcsNiArNDY0LDggQEAgdm9pZCBNZWRpYUNvbnRyb2xzSG9zdDo6c2hvd01l ZGlhQ29udHJvbHNDb250ZXh0TWVudShIVE1MRWxlbWVudCYgdGFyZ2V0LCBTdHJpbmcKICAgICAg ICAgICAgIE1lZGlhQ29udHJvbHNIb3N0QWRkaXRpb25zX3Nob3dNZWRpYUNvbnRyb2xzQ29udGV4 dE1lbnVfTWVudURhdGFfc3dpdGNoT24KICAgICAgICAgKTsKICAgICB9KTsKKworICAgIHJldHVy biB0cnVlOwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKE1FRElBX0NPTlRST0xTX0NPTlRFWFRfTUVO VVMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVk aWFDb250cm9sc0hvc3QuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9N ZWRpYUNvbnRyb2xzSG9zdC5oCmluZGV4IDM4Y2YxZGEyYTEyMy4uNjI2MDEwZjM0MWUwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9s c0hvc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFD b250cm9sc0hvc3QuaApAQCAtNDAsNiArNDAsNyBAQCBjbGFzcyBIVE1MTWVkaWFFbGVtZW50Owog Y2xhc3MgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDsKIGNsYXNzIFRleHRU cmFjazsKIGNsYXNzIFRleHRUcmFja0xpc3Q7CitjbGFzcyBWb2lkQ2FsbGJhY2s7CiAKIGNsYXNz IE1lZGlhQ29udHJvbHNIb3N0IDogcHVibGljIFJlZkNvdW50ZWQ8TWVkaWFDb250cm9sc0hvc3Q+ IHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRChNZWRpYUNvbnRyb2xzSG9zdCk7CkBAIC05 Myw3ICs5NCw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgU3RyaW5nIGZvcm1hdHRlZFN0cmluZ0Zv ckR1cmF0aW9uKGRvdWJsZSk7CiAKICNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfQ09OVEVYVF9N RU5VUykKLSAgICB2b2lkIHNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUoSFRNTEVsZW1lbnQm LCBTdHJpbmcmJiBvcHRpb25zSlNPTlN0cmluZyk7CisgICAgYm9vbCBzaG93TWVkaWFDb250cm9s c0NvbnRleHRNZW51KEhUTUxFbGVtZW50JiwgU3RyaW5nJiYgb3B0aW9uc0pTT05TdHJpbmcsIFJl ZjxWb2lkQ2FsbGJhY2s+JiYpOwogI2VuZGlmIC8vIEVOQUJMRShNRURJQV9DT05UUk9MU19DT05U RVhUX01FTlVTKQogCiBwcml2YXRlOgpAQCAtMTAxLDYgKzEwMiwxMSBAQCBwcml2YXRlOgogCiAg ICAgV2Vha1B0cjxIVE1MTWVkaWFFbGVtZW50PiBtX21lZGlhRWxlbWVudDsKICAgICBSZWZQdHI8 TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudD4gbV90ZXh0VHJhY2tDb250YWlu ZXI7CisKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfQ09OVEVYVF9NRU5VUykKKyAgICBSZWZQ dHI8Vm9pZENhbGxiYWNrPiBtX3Nob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnVDYWxsYmFjazsK KyNlbmRpZiAvLyBFTkFCTEUoTUVESUFfQ09OVFJPTFNfQ09OVEVYVF9NRU5VUykKKwogICAgIGJv b2wgbV9zaW11bGF0ZUNvbXBhY3RNb2RlIHsgZmFsc2UgfTsKIH07CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGwg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3Qu aWRsCmluZGV4IDRjMDgzYzkwOWVkYi4uYjNkNzk0OTQ0YWMxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaWRsCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5p ZGwKQEAgLTY1LDUgKzY1LDUgQEAgZW51bSBEZXZpY2VUeXBlIHsKICAgICBbRW5hYmxlZEF0UnVu dGltZT1Nb2Rlcm5NZWRpYUNvbnRyb2xzXSBET01TdHJpbmcgYmFzZTY0U3RyaW5nRm9ySWNvbk5h bWVBbmRUeXBlKERPTVN0cmluZyBpY29uTmFtZSwgRE9NU3RyaW5nIGljb25UeXBlKTsKICAgICBb RW5hYmxlZEF0UnVudGltZT1Nb2Rlcm5NZWRpYUNvbnRyb2xzXSBET01TdHJpbmcgZm9ybWF0dGVk U3RyaW5nRm9yRHVyYXRpb24odW5yZXN0cmljdGVkIGRvdWJsZSBkdXJhdGlvbkluU2Vjb25kcyk7 CiAKLSAgICBbQ29uZGl0aW9uYWw9TUVESUFfQ09OVFJPTFNfQ09OVEVYVF9NRU5VUywgRW5hYmxl ZEJ5U2V0dGluZz1NZWRpYUNvbnRyb2xzQ29udGV4dE1lbnVzLCBFbmFibGVkQXRSdW50aW1lPU1v ZGVybk1lZGlhQ29udHJvbHNdIHVuZGVmaW5lZCBzaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51 KEhUTUxFbGVtZW50IHRhcmdldCwgSlNPTiBvcHRpb25zKTsKKyAgICBbQ29uZGl0aW9uYWw9TUVE SUFfQ09OVFJPTFNfQ09OVEVYVF9NRU5VUywgRW5hYmxlZEJ5U2V0dGluZz1NZWRpYUNvbnRyb2xz Q29udGV4dE1lbnVzLCBFbmFibGVkQXRSdW50aW1lPU1vZGVybk1lZGlhQ29udHJvbHNdIGJvb2xl YW4gc2hvd01lZGlhQ29udHJvbHNDb250ZXh0TWVudShIVE1MRWxlbWVudCB0YXJnZXQsIEpTT04g b3B0aW9ucywgVm9pZENhbGxiYWNrIGNhbGxiYWNrKTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9tZWRpYS1jb250cm9s bGVyLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVk aWEvbWVkaWEtY29udHJvbGxlci5qcwppbmRleCBkN2RhZWFkMTA1YzkuLjk3N2RkYjllOGI3YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv bWVkaWEvbWVkaWEtY29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21v ZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9tZWRpYS1jb250cm9sbGVyLmpzCkBAIC0xMTMsNiAr MTEzLDI5IEBAIGNsYXNzIE1lZGlhQ29udHJvbGxlcgogICAgICAgICAgICAgdGhpcy5tZWRpYS5w YXVzZSgpOwogICAgIH0KIAorICAgIGdldCBjYW5TaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51 KCkKKyAgICB7CisgICAgICAgIHJldHVybiAhIXRoaXMuaG9zdD8uc2hvd01lZGlhQ29udHJvbHND b250ZXh0TWVudTsKKyAgICB9CisKKyAgICBzaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51KGJ1 dHRvbikKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5jYW5TaG93TWVkaWFDb250cm9sc0NvbnRl eHRNZW51KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIGxldCBhdXRvSGlk ZUNvbnRyb2xsZXIgPSB0aGlzLmNvbnRyb2xzLmF1dG9IaWRlQ29udHJvbGxlcjsKKworICAgICAg ICBsZXQgd2lsbFNob3dDb250ZXh0TWVudSA9IHRoaXMuaG9zdC5zaG93TWVkaWFDb250cm9sc0Nv bnRleHRNZW51KGJ1dHRvbi5lbGVtZW50LCBidXR0b24uY29udGV4dE1lbnVPcHRpb25zLCAoKSA9 PiB7CisgICAgICAgICAgICBidXR0b24ub24gPSBmYWxzZTsKKyAgICAgICAgICAgIGF1dG9IaWRl Q29udHJvbGxlci5oYXNTZWNvbmRhcnlVSUF0dGFjaGVkID0gZmFsc2U7CisgICAgICAgIH0pOwor ICAgICAgICBpZiAod2lsbFNob3dDb250ZXh0TWVudSkgeworICAgICAgICAgICAgYnV0dG9uLm9u ID0gdHJ1ZTsKKyAgICAgICAgICAgIGF1dG9IaWRlQ29udHJvbGxlci5oYXNTZWNvbmRhcnlVSUF0 dGFjaGVkID0gdHJ1ZTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gd2lsbFNob3dDb250ZXh0 TWVudTsKKyAgICB9CisKICAgICAvLyBQcm90ZWN0ZWQKIAogICAgIHNldCBwYWdlU2NhbGVGYWN0 b3IocGFnZVNjYWxlRmFjdG9yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t b2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvb3ZlcmZsb3ctc3VwcG9ydC5qcyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL292ZXJmbG93LXN1cHBv cnQuanMKaW5kZXggNDAwMTgwMzM0MmU1Li44N2ZlZDJlZmI0MTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL292ZXJmbG93LXN1 cHBvcnQuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvbWVkaWEvb3ZlcmZsb3ctc3VwcG9ydC5qcwpAQCAtNDIsMTMgKzQyLDEyIEBAIGNsYXNzIE92 ZXJmbG93U3VwcG9ydCBleHRlbmRzIE1lZGlhQ29udHJvbGxlclN1cHBvcnQKIAogICAgIGJ1dHRv bldhc1ByZXNzZWQoY29udHJvbCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLm1lZGlhQ29udHJv bGxlci5ob3N0Py5zaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51KQotICAgICAgICAgICAgdGhp cy5tZWRpYUNvbnRyb2xsZXIuaG9zdC5zaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51KGNvbnRy b2wuZWxlbWVudCwgY29udHJvbC5jb250ZXh0TWVudU9wdGlvbnMpOworICAgICAgICB0aGlzLm1l ZGlhQ29udHJvbGxlci5zaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51KGNvbnRyb2wpOwogICAg IH0KIAogICAgIHN5bmNDb250cm9sKCkKICAgICB7Ci0gICAgICAgIHRoaXMuY29udHJvbC5lbmFi bGVkID0gdGhpcy5tZWRpYUNvbnRyb2xsZXIubGF5b3V0VHJhaXRzICYgTGF5b3V0VHJhaXRzLmlP UyAmJiB0aGlzLm1lZGlhQ29udHJvbGxlci5ob3N0Py5zaG93TWVkaWFDb250cm9sc0NvbnRleHRN ZW51OworICAgICAgICB0aGlzLmNvbnRyb2wuZW5hYmxlZCA9IHRoaXMubWVkaWFDb250cm9sbGVy LmxheW91dFRyYWl0cyAmIExheW91dFRyYWl0cy5pT1MgJiYgdGhpcy5tZWRpYUNvbnRyb2xsZXIu Y2FuU2hvd01lZGlhQ29udHJvbHNDb250ZXh0TWVudTsKIAogICAgICAgICBsZXQgZGVmYXVsdENv bnRleHRNZW51T3B0aW9ucyA9IHt9OwogICAgICAgICB3aW5kb3dbIldlYktpdEFkZGl0aW9ucy5P dmVyZmxvd1N1cHBvcnQucHJvdG90eXBlLnN5bmNDb250cm9sIl0/Lih0aGlzLCBkZWZhdWx0Q29u dGV4dE1lbnVPcHRpb25zKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL3RyYWNrcy1zdXBwb3J0LmpzIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvdHJhY2tzLXN1cHBvcnQuanMK aW5kZXggZTc3YTBkYzRiODI4Li42N2ZjOWM2ZjIwZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL3RyYWNrcy1zdXBwb3J0Lmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlh L3RyYWNrcy1zdXBwb3J0LmpzCkBAIC01Niw5ICs1NiwxMCBAQCBjbGFzcyBUcmFja3NTdXBwb3J0 IGV4dGVuZHMgTWVkaWFDb250cm9sbGVyU3VwcG9ydAogCiAgICAgYnV0dG9uV2FzUHJlc3NlZChj b250cm9sKQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMubWVkaWFDb250cm9sbGVyLmhvc3Q/LnNo b3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUpCi0gICAgICAgICAgICB0aGlzLm1lZGlhQ29udHJv bGxlci5ob3N0LnNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUoY29udHJvbC5lbGVtZW50LCBj b250cm9sLmNvbnRleHRNZW51T3B0aW9ucyk7Ci0gICAgICAgIGVsc2UKKyAgICAgICAgaWYgKHRo aXMubWVkaWFDb250cm9sbGVyLnNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUoY29udHJvbCkp CisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKHRoaXMubWVkaWFDb250cm9sbGVy LmxheW91dFRyYWl0cyAmIExheW91dFRyYWl0cy5tYWNPUykKICAgICAgICAgICAgIHRoaXMubWVk aWFDb250cm9sbGVyLmNvbnRyb2xzLnNob3dUcmFja3NQYW5lbCgpOwogICAgIH0KIApAQCAtMTMz LDcgKzEzNCw3IEBAIGNsYXNzIFRyYWNrc1N1cHBvcnQgZXh0ZW5kcyBNZWRpYUNvbnRyb2xsZXJT dXBwb3J0CiAKICAgICBzeW5jQ29udHJvbCgpCiAgICAgewotICAgICAgICB0aGlzLmNvbnRyb2wu ZW5hYmxlZCA9ICh0aGlzLm1lZGlhQ29udHJvbGxlci5sYXlvdXRUcmFpdHMgJiBMYXlvdXRUcmFp dHMubWFjT1MgfHwgdGhpcy5tZWRpYUNvbnRyb2xsZXIuaG9zdD8uc2hvd01lZGlhQ29udHJvbHND b250ZXh0TWVudSkgJiYgKHRoaXMuX2NhblBpY2tBdWRpb1RyYWNrcygpIHx8IHRoaXMuX2NhblBp Y2tUZXh0VHJhY2tzKCkpOworICAgICAgICB0aGlzLmNvbnRyb2wuZW5hYmxlZCA9ICh0aGlzLm1l ZGlhQ29udHJvbGxlci5sYXlvdXRUcmFpdHMgJiBMYXlvdXRUcmFpdHMubWFjT1MgfHwgdGhpcy5t ZWRpYUNvbnRyb2xsZXIuY2FuU2hvd01lZGlhQ29udHJvbHNDb250ZXh0TWVudSkgJiYgKHRoaXMu X2NhblBpY2tBdWRpb1RyYWNrcygpIHx8IHRoaXMuX2NhblBpY2tUZXh0VHJhY2tzKCkpOwogICAg IH0KIAogICAgIC8vIFByaXZhdGUK 420658 2021-02-17 09:46:00 -0800 2021-02-17 13:36:22 -0800 Patch bug-221938-20210217104559.patch text/plain 12670 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZGY5YWMwMmE2YTA1ODBkYmY5ZWQ4YWNiY2E4MTY3NjFjNjYyODg3Li42 MmE4NDg0ODExMWM3YmVmYThiNzdlZDhmOTBhNzA4MGFkZjRlZmY2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzggQEAKKzIwMjEtMDItMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFtpT1NdIHRoZSB0cmFja3MgYnV0dG9uIHNob3VsZCBiZSBlbXBoYXNpemVk IHdoaWxlIHRoZSBtZWRpYSBjb250cm9scyBjb250ZXh0IG1lbnUgaXMgc2hvd2luZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxOTM4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNv bnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhY29u dHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhY29udHJv bHMvTWVkaWFDb250cm9sc0hvc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9s c0hvc3Q6On5NZWRpYUNvbnRyb2xzSG9zdCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6TWVk aWFDb250cm9sc0hvc3Q6OnNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUpOgorICAgICAgICBN b2RpZnkgYE1lZGlhQ29udHJvbHNIb3N0OjpzaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51YCB0 byByZXR1cm4gYSBgYm9vbGAgaW5kaWNhdGluZworICAgICAgICB3aGV0aGVyIHRoZSBtZWRpYSBj b250cm9scyBjb250ZXh0bWVudSB3YXMgYWJsZSB0byBiZSBzaG93biBhbmQgYWxzbyBhY2NlcHQg YSBgVm9pZENhbGxiYWNrYAorICAgICAgICB0aGF0J3MgaW52b2tlZCB3aGVuIHRoZSBtZWRpYSBj b250cm9scyBjb250ZXh0bWVudSBpcyBkaXNtaXNzZWQuIEFsc28ga2VlcCB0cmFjayBvZiB3aGV0 aGVyCisgICAgICAgIGEgbWVkaWEgY29udHJvbHMgY29udGV4dG1lbnUgaXMgYWxyZWFkeSBzaG93 aW5nIHNvIHRoYXQgdGhlIG1lZGlhIGNvbnRyb2xzIGRvbid0IGF0dGVtcHQgdG8KKyAgICAgICAg c2hvdyBhbm90aGVyIG1lZGlhIGNvbnRyb2xzIGNvbnRleHRtZW51IHVudGlsIHRoZSBleGlzdGlu ZyBvbmUgaGFzIGJlZW4gZGlzbWlzc2VkLgorCisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVk aWEtY29udHJvbHMvbWVkaWEvbWVkaWEtY29udHJvbGxlci5qczoKKyAgICAgICAgKE1lZGlhQ29u dHJvbGxlci5wcm90b3R5cGUuZ2V0IGNhblNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUpOiBB ZGRlZC4KKyAgICAgICAgKE1lZGlhQ29udHJvbGxlci5wcm90b3R5cGUuc2hvd01lZGlhQ29udHJv bHNDb250ZXh0TWVudSk6IEFkZGVkLgorICAgICAgICBBZGQgaGVscGVyIGZ1bmN0aW9ucyBmb3Ig cXVlcnlpbmcgd2hldGhlciB0aGUgbWVkaWEgY29udHJvbHMgY29udGV4dG1lbnUgY2FuIGJlIHNo b3duIGFuZAorICAgICAgICBmb3IgYWN0dWFsbHkgc2hvd2luZyB0aGUgbWVkaWEgY29udHJvbHMg Y29udGV4dG1lbnUgKGJhc2VkIG9uIHRoZSBnaXZlbiBgQnV0dG9uYCdzIGBlbGVtZW50YAorICAg ICAgICBhbmQgYGNvbnRleHRNZW51T3B0aW9uc2ApIHdoaWNoIHdpbGwgZW1waGFzaXplIChgLm9u ID0gdHJ1ZWApIGlmIHNob3dpbmcgdGhlIG1lZGlhIGNvbnRyb2xzCisgICAgICAgIGNvbnRleHRt ZW51IHdhcyBzdWNjZXNzZnVsIGFuZCBkZS1lbXBoYXNpemUgKGAub24gPSBmYWxzZWApIG9uY2Ug dGhlIG1lZGlhIGNvbnRyb2xzCisgICAgICAgIGNvbnRleHRtZW51IGlzIGRpc21pc3NlZC4KKwor ICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL292ZXJmbG93LXN1 cHBvcnQuanM6CisgICAgICAgIChPdmVyZmxvd1N1cHBvcnQucHJvdG90eXBlLmJ1dHRvbldhc1By ZXNzZWQpOgorICAgICAgICAoT3ZlcmZsb3dTdXBwb3J0LnByb3RvdHlwZS5zeW5jQ29udHJvbCk6 CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvdHJhY2tzLXN1 cHBvcnQuanM6CisgICAgICAgIChUcmFja3NTdXBwb3J0LnByb3RvdHlwZS5idXR0b25XYXNQcmVz c2VkKToKKyAgICAgICAgKFRyYWNrc1N1cHBvcnQucHJvdG90eXBlLnN5bmNDb250cm9sKToKKyAg ICAgICAgVXNlIHRoZSBgTWVkaWFDb250cm9sbGVyYCBoZWxwZXIgZnVuY3Rpb25zIGluc3RlYWQg b2YgcXVlcnlpbmcgYE1lZGlhQ29udHJvbHNIb3N0YCBkaXJlY3RseS4KKwogMjAyMS0wMi0xNyAg RGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gQWRkIGFu IG92ZXJmbG93IGJ1dHRvbiB0aGF0J3Mgc2hvd24gd2hlbiBjb250cm9scyBhcmUgZHJvcHBlZCBz byB0aGF0IGl0J3Mgc3RpbGwgcG9zc2libGUgdG8gdHJpZ2dlciB0aGUgZHJvcHBlZCBidXR0b24n cyBhY3Rpb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJv bHMvTWVkaWFDb250cm9sc0hvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNv bnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcAppbmRleCA1OGYxMTEzYTk5Y2RmMGM1ZmE4MWQw Zjk1MTNiOGRjOTJhMTMxZDNjLi4wOTNkNDIxYjg3YmI0MWNlYTYzOTA4ZjYzNjc1NWM3OTA3Mjg0 ZDE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVk aWFDb250cm9sc0hvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250 cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHAKQEAgLTQ0LDggKzQ0LDEwIEBACiAjaW5jbHVkZSAi UmVuZGVyVGhlbWUuaCIKICNpbmNsdWRlICJUZXh0VHJhY2suaCIKICNpbmNsdWRlICJUZXh0VHJh Y2tMaXN0LmgiCisjaW5jbHVkZSAiVm9pZENhbGxiYWNrLmgiCiAjaW5jbHVkZSA8SmF2YVNjcmlw dENvcmUvSlNDSlNWYWx1ZUlubGluZXMuaD4KICNpbmNsdWRlIDx3dGYvSlNPTlZhbHVlcy5oPgor I2luY2x1ZGUgPHd0Zi9TY29wZS5oPgogI2luY2x1ZGUgPHd0Zi9VVUlELmg+CiAjaW5jbHVkZSA8 d3RmL1ZhcmlhbnQuaD4KIApAQCAtODksNyArOTEsMTMgQEAgTWVkaWFDb250cm9sc0hvc3Q6Ok1l ZGlhQ29udHJvbHNIb3N0KEhUTUxNZWRpYUVsZW1lbnQmIG1lZGlhRWxlbWVudCkKIHsKIH0KIAot TWVkaWFDb250cm9sc0hvc3Q6On5NZWRpYUNvbnRyb2xzSG9zdCgpID0gZGVmYXVsdDsKK01lZGlh Q29udHJvbHNIb3N0Ojp+TWVkaWFDb250cm9sc0hvc3QoKQoreworI2lmIEVOQUJMRShNRURJQV9D T05UUk9MU19DT05URVhUX01FTlVTKQorICAgIGlmIChhdXRvIHNob3dNZWRpYUNvbnRyb2xzQ29u dGV4dE1lbnVDYWxsYmFjayA9IHN0ZDo6ZXhjaGFuZ2UobV9zaG93TWVkaWFDb250cm9sc0NvbnRl eHRNZW51Q2FsbGJhY2ssIG51bGxwdHIpKQorICAgICAgICBzaG93TWVkaWFDb250cm9sc0NvbnRl eHRNZW51Q2FsbGJhY2stPmhhbmRsZUV2ZW50KCk7CisjZW5kaWYgLy8gRU5BQkxFKE1FRElBX0NP TlRST0xTX0NPTlRFWFRfTUVOVVMpCit9CiAKIFZlY3RvcjxSZWZQdHI8VGV4dFRyYWNrPj4gTWVk aWFDb250cm9sc0hvc3Q6OnNvcnRlZFRyYWNrTGlzdEZvck1lbnUoVGV4dFRyYWNrTGlzdCYgdHJh Y2tMaXN0KQogewpAQCAtMzI2LDI0ICszMzQsMzMgQEAgU3RyaW5nIE1lZGlhQ29udHJvbHNIb3N0 Ojpmb3JtYXR0ZWRTdHJpbmdGb3JEdXJhdGlvbihkb3VibGUgZHVyYXRpb25JblNlY29uZHMpCiAj ZGVmaW5lIE1lZGlhQ29udHJvbHNIb3N0QWRkaXRpb25zX3Nob3dNZWRpYUNvbnRyb2xzQ29udGV4 dE1lbnVfTWVudURhdGFfc3dpdGNoT24KICNlbmRpZgogCi12b2lkIE1lZGlhQ29udHJvbHNIb3N0 OjpzaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51KEhUTUxFbGVtZW50JiB0YXJnZXQsIFN0cmlu ZyYmIG9wdGlvbnNKU09OU3RyaW5nKQorYm9vbCBNZWRpYUNvbnRyb2xzSG9zdDo6c2hvd01lZGlh Q29udHJvbHNDb250ZXh0TWVudShIVE1MRWxlbWVudCYgdGFyZ2V0LCBTdHJpbmcmJiBvcHRpb25z SlNPTlN0cmluZywgUmVmPFZvaWRDYWxsYmFjaz4mJiBjYWxsYmFjaykKIHsKKyAgICBpZiAobV9z aG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51Q2FsbGJhY2spCisgICAgICAgIHJldHVybiBmYWxz ZTsKKworICAgIG1fc2hvd01lZGlhQ29udHJvbHNDb250ZXh0TWVudUNhbGxiYWNrID0gV1RGTW92 ZShjYWxsYmFjayk7CisKKyAgICBhdXRvIGludm9rZUNhbGxiYWNrQXRTY29wZUV4aXQgPSBtYWtl U2NvcGVFeGl0KFsmLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyldIHsKKyAgICAgICAg c3RkOjpleGNoYW5nZShtX3Nob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnVDYWxsYmFjaywgbnVs bHB0ciktPmhhbmRsZUV2ZW50KCk7CisgICAgfSk7CisKICAgICBpZiAoIW1fbWVkaWFFbGVtZW50 KQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8mIG1l ZGlhRWxlbWVudCA9ICptX21lZGlhRWxlbWVudDsKIAogICAgIGF1dG8qIHBhZ2UgPSBtZWRpYUVs ZW1lbnQuZG9jdW1lbnQoKS5wYWdlKCk7CiAgICAgaWYgKCFwYWdlKQotICAgICAgICByZXR1cm47 CisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8gb3B0aW9uc0pTT04gPSBKU09OOjpW YWx1ZTo6cGFyc2VKU09OKG9wdGlvbnNKU09OU3RyaW5nKTsKICAgICBpZiAoIW9wdGlvbnNKU09O KQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8gb3B0 aW9uc0pTT05PYmplY3QgPSBvcHRpb25zSlNPTi0+YXNPYmplY3QoKTsKICAgICBpZiAoIW9wdGlv bnNKU09OT2JqZWN0KQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxzZTsKIAog ICAgIHVzaW5nIE1lbnVEYXRhID0gVmFyaWFudDxSZWZQdHI8QXVkaW9UcmFjaz4sIFJlZlB0cjxU ZXh0VHJhY2s+IE1lZGlhQ29udHJvbHNIb3N0QWRkaXRpb25zX3Nob3dNZWRpYUNvbnRyb2xzQ29u dGV4dE1lbnVfTWVudURhdGE+OwogICAgIEhhc2hNYXA8TWVkaWFDb250cm9sc0NvbnRleHRNZW51 SXRlbTo6SUQsIE1lbnVEYXRhPiBpZE1hcDsKQEAgLTQxNiwxMSArNDMzLDExIEBAIHZvaWQgTWVk aWFDb250cm9sc0hvc3Q6OnNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUoSFRNTEVsZW1lbnQm IHRhcmdldCwgU3RyaW5nCiAjZW5kaWYKIAogICAgIGlmIChpdGVtcy5pc0VtcHR5KCkpCi0gICAg ICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgQVNTRVJUKCFpZE1hcC5p c0VtcHR5KCkpOwogCi0gICAgcGFnZS0+Y2hyb21lKCkuY2xpZW50KCkuc2hvd01lZGlhQ29udHJv bHNDb250ZXh0TWVudSh0YXJnZXQuYm91bmRzSW5Sb290Vmlld1NwYWNlKCksIFdURk1vdmUoaXRl bXMpLCBbd2Vha01lZGlhRWxlbWVudCA9IG1ha2VXZWFrUHRyKG1lZGlhRWxlbWVudCksIGlkTWFw ID0gV1RGTW92ZShpZE1hcCldIChNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnVJdGVtOjpJRCBzZWxl Y3RlZEl0ZW1JRCkgeworICAgIHBhZ2UtPmNocm9tZSgpLmNsaWVudCgpLnNob3dNZWRpYUNvbnRy b2xzQ29udGV4dE1lbnUodGFyZ2V0LmJvdW5kc0luUm9vdFZpZXdTcGFjZSgpLCBXVEZNb3ZlKGl0 ZW1zKSwgW3dlYWtNZWRpYUVsZW1lbnQgPSBtYWtlV2Vha1B0cihtZWRpYUVsZW1lbnQpLCBpZE1h cCA9IFdURk1vdmUoaWRNYXApLCBpbnZva2VDYWxsYmFja0F0U2NvcGVFeGl0ID0gV1RGTW92ZShp bnZva2VDYWxsYmFja0F0U2NvcGVFeGl0KV0gKE1lZGlhQ29udHJvbHNDb250ZXh0TWVudUl0ZW06 OklEIHNlbGVjdGVkSXRlbUlEKSB7CiAgICAgICAgIGlmIChzZWxlY3RlZEl0ZW1JRCA9PSBNZWRp YUNvbnRyb2xzQ29udGV4dE1lbnVJdGVtOjppbnZhbGlkSUQpCiAgICAgICAgICAgICByZXR1cm47 CiAKQEAgLTQ0Nyw2ICs0NjQsOCBAQCB2b2lkIE1lZGlhQ29udHJvbHNIb3N0OjpzaG93TWVkaWFD b250cm9sc0NvbnRleHRNZW51KEhUTUxFbGVtZW50JiB0YXJnZXQsIFN0cmluZwogICAgICAgICAg ICAgTWVkaWFDb250cm9sc0hvc3RBZGRpdGlvbnNfc2hvd01lZGlhQ29udHJvbHNDb250ZXh0TWVu dV9NZW51RGF0YV9zd2l0Y2hPbgogICAgICAgICApOwogICAgIH0pOworCisgICAgcmV0dXJuIHRy dWU7CiB9CiAKICNlbmRpZiAvLyBFTkFCTEUoTUVESUFfQ09OVFJPTFNfQ09OVEVYVF9NRU5VUykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNv bnRyb2xzSG9zdC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlh Q29udHJvbHNIb3N0LmgKaW5kZXggZGExZDJmMDA5MjFjMTMxMjIxZDg5NTBhZGQzYzdmOTI2YWRm ZjBiYS4uZTA1MmI4NzNmZDFjZGRkZGI0YjE1M2Y0ZmM1NjVkN2VjZDYxNTc1MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJv bHNIb3N0LmgKQEAgLTQwLDYgKzQwLDcgQEAgY2xhc3MgSFRNTE1lZGlhRWxlbWVudDsKIGNsYXNz IE1lZGlhQ29udHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQ7CiBjbGFzcyBUZXh0VHJhY2s7 CiBjbGFzcyBUZXh0VHJhY2tMaXN0OworY2xhc3MgVm9pZENhbGxiYWNrOwogCiBjbGFzcyBNZWRp YUNvbnRyb2xzSG9zdCA6IHB1YmxpYyBSZWZDb3VudGVkPE1lZGlhQ29udHJvbHNIb3N0PiB7CiAg ICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQoTWVkaWFDb250cm9sc0hvc3QpOwpAQCAtOTMsNyAr OTQsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFN0cmluZyBmb3JtYXR0ZWRTdHJpbmdGb3JEdXJh dGlvbihkb3VibGUpOwogCiAjaWYgRU5BQkxFKE1FRElBX0NPTlRST0xTX0NPTlRFWFRfTUVOVVMp Ci0gICAgdm9pZCBzaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51KEhUTUxFbGVtZW50JiwgU3Ry aW5nJiYgb3B0aW9uc0pTT05TdHJpbmcpOworICAgIGJvb2wgc2hvd01lZGlhQ29udHJvbHNDb250 ZXh0TWVudShIVE1MRWxlbWVudCYsIFN0cmluZyYmIG9wdGlvbnNKU09OU3RyaW5nLCBSZWY8Vm9p ZENhbGxiYWNrPiYmKTsKICNlbmRpZiAvLyBFTkFCTEUoTUVESUFfQ09OVFJPTFNfQ09OVEVYVF9N RU5VUykKIAogcHJpdmF0ZToKQEAgLTEwMSw2ICsxMDIsMTEgQEAgcHJpdmF0ZToKIAogICAgIFdl YWtQdHI8SFRNTE1lZGlhRWxlbWVudD4gbV9tZWRpYUVsZW1lbnQ7CiAgICAgUmVmUHRyPE1lZGlh Q29udHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQ+IG1fdGV4dFRyYWNrQ29udGFpbmVyOwor CisjaWYgRU5BQkxFKE1FRElBX0NPTlRST0xTX0NPTlRFWFRfTUVOVVMpCisgICAgUmVmUHRyPFZv aWRDYWxsYmFjaz4gbV9zaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51Q2FsbGJhY2s7CisjZW5k aWYgLy8gRU5BQkxFKE1FRElBX0NPTlRST0xTX0NPTlRFWFRfTUVOVVMpCisKICAgICBib29sIG1f c2ltdWxhdGVDb21wYWN0TW9kZSB7IGZhbHNlIH07CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaWRsIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbApp bmRleCA0YzA4M2M5MDllZGI4M2U5NjAwZTk2NjkxNzkyMzk4ODlkNWNiNTlkLi5iM2Q3OTQ5NDRh YzFiN2YyYTc5MGMxNThiNTU2OWM2YWQzMmU2YTkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaWRsCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGwKQEAg LTY1LDUgKzY1LDUgQEAgZW51bSBEZXZpY2VUeXBlIHsKICAgICBbRW5hYmxlZEF0UnVudGltZT1N b2Rlcm5NZWRpYUNvbnRyb2xzXSBET01TdHJpbmcgYmFzZTY0U3RyaW5nRm9ySWNvbk5hbWVBbmRU eXBlKERPTVN0cmluZyBpY29uTmFtZSwgRE9NU3RyaW5nIGljb25UeXBlKTsKICAgICBbRW5hYmxl ZEF0UnVudGltZT1Nb2Rlcm5NZWRpYUNvbnRyb2xzXSBET01TdHJpbmcgZm9ybWF0dGVkU3RyaW5n Rm9yRHVyYXRpb24odW5yZXN0cmljdGVkIGRvdWJsZSBkdXJhdGlvbkluU2Vjb25kcyk7CiAKLSAg ICBbQ29uZGl0aW9uYWw9TUVESUFfQ09OVFJPTFNfQ09OVEVYVF9NRU5VUywgRW5hYmxlZEJ5U2V0 dGluZz1NZWRpYUNvbnRyb2xzQ29udGV4dE1lbnVzLCBFbmFibGVkQXRSdW50aW1lPU1vZGVybk1l ZGlhQ29udHJvbHNdIHVuZGVmaW5lZCBzaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51KEhUTUxF bGVtZW50IHRhcmdldCwgSlNPTiBvcHRpb25zKTsKKyAgICBbQ29uZGl0aW9uYWw9TUVESUFfQ09O VFJPTFNfQ09OVEVYVF9NRU5VUywgRW5hYmxlZEJ5U2V0dGluZz1NZWRpYUNvbnRyb2xzQ29udGV4 dE1lbnVzLCBFbmFibGVkQXRSdW50aW1lPU1vZGVybk1lZGlhQ29udHJvbHNdIGJvb2xlYW4gc2hv d01lZGlhQ29udHJvbHNDb250ZXh0TWVudShIVE1MRWxlbWVudCB0YXJnZXQsIEpTT04gb3B0aW9u cywgVm9pZENhbGxiYWNrIGNhbGxiYWNrKTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9tZWRpYS1jb250cm9sbGVyLmpz IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvbWVk aWEtY29udHJvbGxlci5qcwppbmRleCBkN2RhZWFkMTA1YzllZDBhZjRhOGJhMTU0Y2EwNDJhZmNh MmM1ZWU3Li45NzdkZGI5ZThiN2MxOWNmMTE1NmQzM2ZlYjk4MDQwNDczM2NiZmYxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9t ZWRpYS1jb250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL21lZGlhL21lZGlhLWNvbnRyb2xsZXIuanMKQEAgLTExMyw2ICsxMTMsMjkg QEAgY2xhc3MgTWVkaWFDb250cm9sbGVyCiAgICAgICAgICAgICB0aGlzLm1lZGlhLnBhdXNlKCk7 CiAgICAgfQogCisgICAgZ2V0IGNhblNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUoKQorICAg IHsKKyAgICAgICAgcmV0dXJuICEhdGhpcy5ob3N0Py5zaG93TWVkaWFDb250cm9sc0NvbnRleHRN ZW51OworICAgIH0KKworICAgIHNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUoYnV0dG9uKQor ICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLmNhblNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUp CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAgICAgbGV0IGF1dG9IaWRlQ29udHJv bGxlciA9IHRoaXMuY29udHJvbHMuYXV0b0hpZGVDb250cm9sbGVyOworCisgICAgICAgIGxldCB3 aWxsU2hvd0NvbnRleHRNZW51ID0gdGhpcy5ob3N0LnNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1l bnUoYnV0dG9uLmVsZW1lbnQsIGJ1dHRvbi5jb250ZXh0TWVudU9wdGlvbnMsICgpID0+IHsKKyAg ICAgICAgICAgIGJ1dHRvbi5vbiA9IGZhbHNlOworICAgICAgICAgICAgYXV0b0hpZGVDb250cm9s bGVyLmhhc1NlY29uZGFyeVVJQXR0YWNoZWQgPSBmYWxzZTsKKyAgICAgICAgfSk7CisgICAgICAg IGlmICh3aWxsU2hvd0NvbnRleHRNZW51KSB7CisgICAgICAgICAgICBidXR0b24ub24gPSB0cnVl OworICAgICAgICAgICAgYXV0b0hpZGVDb250cm9sbGVyLmhhc1NlY29uZGFyeVVJQXR0YWNoZWQg PSB0cnVlOworICAgICAgICB9CisgICAgICAgIHJldHVybiB3aWxsU2hvd0NvbnRleHRNZW51Owor ICAgIH0KKwogICAgIC8vIFByb3RlY3RlZAogCiAgICAgc2V0IHBhZ2VTY2FsZUZhY3RvcihwYWdl U2NhbGVGYWN0b3IpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9tZWRpYS9vdmVyZmxvdy1zdXBwb3J0LmpzIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvb3ZlcmZsb3ctc3VwcG9ydC5qcwpp bmRleCAzNjNhMjc2OGRiYWY2ZTdjNWU2OTA4OGY3YWM1OGM5ODI1MmJiMDAxLi5kMzA2N2QxYzBi ZTJiZjJkNzNjNmFhZDk4MzI0MTk2Njg1NWQ4ZDc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9vdmVyZmxvdy1zdXBwb3J0Lmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlh L292ZXJmbG93LXN1cHBvcnQuanMKQEAgLTQyLDEzICs0MiwxMiBAQCBjbGFzcyBPdmVyZmxvd1N1 cHBvcnQgZXh0ZW5kcyBNZWRpYUNvbnRyb2xsZXJTdXBwb3J0CiAKICAgICBidXR0b25XYXNQcmVz c2VkKGNvbnRyb2wpCiAgICAgewotICAgICAgICBpZiAodGhpcy5tZWRpYUNvbnRyb2xsZXIuaG9z dD8uc2hvd01lZGlhQ29udHJvbHNDb250ZXh0TWVudSkKLSAgICAgICAgICAgIHRoaXMubWVkaWFD b250cm9sbGVyLmhvc3Quc2hvd01lZGlhQ29udHJvbHNDb250ZXh0TWVudShjb250cm9sLmVsZW1l bnQsIGNvbnRyb2wuY29udGV4dE1lbnVPcHRpb25zKTsKKyAgICAgICAgdGhpcy5tZWRpYUNvbnRy b2xsZXIuc2hvd01lZGlhQ29udHJvbHNDb250ZXh0TWVudShjb250cm9sKTsKICAgICB9CiAKICAg ICBzeW5jQ29udHJvbCgpCiAgICAgewotICAgICAgICB0aGlzLmNvbnRyb2wuZW5hYmxlZCA9ICEh dGhpcy5tZWRpYUNvbnRyb2xsZXIuaG9zdD8uc2hvd01lZGlhQ29udHJvbHNDb250ZXh0TWVudTsK KyAgICAgICAgdGhpcy5jb250cm9sLmVuYWJsZWQgPSB0aGlzLm1lZGlhQ29udHJvbGxlci5jYW5T aG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51OwogCiAgICAgICAgIGxldCBkZWZhdWx0Q29udGV4 dE1lbnVPcHRpb25zID0ge307CiAgICAgICAgIHdpbmRvd1siV2ViS2l0QWRkaXRpb25zLk92ZXJm bG93U3VwcG9ydC5wcm90b3R5cGUuc3luY0NvbnRyb2wiXT8uKHRoaXMsIGRlZmF1bHRDb250ZXh0 TWVudU9wdGlvbnMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4t bWVkaWEtY29udHJvbHMvbWVkaWEvdHJhY2tzLXN1cHBvcnQuanMgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS90cmFja3Mtc3VwcG9ydC5qcwppbmRl eCBlNzdhMGRjNGI4Mjg4NTI4OTY4MzNiODE5MDM3OWQ5MDFkZDFmZTFlLi42N2ZjOWM2ZjIwZjI5 N2FjZWFlNzFlYTMwYTZkZWZmOTAyNDNlZTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS90cmFja3Mtc3VwcG9ydC5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS90cmFj a3Mtc3VwcG9ydC5qcwpAQCAtNTYsOSArNTYsMTAgQEAgY2xhc3MgVHJhY2tzU3VwcG9ydCBleHRl bmRzIE1lZGlhQ29udHJvbGxlclN1cHBvcnQKIAogICAgIGJ1dHRvbldhc1ByZXNzZWQoY29udHJv bCkKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLm1lZGlhQ29udHJvbGxlci5ob3N0Py5zaG93TWVk aWFDb250cm9sc0NvbnRleHRNZW51KQotICAgICAgICAgICAgdGhpcy5tZWRpYUNvbnRyb2xsZXIu aG9zdC5zaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51KGNvbnRyb2wuZWxlbWVudCwgY29udHJv bC5jb250ZXh0TWVudU9wdGlvbnMpOwotICAgICAgICBlbHNlCisgICAgICAgIGlmICh0aGlzLm1l ZGlhQ29udHJvbGxlci5zaG93TWVkaWFDb250cm9sc0NvbnRleHRNZW51KGNvbnRyb2wpKQorICAg ICAgICAgICAgcmV0dXJuOworCisgICAgICAgIGlmICh0aGlzLm1lZGlhQ29udHJvbGxlci5sYXlv dXRUcmFpdHMgJiBMYXlvdXRUcmFpdHMubWFjT1MpCiAgICAgICAgICAgICB0aGlzLm1lZGlhQ29u dHJvbGxlci5jb250cm9scy5zaG93VHJhY2tzUGFuZWwoKTsKICAgICB9CiAKQEAgLTEzMyw3ICsx MzQsNyBAQCBjbGFzcyBUcmFja3NTdXBwb3J0IGV4dGVuZHMgTWVkaWFDb250cm9sbGVyU3VwcG9y dAogCiAgICAgc3luY0NvbnRyb2woKQogICAgIHsKLSAgICAgICAgdGhpcy5jb250cm9sLmVuYWJs ZWQgPSAodGhpcy5tZWRpYUNvbnRyb2xsZXIubGF5b3V0VHJhaXRzICYgTGF5b3V0VHJhaXRzLm1h Y09TIHx8IHRoaXMubWVkaWFDb250cm9sbGVyLmhvc3Q/LnNob3dNZWRpYUNvbnRyb2xzQ29udGV4 dE1lbnUpICYmICh0aGlzLl9jYW5QaWNrQXVkaW9UcmFja3MoKSB8fCB0aGlzLl9jYW5QaWNrVGV4 dFRyYWNrcygpKTsKKyAgICAgICAgdGhpcy5jb250cm9sLmVuYWJsZWQgPSAodGhpcy5tZWRpYUNv bnRyb2xsZXIubGF5b3V0VHJhaXRzICYgTGF5b3V0VHJhaXRzLm1hY09TIHx8IHRoaXMubWVkaWFD b250cm9sbGVyLmNhblNob3dNZWRpYUNvbnRyb2xzQ29udGV4dE1lbnUpICYmICh0aGlzLl9jYW5Q aWNrQXVkaW9UcmFja3MoKSB8fCB0aGlzLl9jYW5QaWNrVGV4dFRyYWNrcygpKTsKICAgICB9CiAK ICAgICAvLyBQcml2YXRlCg==