198922 2019-06-17 10:24:00 -0700 REGRESSION (r240757): Cannot dismiss the keyboard on http://apple.com/apple-tv-plus 2019-06-18 15:29:17 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build iPhone / iPad iOS 12 RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=198928 http://apple.com/apple-tv-plus InRadar, Regression P2 Normal --- 190571 1 dbates dbates webkit-bug-importer wenson_hsieh oldest_to_newest 1545285 0 dbates 2019-06-17 10:24:00 -0700 Steps to reproduce: Ensure no hardware keyboard is attached. 1. Visit <http://apple.com/apple-tv-plus> 2. Tap Notify me. 3. Tap email address field to focus. 4. Tap X to close “Notify me” overlay. 5. Tap the Done button (iPhone) or keyboard dismissal button (iPad). Then keyboard stays on screen. But the keyboard should have been dismissed. Workaround: Click some editable element on the page or form field. Then you can dismiss the keyboard. 1545287 1 dbates 2019-06-17 10:24:12 -0700 <rdar://problem/50300056> 1545289 2 372253 dbates 2019-06-17 10:26:53 -0700 Created attachment 372253 For the Bots 1545350 3 dbates 2019-06-17 12:06:08 -0700 Need to reduce <http://apple.com/apple-tv-plus>. 1545351 4 372262 dbates 2019-06-17 12:06:39 -0700 Created attachment 372262 Patch 1545383 5 372268 dbates 2019-06-17 13:39:37 -0700 Created attachment 372268 Simpler fix, but no insurance policy.... let's see what happens. 1545772 6 372374 dbates 2019-06-18 13:29:44 -0700 Created attachment 372374 Patch 1545774 7 dbates 2019-06-18 13:32:24 -0700 Simpler fix going into bug #198928. 1545775 8 372374 wenson_hsieh 2019-06-18 13:34:28 -0700 Comment on attachment 372374 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372374&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1228 > + [self _elementDidBlur]; I think the name “elementDidBlur” is a bit misleading now. When invoked from this call site, it’s more like “elementWillBlur”. But when invoked via IPC from the web process, it’s still “elementDidBlur”. Maybe we could use a more generic name. handleElementBlur? Or perhaps cleanUpAfterElementBlur? 1545778 9 dbates 2019-06-18 13:35:33 -0700 Reduction: <!DOCTYPE html> <html> <body> <p>Tap the text field. Then tap the main page's background. Then dismiss the keyboard.</p> <iframe src="data:text/html,<input>"></iframe> </body> </html> 1545821 10 372374 dbates 2019-06-18 14:44:12 -0700 Comment on attachment 372374 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372374&action=review >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:1228 >> + [self _elementDidBlur]; > > I think the name “elementDidBlur” is a bit misleading now. When invoked from this call site, it’s more like “elementWillBlur”. But when invoked via IPC from the web process, it’s still “elementDidBlur”. > > Maybe we could use a more generic name. handleElementBlur? Or perhaps cleanUpAfterElementBlur? I hope you do not mind that I leave this for now. I could add an inline function called handleElementBlur that turns around and calls _elementDidBlur, but I don't think that improves the code much. Same for cleanUpAfterElementBlur, except that name raises more questions that it answers if I keep the implementation in _elementDidBlur. I could go another way at this and make _elementDidBlur be a one-line function that turns around and calls -cleanUpAfterElementBlur, which has the original impl. 🤷‍♂️. I keep thinking about this though. Maybe I add a comment above _elementDidBlur call: // Don't wait for the round-trip to clear out the focused element and hide the keyboard as the user explicitly instructed us to hide. 1545822 11 dbates 2019-06-18 14:47:35 -0700 Wrote comment: Don't wait for WebPageProxy::blurFocusedElement() to round-trip back to us to hide the keyboard because we know that the user explicitly requested us to do so. 1545824 12 372386 dbates 2019-06-18 14:49:39 -0700 Created attachment 372386 To land 1545826 13 dbates 2019-06-18 14:50:27 -0700 Committed r246570: <https://trac.webkit.org/changeset/246570> 1545838 14 wenson_hsieh 2019-06-18 15:29:17 -0700 (In reply to Daniel Bates from comment #11) > Wrote comment: > > Don't wait for WebPageProxy::blurFocusedElement() to round-trip back to us > to hide the keyboard because we know that the user explicitly requested us > to do so. 👍🏻 372253 2019-06-17 10:26:53 -0700 2019-06-17 12:06:38 -0700 For the Bots ForTheBots.patch text/plain 2053 dbates RnJvbSA5NzhjZGRmZjEyYzdjMGRmNTcyMTEyYWI5OGU5ZjFmYTY1ZTNmMTU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW5pZWwgQmF0ZXMgPGRhYmF0ZXNAYXBwbGUuY29tPgpEYXRl OiBNb24sIDE3IEp1biAyMDE5IDEwOjI0OjQ2IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gSnVzdCBm b3IgbGF1Z2hzCgotLS0KIC4uLi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbSAgICAgICB8IDEzICsrKysrKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlv bnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggODFmYTQzZjNhNDEuLjkx ZjYyNWMwZTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTEyMjMsOCArMTIyMywxMCBAQCAtICh2b2lk KWVuZEVkaXRpbmdBbmRVcGRhdGVGb2N1c0FwcGVhcmFuY2VXaXRoUmVhc29uOihFbmRFZGl0aW5n UmVhc29uKXJlYXNvbgogICAgIGlmICghX3dlYlZpZXcuX3JldGFpbmluZ0FjdGl2ZUZvY3VzZWRT dGF0ZSkgewogICAgICAgICAvLyBXZSBuZWVkIHRvIGNvbXBsZXRlIHRoZSBlZGl0aW5nIG9wZXJh dGlvbiBiZWZvcmUgd2UgYmx1ciB0aGUgZWxlbWVudC4KICAgICAgICAgW3NlbGYgX2VuZEVkaXRp bmddOwotICAgICAgICBpZiAoKHJlYXNvbiA9PSBFbmRFZGl0aW5nUmVhc29uQWNjZXNzb3J5RG9u ZSAmJiAhY3VycmVudFVzZXJJbnRlcmZhY2VJZGlvbUlzUGFkKCkpIHx8IF9rZXlib2FyZERpZFJl cXVlc3REaXNtaXNzYWwpCisgICAgICAgIGlmICgocmVhc29uID09IEVuZEVkaXRpbmdSZWFzb25B Y2Nlc3NvcnlEb25lICYmICFjdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKSkgfHwgX2tl eWJvYXJkRGlkUmVxdWVzdERpc21pc3NhbCkgewogICAgICAgICAgICAgX3BhZ2UtPmJsdXJGb2N1 c2VkRWxlbWVudCgpOworICAgICAgICAgICAgW3NlbGYgX2VsZW1lbnREaWRCbHVyXTsKKyAgICAg ICAgfQogICAgIH0KIAogICAgIFtzZWxmIF9jYW5jZWxJbnRlcmFjdGlvbl07CkBAIC01MjY1LDEy ICs1MjY3LDEzIEBAIC0gKHZvaWQpX2VsZW1lbnREaWRCbHVyCiAgICAgICAgIFtzZWxmIHJlbW92 ZUZvY3VzZWRGb3JtQ29udHJvbE92ZXJsYXldOwogI2VuZGlmCiAKLSAgICAvLyBUaGUgY3VzdG9t IGZpeGVkIHBvc2l0aW9uIHJlY3QgYmVoYXZpb3IgaXMgYWZmZWN0ZWQgYnkgLWlzRm9jdXNpbmdF bGVtZW50LCBzbyBpZiB0aGF0IGNoYW5nZXMgd2UgbmVlZCB0byByZWNvbXB1dGUgcmVjdHMuCi0g ICAgaWYgKGVkaXRhYmxlQ2hhbmdlZCkKKyAgICBpZiAoZWRpdGFibGVDaGFuZ2VkKSB7CisgICAg ICAgIC8vIFRoZSBjdXN0b20gZml4ZWQgcG9zaXRpb24gcmVjdCBiZWhhdmlvciBpcyBhZmZlY3Rl ZCBieSAtaXNGb2N1c2luZ0VsZW1lbnQsIHNvIGlmIHRoYXQgY2hhbmdlcyB3ZSBuZWVkIHRvIHJl Y29tcHV0ZSByZWN0cy4KICAgICAgICAgW193ZWJWaWV3IF9zY2hlZHVsZVZpc2libGVDb250ZW50 UmVjdFVwZGF0ZV07CiAKLSAgICBbX3dlYlZpZXcgZGlkRW5kRm9ybUNvbnRyb2xJbnRlcmFjdGlv bl07Ci0gICAgX3BhZ2UtPnNldElzU2hvd2luZ0lucHV0Vmlld0ZvckZvY3VzZWRFbGVtZW50KGZh bHNlKTsKKyAgICAgICAgW193ZWJWaWV3IGRpZEVuZEZvcm1Db250cm9sSW50ZXJhY3Rpb25dOwor ICAgICAgICBfcGFnZS0+c2V0SXNTaG93aW5nSW5wdXRWaWV3Rm9yRm9jdXNlZEVsZW1lbnQoZmFs c2UpOworICAgIH0KIAogICAgIGlmICghX2lzQ2hhbmdpbmdGb2N1cykKICAgICAgICAgX2RpZEFj Y2Vzc29yeVRhYkluaXRpYXRlRm9jdXMgPSBOTzsKLS0gCjIuMjEuMCAoQXBwbGUgR2l0LTExOCkK Cg== 372262 2019-06-17 12:06:39 -0700 2019-06-18 13:29:42 -0700 Patch bug-198922-20190617120638.patch text/plain 3710 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ1YjI3YjQ0YjI3Nzk3ZjI4 ZWYyOWFjMDIzMDMzNzdiNjAzMGRjNDEuLjEwZWFlN2RmYjVmMWYzYzVlYWJiZTQ4Zjg4ZmI2ZjAz YTk3ZTEyYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTktMDYtMTcgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIyNDA3NTcp OiBDYW5ub3QgZGlzbWlzcyB0aGUga2V5Ym9hcmQgb24gaHR0cDovL2FwcGxlLmNvbS9hcHBsZS10 di1wbHVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTg5MjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUwMzAwMDU2PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFjdHVhbGx5IGRpc21pc3MgdGhlIGtl eWJvYXJkIGFzIGludGVuZGVkIGluIHIyNDA3NTcuIERvIG5vdCB3YWl0IGZvciB0aGUgcm91bmQt dHJpcAorICAgICAgICB0byB0aGUgV2ViUHJvY2VzcyB0byBydW4gdGhyb3VnaCB0aGUgLWVsZW1l bnREaWRCbHVyIHN0ZXBzIGluIHRoZSBVSVByb2Nlc3MgYW5kIGhpZGUKKyAgICAgICAgdGhlIGtl eWJvYXJkIHdoZW4gYSBwZXJzb24gZXhwbGljaXRseSBkaXNtaXNzZXMgdGhlIGtleWJvYXJkIHZp YSB0aGUgRG9uZSBidXR0b24gKGlQaG9uZSkKKyAgICAgICAgb3IgaGlkZSBrZXlib2FyZCBidXR0 b24gKGlQYWQpLgorCisgICAgICAgIE5vdGUgdGhhdCByMjQwNzU3IHJldmVhbGVkIGFub3RoZXIg YnVnIGluIHRoaXMgY29kZSwgPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTg5Mjg+LgorICAgICAgICBJIGFtIHVuY2xlYXIgb2YgdGhlIGltcGxpY2F0aW9ucyBvZiB0 aGF0IGJ1ZywgYnV0IGl0IGlzIGNsZWFyIGZvciB0aGlzIGJ1ZyB0aGF0IGl0CisgICAgICAgIG5l dmVyIG1ha2VzIHNlbnNlIHRvIHJvdW5kLXRyaXAgdG8gdGhlIFdlYlByb2Nlc3Mgd2hlbiB0aGUg a2V5Ym9hcmQgaXMgZGlzbWlzc2VkIGJ5CisgICAgICAgIGEgdXNlciBnZXN0dXJlLgorCisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgZW5kRWRpdGluZ0FuZFVwZGF0ZUZvY3VzQXBwZWFyYW5jZVdpdGhS ZWFzb246XSk6IEludm9rZSAtX2VsZW1lbnREaWRCbHVyCisgICAgICAgIHRvIGJsdXIgdGhlIGVs ZW1lbnQgaW4gdGhlIFVJUHJvY2VzcyBhbmQgaGlkZSB0aGUga2V5Ym9hcmQuCisgICAgICAgICgt W1dLQ29udGVudFZpZXcgX2VsZW1lbnREaWRCbHVyXSk6IFByZXZlbnQgZHVwbGljYXRlIGludm9j YXRpb25zIG9mIC1kaWRFbmRGb3JtQ29udHJvbEludGVyYWN0aW9uCisgICAgICAgIGFuZCBzZXRJ c1Nob3dpbmdJbnB1dFZpZXdGb3JGb2N1c2VkRWxlbWVudCBtZXNzYWdlcyBieSBvbmx5IGRvaW5n IHRoZXNlIGFjdGlvbnMgd2hlbgorICAgICAgICBlZGl0YWJsaXR5IGNoYW5nZXMuIFRoaXMgY292 ZXJzIHRoZSBjYXNlIHdoZXJlIC1fZWxlbWVudERpZEJsdXIgbWF5IGJlIGludm9rZWQgYSBzZWNv bmQKKyAgICAgICAgdGltZSAodGhlIHJlcGx5IGluIHRoZSByb3VuZC10cmlwKS4gSW4gdGhhdCBj YXNlIHdlIGRvbid0IG5lZWQgdG8gZG8gdGhlc2UgYWN0aW9ucy4KKwogMjAxOS0wNi0xNyAgRGFu aWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gUHJlc3Npbmcg a2V5IHdoaWxlIGhvbGRpbmcgQ29tbWFuZCBzaG91bGQgbm90IGluc2VydCBjaGFyYWN0ZXIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLm1tCmluZGV4IGUwODAwNjA4ZDk2ZjAxNDc2YjI0MGU5MGQ3YzcwMDkzNTdjMzkyNzMu LjFkNjhhMDMwZDViN2JjMzg2YzY1ZTE2MTM3M2VlNjdmZmY0NWU5N2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bQpAQCAtMTIyMyw4ICsxMjIzLDEwIEBAIC0gKHZvaWQpZW5kRWRpdGluZ0FuZFVwZGF0ZUZvY3Vz QXBwZWFyYW5jZVdpdGhSZWFzb246KEVuZEVkaXRpbmdSZWFzb24pcmVhc29uCiAgICAgaWYgKCFf d2ViVmlldy5fcmV0YWluaW5nQWN0aXZlRm9jdXNlZFN0YXRlKSB7CiAgICAgICAgIC8vIFdlIG5l ZWQgdG8gY29tcGxldGUgdGhlIGVkaXRpbmcgb3BlcmF0aW9uIGJlZm9yZSB3ZSBibHVyIHRoZSBl bGVtZW50LgogICAgICAgICBbc2VsZiBfZW5kRWRpdGluZ107Ci0gICAgICAgIGlmICgocmVhc29u ID09IEVuZEVkaXRpbmdSZWFzb25BY2Nlc3NvcnlEb25lICYmICFjdXJyZW50VXNlckludGVyZmFj ZUlkaW9tSXNQYWQoKSkgfHwgX2tleWJvYXJkRGlkUmVxdWVzdERpc21pc3NhbCkKKyAgICAgICAg aWYgKChyZWFzb24gPT0gRW5kRWRpdGluZ1JlYXNvbkFjY2Vzc29yeURvbmUgJiYgIWN1cnJlbnRV c2VySW50ZXJmYWNlSWRpb21Jc1BhZCgpKSB8fCBfa2V5Ym9hcmREaWRSZXF1ZXN0RGlzbWlzc2Fs KSB7CiAgICAgICAgICAgICBfcGFnZS0+Ymx1ckZvY3VzZWRFbGVtZW50KCk7CisgICAgICAgICAg ICBbc2VsZiBfZWxlbWVudERpZEJsdXJdOworICAgICAgICB9CiAgICAgfQogCiAgICAgW3NlbGYg X2NhbmNlbEludGVyYWN0aW9uXTsKQEAgLTUyNjksMTIgKzUyNzEsMTMgQEAgLSAodm9pZClfZWxl bWVudERpZEJsdXIKICAgICAgICAgW3NlbGYgcmVtb3ZlRm9jdXNlZEZvcm1Db250cm9sT3Zlcmxh eV07CiAjZW5kaWYKIAotICAgIC8vIFRoZSBjdXN0b20gZml4ZWQgcG9zaXRpb24gcmVjdCBiZWhh dmlvciBpcyBhZmZlY3RlZCBieSAtaXNGb2N1c2luZ0VsZW1lbnQsIHNvIGlmIHRoYXQgY2hhbmdl cyB3ZSBuZWVkIHRvIHJlY29tcHV0ZSByZWN0cy4KLSAgICBpZiAoZWRpdGFibGVDaGFuZ2VkKQor ICAgIGlmIChlZGl0YWJsZUNoYW5nZWQpIHsKKyAgICAgICAgLy8gVGhlIGN1c3RvbSBmaXhlZCBw b3NpdGlvbiByZWN0IGJlaGF2aW9yIGlzIGFmZmVjdGVkIGJ5IC1pc0ZvY3VzaW5nRWxlbWVudCwg c28gaWYgdGhhdCBjaGFuZ2VzIHdlIG5lZWQgdG8gcmVjb21wdXRlIHJlY3RzLgogICAgICAgICBb X3dlYlZpZXcgX3NjaGVkdWxlVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlXTsKIAotICAgIFtfd2Vi VmlldyBkaWRFbmRGb3JtQ29udHJvbEludGVyYWN0aW9uXTsKLSAgICBfcGFnZS0+c2V0SXNTaG93 aW5nSW5wdXRWaWV3Rm9yRm9jdXNlZEVsZW1lbnQoZmFsc2UpOworICAgICAgICBbX3dlYlZpZXcg ZGlkRW5kRm9ybUNvbnRyb2xJbnRlcmFjdGlvbl07CisgICAgICAgIF9wYWdlLT5zZXRJc1Nob3dp bmdJbnB1dFZpZXdGb3JGb2N1c2VkRWxlbWVudChmYWxzZSk7CisgICAgfQogCiAgICAgaWYgKCFf aXNDaGFuZ2luZ0ZvY3VzKQogICAgICAgICBfZGlkQWNjZXNzb3J5VGFiSW5pdGlhdGVGb2N1cyA9 IE5POwo= 372268 2019-06-17 13:39:37 -0700 2019-06-18 13:29:43 -0700 Simpler fix, but no insurance policy.... let's see what happens. SimpleFixNoInsurancePolicy.diff text/plain 1098 dbates RnJvbSA5ZjEwMDI0MmI5YjE4NjFhMWIyNmQzOGNhMWVlNWRmNzlhNmVlMGFlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW5pZWwgQmF0ZXMgPGRhYmF0ZXNAYXBwbGUuY29tPgpEYXRl OiBNb24sIDE3IEp1biAyMDE5IDEzOjM3OjI2IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gU2ltcGxl ciBmaXguLi4gY2FuIHdlIGdldCBhd2F5IHdpdGggaXQ/CgotLS0KIFNvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIHwgMyAtLS0KIDEgZmlsZSBjaGFuZ2Vk LCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggOWY3MDJiMDFjMjMuLjM4ZTEwNjBmZmJlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5t bQpAQCAtMjU4Nyw5ICsyNTg3LDYgQEAgc3RhdGljIHZvaWQgc2VsZWN0aW9uUG9zaXRpb25JbmZv cm1hdGlvbihXZWJQYWdlJiBwYWdlLCBjb25zdCBJbnRlcmFjdGlvbkluZm9ybWEKICAgICAgICAg cmV0dXJuOwogCiAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IGhpdE5vZGUtPnJlbmRlcmVy KCk7Ci0gICAgaWYgKCFyZXF1ZXN0LnJlYWRvbmx5KQotICAgICAgICBwYWdlLmNvcmVQYWdlKCkt PmZvY3VzQ29udHJvbGxlcigpLnNldEZvY3VzZWRGcmFtZShyZXN1bHQuaW5uZXJOb2RlRnJhbWUo KSk7Ci0KICAgICBpbmZvLmJvdW5kcyA9IHJlbmRlcmVyLT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVj dCh0cnVlKTsKICAgICAvLyBXZSBkb24ndCB3YW50IHRvIHNlbGVjdCBibG9ja3MgdGhhdCBhcmUg bGFyZ2VyIHRoYW4gOTclIG9mIHRoZSB2aXNpYmxlIGFyZWEgb2YgdGhlIGRvY3VtZW50LgogICAg IGlmIChpczxIVE1MQXR0YWNobWVudEVsZW1lbnQ+KCpoaXROb2RlKSkgewotLSAKMi4yMS4wIChB cHBsZSBHaXQtMTE4KQoK 372374 2019-06-18 13:29:44 -0700 2019-06-18 14:49:38 -0700 Patch bug-198922-20190618132944.patch text/plain 9076 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ1YjI3YjQ0YjI3Nzk3ZjI4 ZWYyOWFjMDIzMDMzNzdiNjAzMGRjNDEuLjRhNDg2ZmFkMWI3ZWM2YWU5Y2RkZTk2ZDMzYzExZmIx MjVmNDk3MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTktMDYtMTggIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIyNDA3NTcp OiBDYW5ub3QgZGlzbWlzcyB0aGUga2V5Ym9hcmQgb24gaHR0cDovL2FwcGxlLmNvbS9hcHBsZS10 di1wbHVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTg5MjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUwMzAwMDU2PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFjdHVhbGx5IGRpc21pc3MgdGhlIGtl eWJvYXJkIGFzIGludGVuZGVkIGluIHIyNDA3NTcuIERvIG5vdCB3YWl0IGZvciB0aGUgcm91bmQt dHJpcAorICAgICAgICB0byB0aGUgV2ViUHJvY2VzcyB0byBydW4gdGhyb3VnaCB0aGUgLWVsZW1l bnREaWRCbHVyIHN0ZXBzIGluIHRoZSBVSVByb2Nlc3MgYW5kIGhpZGUKKyAgICAgICAgdGhlIGtl eWJvYXJkIHdoZW4gYSBwZXJzb24gZXhwbGljaXRseSBkaXNtaXNzZXMgdGhlIGtleWJvYXJkIHZp YSB0aGUgRG9uZSBidXR0b24gKGlQaG9uZSkKKyAgICAgICAgb3IgaGlkZSBrZXlib2FyZCBidXR0 b24gKGlQYWQpLgorCisgICAgICAgIE5vdGUgdGhhdCByMjQwNzU3IHJldmVhbGVkIGFub3RoZXIg YnVnIGluIHRoaXMgY29kZSwgPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTg5Mjg+LgorICAgICAgICBJIGFtIHVuY2xlYXIgb2YgdGhlIGltcGxpY2F0aW9ucyBvZiB0 aGF0IGJ1ZywgYnV0IGl0IGlzIGNsZWFyIGZvciB0aGlzIGJ1ZyB0aGF0IGl0CisgICAgICAgIG5l dmVyIG1ha2VzIHNlbnNlIHRvIHJvdW5kLXRyaXAgdG8gdGhlIFdlYlByb2Nlc3Mgd2hlbiB0aGUg a2V5Ym9hcmQgaXMgZGlzbWlzc2VkIGJ5CisgICAgICAgIGEgdXNlciBnZXN0dXJlLgorCisgICAg ICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgZW5kRWRpdGluZ0FuZFVwZGF0ZUZvY3VzQXBwZWFyYW5jZVdpdGhS ZWFzb246XSk6IEludm9rZSAtX2VsZW1lbnREaWRCbHVyCisgICAgICAgIHRvIGJsdXIgdGhlIGVs ZW1lbnQgaW4gdGhlIFVJUHJvY2VzcyBhbmQgaGlkZSB0aGUga2V5Ym9hcmQuCisgICAgICAgICgt W1dLQ29udGVudFZpZXcgX2VsZW1lbnREaWRCbHVyXSk6IFByZXZlbnQgZHVwbGljYXRlIGludm9j YXRpb25zIG9mIC1kaWRFbmRGb3JtQ29udHJvbEludGVyYWN0aW9uCisgICAgICAgIGFuZCBzZXRJ c1Nob3dpbmdJbnB1dFZpZXdGb3JGb2N1c2VkRWxlbWVudCBtZXNzYWdlcyBieSBvbmx5IGRvaW5n IHRoZXNlIGFjdGlvbnMgd2hlbgorICAgICAgICBlZGl0YWJsaXR5IGNoYW5nZXMuIFRoaXMgY292 ZXJzIHRoZSBjYXNlIHdoZXJlIC1fZWxlbWVudERpZEJsdXIgbWF5IGJlIGludm9rZWQgYSBzZWNv bmQKKyAgICAgICAgdGltZSAodGhlIHJlcGx5IGluIHRoZSByb3VuZC10cmlwKS4gSW4gdGhhdCBj YXNlIHdlIGRvbid0IG5lZWQgdG8gZG8gdGhlc2UgYWN0aW9ucy4KKwogMjAxOS0wNi0xNyAgRGFu aWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gUHJlc3Npbmcg a2V5IHdoaWxlIGhvbGRpbmcgQ29tbWFuZCBzaG91bGQgbm90IGluc2VydCBjaGFyYWN0ZXIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLm1tCmluZGV4IGUwODAwNjA4ZDk2ZjAxNDc2YjI0MGU5MGQ3YzcwMDkzNTdjMzkyNzMu LjFkNjhhMDMwZDViN2JjMzg2YzY1ZTE2MTM3M2VlNjdmZmY0NWU5N2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bQpAQCAtMTIyMyw4ICsxMjIzLDEwIEBAIC0gKHZvaWQpZW5kRWRpdGluZ0FuZFVwZGF0ZUZvY3Vz QXBwZWFyYW5jZVdpdGhSZWFzb246KEVuZEVkaXRpbmdSZWFzb24pcmVhc29uCiAgICAgaWYgKCFf d2ViVmlldy5fcmV0YWluaW5nQWN0aXZlRm9jdXNlZFN0YXRlKSB7CiAgICAgICAgIC8vIFdlIG5l ZWQgdG8gY29tcGxldGUgdGhlIGVkaXRpbmcgb3BlcmF0aW9uIGJlZm9yZSB3ZSBibHVyIHRoZSBl bGVtZW50LgogICAgICAgICBbc2VsZiBfZW5kRWRpdGluZ107Ci0gICAgICAgIGlmICgocmVhc29u ID09IEVuZEVkaXRpbmdSZWFzb25BY2Nlc3NvcnlEb25lICYmICFjdXJyZW50VXNlckludGVyZmFj ZUlkaW9tSXNQYWQoKSkgfHwgX2tleWJvYXJkRGlkUmVxdWVzdERpc21pc3NhbCkKKyAgICAgICAg aWYgKChyZWFzb24gPT0gRW5kRWRpdGluZ1JlYXNvbkFjY2Vzc29yeURvbmUgJiYgIWN1cnJlbnRV c2VySW50ZXJmYWNlSWRpb21Jc1BhZCgpKSB8fCBfa2V5Ym9hcmREaWRSZXF1ZXN0RGlzbWlzc2Fs KSB7CiAgICAgICAgICAgICBfcGFnZS0+Ymx1ckZvY3VzZWRFbGVtZW50KCk7CisgICAgICAgICAg ICBbc2VsZiBfZWxlbWVudERpZEJsdXJdOworICAgICAgICB9CiAgICAgfQogCiAgICAgW3NlbGYg X2NhbmNlbEludGVyYWN0aW9uXTsKQEAgLTUyNjksMTIgKzUyNzEsMTMgQEAgLSAodm9pZClfZWxl bWVudERpZEJsdXIKICAgICAgICAgW3NlbGYgcmVtb3ZlRm9jdXNlZEZvcm1Db250cm9sT3Zlcmxh eV07CiAjZW5kaWYKIAotICAgIC8vIFRoZSBjdXN0b20gZml4ZWQgcG9zaXRpb24gcmVjdCBiZWhh dmlvciBpcyBhZmZlY3RlZCBieSAtaXNGb2N1c2luZ0VsZW1lbnQsIHNvIGlmIHRoYXQgY2hhbmdl cyB3ZSBuZWVkIHRvIHJlY29tcHV0ZSByZWN0cy4KLSAgICBpZiAoZWRpdGFibGVDaGFuZ2VkKQor ICAgIGlmIChlZGl0YWJsZUNoYW5nZWQpIHsKKyAgICAgICAgLy8gVGhlIGN1c3RvbSBmaXhlZCBw b3NpdGlvbiByZWN0IGJlaGF2aW9yIGlzIGFmZmVjdGVkIGJ5IC1pc0ZvY3VzaW5nRWxlbWVudCwg c28gaWYgdGhhdCBjaGFuZ2VzIHdlIG5lZWQgdG8gcmVjb21wdXRlIHJlY3RzLgogICAgICAgICBb X3dlYlZpZXcgX3NjaGVkdWxlVmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlXTsKIAotICAgIFtfd2Vi VmlldyBkaWRFbmRGb3JtQ29udHJvbEludGVyYWN0aW9uXTsKLSAgICBfcGFnZS0+c2V0SXNTaG93 aW5nSW5wdXRWaWV3Rm9yRm9jdXNlZEVsZW1lbnQoZmFsc2UpOworICAgICAgICBbX3dlYlZpZXcg ZGlkRW5kRm9ybUNvbnRyb2xJbnRlcmFjdGlvbl07CisgICAgICAgIF9wYWdlLT5zZXRJc1Nob3dp bmdJbnB1dFZpZXdGb3JGb2N1c2VkRWxlbWVudChmYWxzZSk7CisgICAgfQogCiAgICAgaWYgKCFf aXNDaGFuZ2luZ0ZvY3VzKQogICAgICAgICBfZGlkQWNjZXNzb3J5VGFiSW5pdGlhdGVGb2N1cyA9 IE5POwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDJjNjYzZTI4MTVkOGI3N2I0NWI2NzUzZTNjNDMzOTA5NjhjYWZmOTkuLmQ2 MzRlZDk5MTk3ZjNhNTNkNzIzOGYzYmUxNzk0NTZiZTU0ZTdmZTUgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NyBAQAorMjAxOS0wNi0xOCAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CisKKyAg ICAgICAgUkVHUkVTU0lPTiAocjI0MDc1Nyk6IENhbm5vdCBkaXNtaXNzIHRoZSBrZXlib2FyZCBv biBodHRwOi8vYXBwbGUuY29tL2FwcGxlLXR2LXBsdXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODkyMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NTAzMDAwNTY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBmYXN0L2V2ZW50cy9pb3Mvc2hvdWxkLWJlLWFibGUtdG8tZGlzbWlzcy1mb3JtLWFjY2Vz c29yeS1hZnRlci10YXBwaW5nLW91dHNpZGUtaWZyYW1lLXdpdGgtZm9jdXNlZC1maWVsZC1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZXZlbnRzL2lvcy9zaG91bGQtYmUtYWJs ZS10by1kaXNtaXNzLWZvcm0tYWNjZXNzb3J5LWFmdGVyLXRhcHBpbmctb3V0c2lkZS1pZnJhbWUt d2l0aC1mb2N1c2VkLWZpZWxkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHJlc291cmNlcy91aS1o ZWxwZXIuanM6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIuZGlzbWlzc0Zvcm1BY2Nlc3NvcnlW aWV3LnJldHVybi5uZXcuUHJvbWlzZSk6CisgICAgICAgICh3aW5kb3cuVUlIZWxwZXIuZGlzbWlz c0Zvcm1BY2Nlc3NvcnlWaWV3KToKKwogMjAxOS0wNi0xNyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRl c0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gUHJlc3Npbmcga2V5IHdoaWxlIGhvbGRpbmcg Q29tbWFuZCBzaG91bGQgbm90IGluc2VydCBjaGFyYWN0ZXIKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvZXZlbnRzL2lvcy9zaG91bGQtYmUtYWJsZS10by1kaXNtaXNzLWZvcm0tYWNjZXNz b3J5LWFmdGVyLXRhcHBpbmctb3V0c2lkZS1pZnJhbWUtd2l0aC1mb2N1c2VkLWZpZWxkLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2lvcy9zaG91bGQtYmUtYWJsZS10by1k aXNtaXNzLWZvcm0tYWNjZXNzb3J5LWFmdGVyLXRhcHBpbmctb3V0c2lkZS1pZnJhbWUtd2l0aC1m b2N1c2VkLWZpZWxkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45MDZmYzI1MzhiNDQxYTliMjYw YmFlNjE2MjhmOGY5NmMwZTI5M2Y5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9ldmVudHMvaW9zL3Nob3VsZC1iZS1hYmxlLXRvLWRpc21pc3MtZm9ybS1hY2Nlc3NvcnktYWZ0 ZXItdGFwcGluZy1vdXRzaWRlLWlmcmFtZS13aXRoLWZvY3VzZWQtZmllbGQtZXhwZWN0ZWQudHh0 CkBAIC0wLDAgKzEsMTMgQEAKK1RoaXMgdGVzdCBmb2N1c2VzIHRoZSB0ZXh0IGZpZWxkIGluIHRo ZSBpZnJhbWUsIHRhcHMgb3V0c2lkZSB0aGUgaWZyYW1lIGFuZCB0aGVuIHByZXNzZXMgdGhlIERv bmUgYnV0dG9uLiBUaGUga2V5Ym9hcmQgc2hvdWxkIGhpZGUuCisKK09uIHN1Y2Nlc3MsIHlvdSB3 aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENP TVBMRVRFIi4KKworCitkaXNwYXRjaGVkIGJsdXIgdG8gbWFpbiBmcmFtZQorZGlzcGF0Y2hlZCBm b2N1cyB0byA8aW5wdXQ+CitkaXNwYXRjaGVkIGZvY3VzIHRvIG1haW4gZnJhbWUKK1BBU1MgZGlz bWlzc2VkIGZvcm0gYWNjZXNzb3J5CitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisK K1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvaW9z L3Nob3VsZC1iZS1hYmxlLXRvLWRpc21pc3MtZm9ybS1hY2Nlc3NvcnktYWZ0ZXItdGFwcGluZy1v dXRzaWRlLWlmcmFtZS13aXRoLWZvY3VzZWQtZmllbGQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv ZXZlbnRzL2lvcy9zaG91bGQtYmUtYWJsZS10by1kaXNtaXNzLWZvcm0tYWNjZXNzb3J5LWFmdGVy LXRhcHBpbmctb3V0c2lkZS1pZnJhbWUtd2l0aC1mb2N1c2VkLWZpZWxkLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uOWQ1ZDkwYWVjOTZmYjZiZGI5MDc2NzNiZDA4MWQ2NWJmY2Y2ZWM4YgotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2lvcy9zaG91bGQtYmUtYWJsZS10by1kaXNt aXNzLWZvcm0tYWNjZXNzb3J5LWFmdGVyLXRhcHBpbmctb3V0c2lkZS1pZnJhbWUtd2l0aC1mb2N1 c2VkLWZpZWxkLmh0bWwKQEAgLTAsMCArMSw0NSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4K KzxoZWFkPgorPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0 aCI+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QuanMiPjwvc2NyaXB0 PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIuanMiPjwvc2NyaXB0 PgorPC9oZWFkPgorPGJvZHk+Cis8aWZyYW1lIGlkPSJmcmFtZSIgc3JjZG9jPSI8c3R5bGU+Ym9k eSB7IG1hcmdpbjogMDsgcGFkZGluZzogMCB9PC9zdHlsZT48aW5wdXQgcGxhY2Vob2xkZXI9J1Rh cCBoZXJlJz48c2NyaXB0PndpbmRvdy5wYXJlbnQucnVuVGVzdCgpPC9zY3JpcHQ+Ij48L2lmcmFt ZT4KKzxzY3JpcHQ+Cit3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7CisKK2Rlc2NyaXB0aW9u KCJUaGlzIHRlc3QgZm9jdXNlcyB0aGUgdGV4dCBmaWVsZCBpbiB0aGUgaWZyYW1lLCB0YXBzIG91 dHNpZGUgdGhlIGlmcmFtZSBhbmQgdGhlbiBwcmVzc2VzIHRoZSBEb25lIGJ1dHRvbi4gVGhlIGtl eWJvYXJkIHNob3VsZCBoaWRlLiIpCisKK2FzeW5jIGZ1bmN0aW9uIHJ1blRlc3QoKQoreworICAg IGxldCBmcmFtZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJmcmFtZSIpOworICAgIGxldCBp bnB1dEVsZW1lbnRJbkZyYW1lID0gZnJhbWUuY29udGVudERvY3VtZW50LnF1ZXJ5U2VsZWN0b3Io ImlucHV0Iik7CisKKyAgICAvLyAxLiBBZGQgbGlzdGVuZXJzCisgICAgd2luZG93LmFkZEV2ZW50 TGlzdGVuZXIoImZvY3VzIiwgKCkgPT4gZGVidWcoImRpc3BhdGNoZWQgZm9jdXMgdG8gbWFpbiBm cmFtZSIpLCB7IG9uY2U6IHRydWUgfSk7CisgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoImJs dXIiLCAoKSA9PiBkZWJ1ZygiZGlzcGF0Y2hlZCBibHVyIHRvIG1haW4gZnJhbWUiKSwgeyBvbmNl OiB0cnVlIH0pOworICAgIGlucHV0RWxlbWVudEluRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcigiZm9j dXMiLCAoKSA9PiBkZWJ1ZygiZGlzcGF0Y2hlZCBmb2N1cyB0byAmbHQ7aW5wdXQmZ3Q7IiksIHsg b25jZTogdHJ1ZSB9KTsKKyAgICBpbnB1dEVsZW1lbnRJbkZyYW1lLmFkZEV2ZW50TGlzdGVuZXIo ImJsdXIiLCAoKSA9PiBkZWJ1ZygiZGlzcGF0Y2hlZCBibHVyIHRvICZsdDtpbnB1dCZndDsiKSwg eyBvbmNlOiB0cnVlIH0pOworCisgICAgaWYgKCF3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAg cmV0dXJuOworCisgICAgLy8gMi4gRm9jdXMgdGhlIDxpbnB1dD4gaW4gdGhlIDxpZnJhbWU+Lgor ICAgIGxldCB4ID0gZnJhbWUub2Zmc2V0TGVmdCArIGlucHV0RWxlbWVudEluRnJhbWUub2Zmc2V0 TGVmdCArIE1hdGguZmxvb3IoaW5wdXRFbGVtZW50SW5GcmFtZS5vZmZzZXRXaWR0aCAvIDIpOwor ICAgIGxldCB5ID0gZnJhbWUub2Zmc2V0VG9wICsgaW5wdXRFbGVtZW50SW5GcmFtZS5vZmZzZXRU b3AgKyBNYXRoLmZsb29yKGlucHV0RWxlbWVudEluRnJhbWUub2Zmc2V0SGVpZ2h0IC8gMik7Cisg ICAgYXdhaXQgVUlIZWxwZXIuYWN0aXZhdGVBbmRXYWl0Rm9ySW5wdXRTZXNzaW9uQXQoeCwgeSk7 CisKKyAgICAvLyAzLiBUYXAgc29tZXdoZXJlIGluIHRoZSBtYWluIGZyYW1lLCB0aGVuIHByZXNz IHRoZSBEb25lIGJ1dHRvbi4KKyAgICBhd2FpdCBVSUhlbHBlci5hY3RpdmF0ZUF0KDAsIDApOwor ICAgIGF3YWl0IFVJSGVscGVyLmRpc21pc3NGb3JtQWNjZXNzb3J5VmlldygpOyAvLyBQcmVzcyB0 aGUgRG9uZSBidXR0b247IGVuZHMgdGhlIGlucHV0IHNlc3Npb24uCisgICAgYXdhaXQgVUlIZWxw ZXIud2FpdEZvcktleWJvYXJkVG9IaWRlKCk7CisKKyAgICB0ZXN0UGFzc2VkKCJkaXNtaXNzZWQg Zm9ybSBhY2Nlc3NvcnkiKTsKKyAgICBkb2N1bWVudC5ib2R5LnJlbW92ZUNoaWxkKGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCJmcmFtZSIpKTsKKyAgICBmaW5pc2hKU1Rlc3QoKTsKK30KKzwvc2Ny aXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcmVzb3VyY2Vz L3VpLWhlbHBlci5qcyBiL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxwZXIuanMKaW5kZXgg NmFhNjc1NTBlYjFmMjJiMTM2ODhlMTNiZDQ4ZjI4NjliOTRlNDIxNS4uNTIyNmI4NzBkYmRlYmZk N2UzY2FiZTIwNzJjZjk2Yzc0NjM5MzI5OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcmVzb3Vy Y2VzL3VpLWhlbHBlci5qcworKysgYi9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpz CkBAIC0zNTEsNiArMzUxLDIwIEBAIHdpbmRvdy5VSUhlbHBlciA9IGNsYXNzIFVJSGVscGVyIHsK ICAgICAgICAgfSk7CiAgICAgfQogCisgICAgc3RhdGljIGRpc21pc3NGb3JtQWNjZXNzb3J5Vmll dygpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuaXNXZWJLaXQyKCkgfHwgIXRoaXMuaXNJT1NG YW1pbHkoKSkKKyAgICAgICAgICAgIHJldHVybiBQcm9taXNlLnJlc29sdmUoKTsKKworICAgICAg ICByZXR1cm4gbmV3IFByb21pc2UocmVzb2x2ZSA9PiB7CisgICAgICAgICAgICB0ZXN0UnVubmVy LnJ1blVJU2NyaXB0KGAKKyAgICAgICAgICAgICAgICAoZnVuY3Rpb24oKSB7CisgICAgICAgICAg ICAgICAgICAgIHVpQ29udHJvbGxlci5kaXNtaXNzRm9ybUFjY2Vzc29yeVZpZXcoKTsKKyAgICAg ICAgICAgICAgICAgICAgdWlDb250cm9sbGVyLnVpU2NyaXB0Q29tcGxldGUoKTsKKyAgICAgICAg ICAgICAgICB9KSgpYCwgcmVzb2x2ZSk7CisgICAgICAgIH0pOworICAgIH0KKwogICAgIHN0YXRp YyBpc1Nob3dpbmdLZXlib2FyZCgpCiAgICAgewogICAgICAgICByZXR1cm4gbmV3IFByb21pc2Uo cmVzb2x2ZSA9PiB7Cg== 372386 2019-06-18 14:49:39 -0700 2019-06-18 14:49:39 -0700 To land bug-198922-20190618144938.patch text/plain 9296 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU2YTM1NGZhZDFiYWU3OGM5 MzY5ZmExMzNiYTYzMWVhMjFmMWI2NDUuLmYxN2E4YTQyNjJkMmIzNzNjM2M3OThkNTQ3ZjlkOGY5 ODE5Njc2MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTktMDYtMTggIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04gKHIyNDA3NTcp OiBDYW5ub3QgZGlzbWlzcyB0aGUga2V5Ym9hcmQgb24gaHR0cDovL2FwcGxlLmNvbS9hcHBsZS10 di1wbHVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTg5MjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUwMzAwMDU2PgorCisgICAgICAgIFJldmll d2VkIGJ5IFdlbnNvbiBIc2llaC4KKworICAgICAgICBBY3R1YWxseSBkaXNtaXNzIHRoZSBrZXli b2FyZCBhcyBpbnRlbmRlZCBpbiByMjQwNzU3LiBEbyBub3Qgd2FpdCBmb3IgdGhlIHJvdW5kLXRy aXAKKyAgICAgICAgdG8gdGhlIFdlYlByb2Nlc3MgdG8gcnVuIHRocm91Z2ggdGhlIC1lbGVtZW50 RGlkQmx1ciBzdGVwcyBpbiB0aGUgVUlQcm9jZXNzIGFuZCBoaWRlCisgICAgICAgIHRoZSBrZXli b2FyZCB3aGVuIGEgcGVyc29uIGV4cGxpY2l0bHkgZGlzbWlzc2VzIHRoZSBrZXlib2FyZCB2aWEg dGhlIERvbmUgYnV0dG9uIChpUGhvbmUpCisgICAgICAgIG9yIGhpZGUga2V5Ym9hcmQgYnV0dG9u IChpUGFkKS4KKworICAgICAgICBOb3RlIHRoYXQgcjI0MDc1NyByZXZlYWxlZCBhbm90aGVyIGJ1 ZyBpbiB0aGlzIGNvZGUsIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTk4OTI4Pi4KKyAgICAgICAgSSBhbSB1bmNsZWFyIG9mIHRoZSBpbXBsaWNhdGlvbnMgb2YgdGhh dCBidWcsIGJ1dCBpdCBpcyBjbGVhciBmb3IgdGhpcyBidWcgdGhhdCBpdAorICAgICAgICBuZXZl ciBtYWtlcyBzZW5zZSB0byByb3VuZC10cmlwIHRvIHRoZSBXZWJQcm9jZXNzIHdoZW4gdGhlIGtl eWJvYXJkIGlzIGRpc21pc3NlZCBieQorICAgICAgICBhIHVzZXIgZ2VzdHVyZS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IGVuZEVkaXRpbmdBbmRVcGRhdGVGb2N1c0FwcGVhcmFuY2VXaXRoUmVh c29uOl0pOiBJbnZva2UgLV9lbGVtZW50RGlkQmx1cgorICAgICAgICB0byBibHVyIHRoZSBlbGVt ZW50IGluIHRoZSBVSVByb2Nlc3MgYW5kIGhpZGUgdGhlIGtleWJvYXJkLgorICAgICAgICAoLVtX S0NvbnRlbnRWaWV3IF9lbGVtZW50RGlkQmx1cl0pOiBQcmV2ZW50IGR1cGxpY2F0ZSBpbnZvY2F0 aW9ucyBvZiAtZGlkRW5kRm9ybUNvbnRyb2xJbnRlcmFjdGlvbgorICAgICAgICBhbmQgc2V0SXNT aG93aW5nSW5wdXRWaWV3Rm9yRm9jdXNlZEVsZW1lbnQgbWVzc2FnZXMgYnkgb25seSBkb2luZyB0 aGVzZSBhY3Rpb25zIHdoZW4KKyAgICAgICAgZWRpdGFibGl0eSBjaGFuZ2VzLiBUaGlzIGNvdmVy cyB0aGUgY2FzZSB3aGVyZSAtX2VsZW1lbnREaWRCbHVyIG1heSBiZSBpbnZva2VkIGEgc2Vjb25k CisgICAgICAgIHRpbWUgKHRoZSByZXBseSBpbiB0aGUgcm91bmQtdHJpcCkuIEluIHRoYXQgY2Fz ZSB3ZSBkb24ndCBuZWVkIHRvIGRvIHRoZXNlIGFjdGlvbnMuCisKIDIwMTktMDYtMTggIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBOZXR3b3Jr U2Vzc2lvbjo6bmV0d29ya1N0b3JhZ2VTZXNzaW9uIGNhbiByZXR1cm4gbnVsbApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KaW5kZXggMjBmZTZkNGJiMGM5YmI5OGY1ODFmMmIwYzBlOTBkZTY1OTZlMDE2ZC4uNWNhY2Uw NGJlNmUwODkxZTlhZWM2OTE0ZmEwMDYzMzkzNTNhYWZkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0x MjI2LDggKzEyMjYsMTIgQEAgLSAodm9pZCllbmRFZGl0aW5nQW5kVXBkYXRlRm9jdXNBcHBlYXJh bmNlV2l0aFJlYXNvbjooRW5kRWRpdGluZ1JlYXNvbilyZWFzb24KICAgICBpZiAoIV93ZWJWaWV3 Ll9yZXRhaW5pbmdBY3RpdmVGb2N1c2VkU3RhdGUpIHsKICAgICAgICAgLy8gV2UgbmVlZCB0byBj b21wbGV0ZSB0aGUgZWRpdGluZyBvcGVyYXRpb24gYmVmb3JlIHdlIGJsdXIgdGhlIGVsZW1lbnQu CiAgICAgICAgIFtzZWxmIF9lbmRFZGl0aW5nXTsKLSAgICAgICAgaWYgKChyZWFzb24gPT0gRW5k RWRpdGluZ1JlYXNvbkFjY2Vzc29yeURvbmUgJiYgIWN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21J c1BhZCgpKSB8fCBfa2V5Ym9hcmREaWRSZXF1ZXN0RGlzbWlzc2FsKQorICAgICAgICBpZiAoKHJl YXNvbiA9PSBFbmRFZGl0aW5nUmVhc29uQWNjZXNzb3J5RG9uZSAmJiAhY3VycmVudFVzZXJJbnRl cmZhY2VJZGlvbUlzUGFkKCkpIHx8IF9rZXlib2FyZERpZFJlcXVlc3REaXNtaXNzYWwpIHsKICAg ICAgICAgICAgIF9wYWdlLT5ibHVyRm9jdXNlZEVsZW1lbnQoKTsKKyAgICAgICAgICAgIC8vIERv bid0IHdhaXQgZm9yIFdlYlBhZ2VQcm94eTo6Ymx1ckZvY3VzZWRFbGVtZW50KCkgdG8gcm91bmQt dHJpcCBiYWNrIHRvIHVzIHRvIGhpZGUgdGhlIGtleWJvYXJkCisgICAgICAgICAgICAvLyBiZWNh dXNlIHdlIGtub3cgdGhhdCB0aGUgdXNlciBleHBsaWNpdGx5IHJlcXVlc3RlZCB1cyB0byBkbyBz by4KKyAgICAgICAgICAgIFtzZWxmIF9lbGVtZW50RGlkQmx1cl07CisgICAgICAgIH0KICAgICB9 CiAKICAgICBbc2VsZiBfY2FuY2VsSW50ZXJhY3Rpb25dOwpAQCAtNTI4MiwxMiArNTI4NiwxMyBA QCAtICh2b2lkKV9lbGVtZW50RGlkQmx1cgogICAgICAgICBbc2VsZiByZW1vdmVGb2N1c2VkRm9y bUNvbnRyb2xPdmVybGF5XTsKICNlbmRpZgogCi0gICAgLy8gVGhlIGN1c3RvbSBmaXhlZCBwb3Np dGlvbiByZWN0IGJlaGF2aW9yIGlzIGFmZmVjdGVkIGJ5IC1pc0ZvY3VzaW5nRWxlbWVudCwgc28g aWYgdGhhdCBjaGFuZ2VzIHdlIG5lZWQgdG8gcmVjb21wdXRlIHJlY3RzLgotICAgIGlmIChlZGl0 YWJsZUNoYW5nZWQpCisgICAgaWYgKGVkaXRhYmxlQ2hhbmdlZCkgeworICAgICAgICAvLyBUaGUg Y3VzdG9tIGZpeGVkIHBvc2l0aW9uIHJlY3QgYmVoYXZpb3IgaXMgYWZmZWN0ZWQgYnkgLWlzRm9j dXNpbmdFbGVtZW50LCBzbyBpZiB0aGF0IGNoYW5nZXMgd2UgbmVlZCB0byByZWNvbXB1dGUgcmVj dHMuCiAgICAgICAgIFtfd2ViVmlldyBfc2NoZWR1bGVWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVd OwogCi0gICAgW193ZWJWaWV3IGRpZEVuZEZvcm1Db250cm9sSW50ZXJhY3Rpb25dOwotICAgIF9w YWdlLT5zZXRJc1Nob3dpbmdJbnB1dFZpZXdGb3JGb2N1c2VkRWxlbWVudChmYWxzZSk7CisgICAg ICAgIFtfd2ViVmlldyBkaWRFbmRGb3JtQ29udHJvbEludGVyYWN0aW9uXTsKKyAgICAgICAgX3Bh Z2UtPnNldElzU2hvd2luZ0lucHV0Vmlld0ZvckZvY3VzZWRFbGVtZW50KGZhbHNlKTsKKyAgICB9 CiAKICAgICBpZiAoIV9pc0NoYW5naW5nRm9jdXMpCiAgICAgICAgIF9kaWRBY2Nlc3NvcnlUYWJJ bml0aWF0ZUZvY3VzID0gTk87CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggY2E5NjA2ZDk0NTZkZGUzNmQ1ODgzZTlmYzQ0YmEy NjgxN2YwZWExMi4uNDY2NWZhZWM2MTg0YjczMTNlMjE4NmJmZWM0YmYxMWE5NWFiZDU5OSAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA2LTE4ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFw cGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjQwNzU3KTogQ2Fubm90IGRpc21pc3Mg dGhlIGtleWJvYXJkIG9uIGh0dHA6Ly9hcHBsZS5jb20vYXBwbGUtdHYtcGx1cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4OTIyCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS81MDMwMDA1Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBXZW5zb24gSHNp ZWguCisKKyAgICAgICAgQWRkIGEgdGVzdCB0byBlbnN1cmUgdGhhdCBwcmVzc2luZyBEb25lIGhp ZGVzIHRoZSBrZXlib2FyZCBhZnRlciB0YXBwaW5nIG91dHNpZGUgdGhlIGZvY3VzZWQKKyAgICAg ICAgZWxlbWVudCdzIGZyYW1lLgorCisgICAgICAgICogZmFzdC9ldmVudHMvaW9zL3Nob3VsZC1i ZS1hYmxlLXRvLWRpc21pc3MtZm9ybS1hY2Nlc3NvcnktYWZ0ZXItdGFwcGluZy1vdXRzaWRlLWlm cmFtZS13aXRoLWZvY3VzZWQtZmllbGQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBm YXN0L2V2ZW50cy9pb3Mvc2hvdWxkLWJlLWFibGUtdG8tZGlzbWlzcy1mb3JtLWFjY2Vzc29yeS1h ZnRlci10YXBwaW5nLW91dHNpZGUtaWZyYW1lLXdpdGgtZm9jdXNlZC1maWVsZC5odG1sOiBBZGRl ZC4KKyAgICAgICAgKiByZXNvdXJjZXMvdWktaGVscGVyLmpzOgorICAgICAgICAod2luZG93LlVJ SGVscGVyLmRpc21pc3NGb3JtQWNjZXNzb3J5Vmlldyk6IEFkZGVkLgorCiAyMDE5LTA2LTE4ICBB bGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAogICAgICAgICBbRVNORXh0 XSBTdHJpbmcucHJvdG90eXBlLm1hdGNoQWxsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2V2ZW50cy9pb3Mvc2hvdWxkLWJlLWFibGUtdG8tZGlzbWlzcy1mb3JtLWFjY2Vzc29yeS1hZnRl ci10YXBwaW5nLW91dHNpZGUtaWZyYW1lLXdpdGgtZm9jdXNlZC1maWVsZC1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9pb3Mvc2hvdWxkLWJlLWFibGUtdG8tZGlzbWlzcy1m b3JtLWFjY2Vzc29yeS1hZnRlci10YXBwaW5nLW91dHNpZGUtaWZyYW1lLXdpdGgtZm9jdXNlZC1m aWVsZC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOTA2ZmMyNTM4YjQ0MWE5YjI2MGJhZTYxNjI4 ZjhmOTZjMGUyOTNmOQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRz L2lvcy9zaG91bGQtYmUtYWJsZS10by1kaXNtaXNzLWZvcm0tYWNjZXNzb3J5LWFmdGVyLXRhcHBp bmctb3V0c2lkZS1pZnJhbWUtd2l0aC1mb2N1c2VkLWZpZWxkLWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDEzIEBACitUaGlzIHRlc3QgZm9jdXNlcyB0aGUgdGV4dCBmaWVsZCBpbiB0aGUgaWZyYW1l LCB0YXBzIG91dHNpZGUgdGhlIGlmcmFtZSBhbmQgdGhlbiBwcmVzc2VzIHRoZSBEb25lIGJ1dHRv bi4gVGhlIGtleWJvYXJkIHNob3VsZCBoaWRlLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUg YSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIu CisKKworZGlzcGF0Y2hlZCBibHVyIHRvIG1haW4gZnJhbWUKK2Rpc3BhdGNoZWQgZm9jdXMgdG8g PGlucHV0PgorZGlzcGF0Y2hlZCBmb2N1cyB0byBtYWluIGZyYW1lCitQQVNTIGRpc21pc3NlZCBm b3JtIGFjY2Vzc29yeQorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENP TVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2lvcy9zaG91bGQt YmUtYWJsZS10by1kaXNtaXNzLWZvcm0tYWNjZXNzb3J5LWFmdGVyLXRhcHBpbmctb3V0c2lkZS1p ZnJhbWUtd2l0aC1mb2N1c2VkLWZpZWxkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9p b3Mvc2hvdWxkLWJlLWFibGUtdG8tZGlzbWlzcy1mb3JtLWFjY2Vzc29yeS1hZnRlci10YXBwaW5n LW91dHNpZGUtaWZyYW1lLXdpdGgtZm9jdXNlZC1maWVsZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjlkNWQ5 MGFlYzk2ZmI2YmRiOTA3NjczYmQwODFkNjViZmNmNmVjOGIKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9pb3Mvc2hvdWxkLWJlLWFibGUtdG8tZGlzbWlzcy1mb3Jt LWFjY2Vzc29yeS1hZnRlci10YXBwaW5nLW91dHNpZGUtaWZyYW1lLXdpdGgtZm9jdXNlZC1maWVs ZC5odG1sCkBAIC0wLDAgKzEsNDUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4K KzxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgiPgorPHNj cmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3Jp cHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KKzwvaGVh ZD4KKzxib2R5PgorPGlmcmFtZSBpZD0iZnJhbWUiIHNyY2RvYz0iPHN0eWxlPmJvZHkgeyBtYXJn aW46IDA7IHBhZGRpbmc6IDAgfTwvc3R5bGU+PGlucHV0IHBsYWNlaG9sZGVyPSdUYXAgaGVyZSc+ PHNjcmlwdD53aW5kb3cucGFyZW50LnJ1blRlc3QoKTwvc2NyaXB0PiI+PC9pZnJhbWU+Cis8c2Ny aXB0Pgord2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworCitkZXNjcmlwdGlvbigiVGhpcyB0 ZXN0IGZvY3VzZXMgdGhlIHRleHQgZmllbGQgaW4gdGhlIGlmcmFtZSwgdGFwcyBvdXRzaWRlIHRo ZSBpZnJhbWUgYW5kIHRoZW4gcHJlc3NlcyB0aGUgRG9uZSBidXR0b24uIFRoZSBrZXlib2FyZCBz aG91bGQgaGlkZS4iKQorCithc3luYyBmdW5jdGlvbiBydW5UZXN0KCkKK3sKKyAgICBsZXQgZnJh bWUgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZnJhbWUiKTsKKyAgICBsZXQgaW5wdXRFbGVt ZW50SW5GcmFtZSA9IGZyYW1lLmNvbnRlbnREb2N1bWVudC5xdWVyeVNlbGVjdG9yKCJpbnB1dCIp OworCisgICAgLy8gMS4gQWRkIGxpc3RlbmVycworICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVy KCJmb2N1cyIsICgpID0+IGRlYnVnKCJkaXNwYXRjaGVkIGZvY3VzIHRvIG1haW4gZnJhbWUiKSwg eyBvbmNlOiB0cnVlIH0pOworICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJibHVyIiwgKCkg PT4gZGVidWcoImRpc3BhdGNoZWQgYmx1ciB0byBtYWluIGZyYW1lIiksIHsgb25jZTogdHJ1ZSB9 KTsKKyAgICBpbnB1dEVsZW1lbnRJbkZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzIiwgKCkg PT4gZGVidWcoImRpc3BhdGNoZWQgZm9jdXMgdG8gJmx0O2lucHV0Jmd0OyIpLCB7IG9uY2U6IHRy dWUgfSk7CisgICAgaW5wdXRFbGVtZW50SW5GcmFtZS5hZGRFdmVudExpc3RlbmVyKCJibHVyIiwg KCkgPT4gZGVidWcoImRpc3BhdGNoZWQgYmx1ciB0byAmbHQ7aW5wdXQmZ3Q7IiksIHsgb25jZTog dHJ1ZSB9KTsKKworICAgIGlmICghd2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgIHJldHVybjsK KworICAgIC8vIDIuIEZvY3VzIHRoZSA8aW5wdXQ+IGluIHRoZSA8aWZyYW1lPi4KKyAgICBsZXQg eCA9IGZyYW1lLm9mZnNldExlZnQgKyBpbnB1dEVsZW1lbnRJbkZyYW1lLm9mZnNldExlZnQgKyBN YXRoLmZsb29yKGlucHV0RWxlbWVudEluRnJhbWUub2Zmc2V0V2lkdGggLyAyKTsKKyAgICBsZXQg eSA9IGZyYW1lLm9mZnNldFRvcCArIGlucHV0RWxlbWVudEluRnJhbWUub2Zmc2V0VG9wICsgTWF0 aC5mbG9vcihpbnB1dEVsZW1lbnRJbkZyYW1lLm9mZnNldEhlaWdodCAvIDIpOworICAgIGF3YWl0 IFVJSGVscGVyLmFjdGl2YXRlQW5kV2FpdEZvcklucHV0U2Vzc2lvbkF0KHgsIHkpOworCisgICAg Ly8gMy4gVGFwIHNvbWV3aGVyZSBpbiB0aGUgbWFpbiBmcmFtZSwgdGhlbiBwcmVzcyB0aGUgRG9u ZSBidXR0b24uCisgICAgYXdhaXQgVUlIZWxwZXIuYWN0aXZhdGVBdCgwLCAwKTsKKyAgICBhd2Fp dCBVSUhlbHBlci5kaXNtaXNzRm9ybUFjY2Vzc29yeVZpZXcoKTsgLy8gUHJlc3MgdGhlIERvbmUg YnV0dG9uOyBlbmRzIHRoZSBpbnB1dCBzZXNzaW9uLgorICAgIGF3YWl0IFVJSGVscGVyLndhaXRG b3JLZXlib2FyZFRvSGlkZSgpOworCisgICAgdGVzdFBhc3NlZCgiZGlzbWlzc2VkIGZvcm0gYWNj ZXNzb3J5Iik7CisgICAgZG9jdW1lbnQuYm9keS5yZW1vdmVDaGlsZChkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgiZnJhbWUiKSk7CisgICAgZmluaXNoSlNUZXN0KCk7Cit9Cis8L3NjcmlwdD4KKzwv Ym9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1oZWxw ZXIuanMgYi9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvdWktaGVscGVyLmpzCmluZGV4IDZhYTY3NTUw ZWIxZjIyYjEzNjg4ZTEzYmQ0OGYyODY5Yjk0ZTQyMTUuLjUyMjZiODcwZGJkZWJmZDdlM2NhYmUy MDcyY2Y5NmM3NDYzOTMyOTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3Jlc291cmNlcy91aS1o ZWxwZXIuanMKKysrIGIvTGF5b3V0VGVzdHMvcmVzb3VyY2VzL3VpLWhlbHBlci5qcwpAQCAtMzUx LDYgKzM1MSwyMCBAQCB3aW5kb3cuVUlIZWxwZXIgPSBjbGFzcyBVSUhlbHBlciB7CiAgICAgICAg IH0pOwogICAgIH0KIAorICAgIHN0YXRpYyBkaXNtaXNzRm9ybUFjY2Vzc29yeVZpZXcoKQorICAg IHsKKyAgICAgICAgaWYgKCF0aGlzLmlzV2ViS2l0MigpIHx8ICF0aGlzLmlzSU9TRmFtaWx5KCkp CisgICAgICAgICAgICByZXR1cm4gUHJvbWlzZS5yZXNvbHZlKCk7CisKKyAgICAgICAgcmV0dXJu IG5ldyBQcm9taXNlKHJlc29sdmUgPT4geworICAgICAgICAgICAgdGVzdFJ1bm5lci5ydW5VSVNj cmlwdChgCisgICAgICAgICAgICAgICAgKGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgICAg ICB1aUNvbnRyb2xsZXIuZGlzbWlzc0Zvcm1BY2Nlc3NvcnlWaWV3KCk7CisgICAgICAgICAgICAg ICAgICAgIHVpQ29udHJvbGxlci51aVNjcmlwdENvbXBsZXRlKCk7CisgICAgICAgICAgICAgICAg fSkoKWAsIHJlc29sdmUpOworICAgICAgICB9KTsKKyAgICB9CisKICAgICBzdGF0aWMgaXNTaG93 aW5nS2V5Ym9hcmQoKQogICAgIHsKICAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKHJlc29sdmUg PT4gewo=