97165 2012-09-19 21:49:12 -0700 REGRESSION(r127727): Calendar picker focus ring should be hidden until key event 2012-09-19 23:02:13 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 keishi keishi tkent webkit.review.bot oldest_to_newest 724135 0 keishi 2012-09-19 21:49:12 -0700 http://code.google.com/p/chromium/issues/detail?id=150733 724142 1 164835 keishi 2012-09-19 21:54:02 -0700 Created attachment 164835 Patch 724144 2 164836 keishi 2012-09-19 21:55:45 -0700 Created attachment 164836 Patch 724147 3 164836 tkent 2012-09-19 21:59:55 -0700 Comment on attachment 164836 Patch Looks good. Thanks. 724184 4 164836 webkit.review.bot 2012-09-19 23:02:09 -0700 Comment on attachment 164836 Patch Clearing flags on attachment: 164836 Committed r129094: <http://trac.webkit.org/changeset/129094> 724185 5 webkit.review.bot 2012-09-19 23:02:13 -0700 All reviewed patches have been landed. Closing bug. 164835 2012-09-19 21:54:02 -0700 2012-09-19 21:55:42 -0700 Patch bug-97165-20120920135327.patch text/plain 4189 keishi U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzFmYTM1MzM0NTcyMTEw MjY1NTQyN2M4NDcxMWFlOTM3NjY5ODIyOC4uYWY3OTZiZjc3M2Y0YjlkMTIwMGM2YWE0OTVhZmE2 NzNiYjFjOGEyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA5LTE5ICBLZWlz aGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04ocjEy NzcyNyk6IENhbGVuZGFyIHBpY2tlciBmb2N1cyByaW5nIHNob3VsZCBiZSBoaWRkZW4gdW50aWwg a2V5IGV2ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05NzE2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZGl0aW9uYWwgaW5mb3JtYXRpb24gb2YgdGhlIGNoYW5nZSBzdWNoIGFzIGFwcHJvYWNoLCBy YXRpb25hbGUuIFBsZWFzZSBhZGQgcGVyLWZ1bmN0aW9uIGRlc2NyaXB0aW9ucyBiZWxvdyAoT09Q UyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gQ292ZXJlZCBieSBjYWxlbmRhci1waWNrZXIt YXBwZWFyYW5jZS5odG1sLgorCisgICAgICAgICogUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5k YXJQaWNrZXIuanM6CisgICAgICAgIChpbml0aWFsaXplKToKKyAgICAgICAgKENhbGVuZGFyUGlj a2VyKToKKyAgICAgICAgKENhbGVuZGFyUGlja2VyLnByb3RvdHlwZS5fbGF5b3V0KToKKyAgICAg ICAgKERheXNUYWJsZS5wcm90b3R5cGUuX2hhbmRsZUtleSk6CisgICAgICAgIChDYWxlbmRhclBp Y2tlci5wcm90b3R5cGUuX2hhbmRsZUJvZHlLZXlEb3duKToKKyAgICAgICAgKENhbGVuZGFyUGlj a2VyLnByb3RvdHlwZS5tYXliZVVwZGF0ZUZvY3VzU3R5bGUpOiBNYWtlIHRoaXMgYSBtZXRob2Qg b2YgQ2FsZW5kYXJQaWNrZXIgYmVjYXVzZSB3ZSBkb24ndCB1c2UgaXQgZm9yIG90aGVyIHBpY2tl cnMuCisKIDIwMTItMDktMTkgIEpvc2h1YSBCZWxsICA8anNiZWxsQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBJbmRleGVkREI6IFBlbmRpbmcgY2FsbCBjbGVhbnVwCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9SZXNvdXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRhclBpY2tlci5qcyBiL1NvdXJj ZS9XZWJDb3JlL1Jlc291cmNlcy9wYWdlcG9wdXBzL2NhbGVuZGFyUGlja2VyLmpzCmluZGV4IGRk MTkyMTEwNmQwODJlMzcxNGY1NjY2YjY1NGMwMGYxMGNjNTZlNWUuLmVlMWQyMmI3YmU0M2NiM2Ey YzQ5YTA1YWNlMWE0ZDY0ZmZmMTU4NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1Jlc291 cmNlcy9wYWdlcG9wdXBzL2NhbGVuZGFyUGlja2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL1Jl c291cmNlcy9wYWdlcG9wdXBzL2NhbGVuZGFyUGlja2VyLmpzCkBAIC03Miw3ICs3Miw2IEBAIHZh ciBDbGFzc05hbWVzID0gewogICovCiB2YXIgZ2xvYmFsID0gewogICAgIGFyZ3VtZW50c1JlY2Vp dmVkOiBmYWxzZSwKLSAgICBoYWRLZXlFdmVudDogZmFsc2UsCiAgICAgcGFyYW1zOiBudWxsCiB9 OwogCkBAIC0yNjcsMTEgKzI2Niw5IEBAIGZ1bmN0aW9uIHZhbGlkYXRlQXJndW1lbnRzKGFyZ3Mp IHsKICAqIEBwYXJhbSB7IU9iamVjdH0gYXJncwogICovCiBmdW5jdGlvbiBpbml0aWFsaXplKGFy Z3MpIHsKLSAgICB2YXIgbWFpbiA9ICQoIm1haW4iKTsKLSAgICBtYWluLmNsYXNzTGlzdC5hZGQo Q2xhc3NOYW1lcy5Ob0ZvY3VzUmluZyk7Ci0KICAgICB2YXIgZXJyb3JTdHJpbmcgPSB2YWxpZGF0 ZUFyZ3VtZW50cyhhcmdzKTsKICAgICBpZiAoZXJyb3JTdHJpbmcpIHsKKyAgICAgICAgdmFyIG1h aW4gPSAkKCJtYWluIik7CiAgICAgICAgIG1haW4udGV4dENvbnRlbnQgPSAiSW50ZXJuYWwgZXJy b3I6ICIgKyBlcnJvclN0cmluZzsKICAgICAgICAgcmVzaXplV2luZG93KG1haW4ub2Zmc2V0V2lk dGgsIG1haW4ub2Zmc2V0SGVpZ2h0KTsKICAgICB9IGVsc2UgewpAQCAtMzA1LDYgKzMwMiw3IEBA IGZ1bmN0aW9uIENhbGVuZGFyUGlja2VyKGVsZW1lbnQsIGNvbmZpZykgewogICAgIHRoaXMuc3Rl cCA9ICh0eXBlb2YgdGhpcy5fY29uZmlnLnN0ZXAgIT09IHVuZGVmaW5lZCkgPyB0aGlzLl9jb25m aWcuc3RlcCAqIENhbGVuZGFyUGlja2VyLkJhc2VTdGVwIDogQ2FsZW5kYXJQaWNrZXIuQmFzZVN0 ZXA7CiAgICAgdGhpcy55ZWFyTW9udGhDb250cm9sbGVyID0gbmV3IFllYXJNb250aENvbnRyb2xs ZXIodGhpcyk7CiAgICAgdGhpcy5kYXlzVGFibGUgPSBuZXcgRGF5c1RhYmxlKHRoaXMpOworICAg IHRoaXMuX2hhZEtleUV2ZW50ID0gZmFsc2U7CiAgICAgdGhpcy5fbGF5b3V0KCk7CiAgICAgdmFy IGluaXRpYWxEYXRlID0gcGFyc2VEYXRlU3RyaW5nKHRoaXMuX2NvbmZpZy5jdXJyZW50VmFsdWUp OwogICAgIGlmIChpbml0aWFsRGF0ZSA8IHRoaXMubWluaW11bURhdGUpCkBAIC0zMjgsNiArMzI2 LDggQEAgQ2FsZW5kYXJQaWNrZXIucHJvdG90eXBlLl9sYXlvdXQgPSBmdW5jdGlvbigpIHsKICAg ICB0aGlzLnllYXJNb250aENvbnRyb2xsZXIuYXR0YWNoVG8odGhpcy5fZWxlbWVudCk7CiAgICAg dGhpcy5kYXlzVGFibGUuYXR0YWNoVG8odGhpcy5fZWxlbWVudCk7CiAgICAgdGhpcy5fbGF5b3V0 QnV0dG9ucygpOworICAgIC8vIERheXNUYWJsZSB3aWxsIGhhdmUgZm9jdXMgYnV0IHdlIGRvbid0 IHdhbnQgdG8gc2hvdyBpdHMgZm9jdXMgcmluZyB1bnRpbCB0aGUgZmlyc3Qga2V5IGV2ZW50Lgor ICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFkZChDbGFzc05hbWVzLk5vRm9jdXNSaW5nKTsK IH07CiAKIENhbGVuZGFyUGlja2VyLnByb3RvdHlwZS5oYW5kbGVUb2RheSA9IGZ1bmN0aW9uKCkg ewpAQCAtMTA1Niw3ICsxMDU2LDcgQEAgRGF5c1RhYmxlLnByb3RvdHlwZS5faGFuZGxlTW91c2VP dXQgPSBmdW5jdGlvbihldmVudCkgewogICogQHBhcmFtIHtFdmVudH0gZXZlbnQKICAqLwogRGF5 c1RhYmxlLnByb3RvdHlwZS5faGFuZGxlS2V5ID0gZnVuY3Rpb24oZXZlbnQpIHsKLSAgICBtYXli ZVVwZGF0ZUZvY3VzU3R5bGUoKTsKKyAgICB0aGlzLnBpY2tlci5tYXliZVVwZGF0ZUZvY3VzU3R5 bGUoKTsKICAgICB2YXIgeCA9IHRoaXMuX3g7CiAgICAgdmFyIHkgPSB0aGlzLl95OwogICAgIHZh ciBrZXkgPSBldmVudC5rZXlJZGVudGlmaWVyOwpAQCAtMTE1Niw3ICsxMTU2LDcgQEAgRGF5c1Rh YmxlLnByb3RvdHlwZS51cGRhdGVTZWxlY3Rpb24gPSBmdW5jdGlvbihldmVudCwgeCwgeSkgewog ICogQHBhcmFtIHshRXZlbnR9IGV2ZW50CiAgKi8KIENhbGVuZGFyUGlja2VyLnByb3RvdHlwZS5f aGFuZGxlQm9keUtleURvd24gPSBmdW5jdGlvbihldmVudCkgewotICAgIG1heWJlVXBkYXRlRm9j dXNTdHlsZSgpOworICAgIHRoaXMubWF5YmVVcGRhdGVGb2N1c1N0eWxlKCk7CiAgICAgdmFyIGtl eSA9IGV2ZW50LmtleUlkZW50aWZpZXI7CiAgICAgaWYgKGtleSA9PSAiVSswMDA5IikgewogICAg ICAgICBpZiAoIWV2ZW50LnNoaWZ0S2V5ICYmIGRvY3VtZW50LmFjdGl2ZUVsZW1lbnQgPT0gZ2xv YmFsLmxhc3RGb2N1c2FibGVDb250cm9sKSB7CkBAIC0xMTc4LDExICsxMTc4LDExIEBAIENhbGVu ZGFyUGlja2VyLnByb3RvdHlwZS5faGFuZGxlQm9keUtleURvd24gPSBmdW5jdGlvbihldmVudCkg ewogICAgICAgICB0aGlzLmhhbmRsZUNhbmNlbCgpOwogfQogCi1mdW5jdGlvbiBtYXliZVVwZGF0 ZUZvY3VzU3R5bGUoKSB7Ci0gICAgaWYgKGdsb2JhbC5oYWRLZXlFdmVudCkKK0NhbGVuZGFyUGlj a2VyLnByb3RvdHlwZS5tYXliZVVwZGF0ZUZvY3VzU3R5bGUgPSBmdW5jdGlvbigpIHsKKyAgICBp ZiAodGhpcy5faGFkS2V5RXZlbnQpCiAgICAgICAgIHJldHVybjsKLSAgICBnbG9iYWwuaGFkS2V5 RXZlbnQgPSB0cnVlOwotICAgICQoIm1haW4iKS5jbGFzc0xpc3QucmVtb3ZlKENsYXNzTmFtZXMu Tm9Gb2N1c1JpbmcpOworICAgIHRoaXMuX2hhZEtleUV2ZW50ID0gdHJ1ZTsKKyAgICB0aGlzLl9l bGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoQ2xhc3NOYW1lcy5Ob0ZvY3VzUmluZyk7CiB9CiAKIGlm ICh3aW5kb3cuZGlhbG9nQXJndW1lbnRzKSB7Cg== 164836 2012-09-19 21:55:45 -0700 2012-09-19 23:02:09 -0700 Patch bug-97165-20120920135510.patch text/plain 4193 keishi U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzFmYTM1MzM0NTcyMTEw MjY1NTQyN2M4NDcxMWFlOTM3NjY5ODIyOC4uZDY5Y2NmODBlM2ZmNmM3NTFlODExZGM1YzNiMDY0 MzEwYjc0MzRiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA5LTE5ICBLZWlz aGkgSGF0dG9yaSAgPGtlaXNoaUB3ZWJraXQub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04ocjEy NzcyNyk6IENhbGVuZGFyIHBpY2tlciBmb2N1cyByaW5nIHNob3VsZCBiZSBoaWRkZW4gdW50aWwg a2V5IGV2ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05NzE2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoZSByZWdyZXNzaW9uIHdhcyBjYXVzZWQgYmVjYXVzZSBOb0ZvY3VzUmluZyBjbGFzcyB3YXMg YmVpbmcgcmVtb3ZlZAorICAgICAgICBmcm9tIHRoZW4gbWFpbiBlbGVtZW50IGluc2lkZSByZXNl dE1haW4oKS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIENvdmVyZWQgYnkgY2FsZW5kYXItcGlj a2VyLWFwcGVhcmFuY2UuaHRtbC4KKworICAgICAgICAqIFJlc291cmNlcy9wYWdlcG9wdXBzL2Nh bGVuZGFyUGlja2VyLmpzOgorICAgICAgICAoaW5pdGlhbGl6ZSk6CisgICAgICAgIChDYWxlbmRh clBpY2tlcik6CisgICAgICAgIChDYWxlbmRhclBpY2tlci5wcm90b3R5cGUuX2xheW91dCk6Cisg ICAgICAgIChEYXlzVGFibGUucHJvdG90eXBlLl9oYW5kbGVLZXkpOgorICAgICAgICAoQ2FsZW5k YXJQaWNrZXIucHJvdG90eXBlLl9oYW5kbGVCb2R5S2V5RG93bik6CisgICAgICAgIChDYWxlbmRh clBpY2tlci5wcm90b3R5cGUubWF5YmVVcGRhdGVGb2N1c1N0eWxlKTogTWFrZSB0aGlzIGEgbWV0 aG9kIG9mIENhbGVuZGFyUGlja2VyIGJlY2F1c2Ugd2UgZG9uJ3QgdXNlIGl0IGZvciBvdGhlciBw aWNrZXJzLgorCiAyMDEyLTA5LTE5ICBKb3NodWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgSW5kZXhlZERCOiBQZW5kaW5nIGNhbGwgY2xlYW51cApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvUmVzb3VyY2VzL3BhZ2Vwb3B1cHMvY2FsZW5kYXJQaWNrZXIuanMgYi9T b3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRhclBpY2tlci5qcwppbmRl eCBkZDE5MjExMDZkMDgyZTM3MTRmNTY2NmI2NTRjMDBmMTBjYzU2ZTVlLi5lZTFkMjJiN2JlNDNj YjNhMmM0OWEwNWFjZTFhNGQ2NGZmZjE1ODRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9S ZXNvdXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRhclBpY2tlci5qcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9SZXNvdXJjZXMvcGFnZXBvcHVwcy9jYWxlbmRhclBpY2tlci5qcwpAQCAtNzIsNyArNzIsNiBA QCB2YXIgQ2xhc3NOYW1lcyA9IHsKICAqLwogdmFyIGdsb2JhbCA9IHsKICAgICBhcmd1bWVudHNS ZWNlaXZlZDogZmFsc2UsCi0gICAgaGFkS2V5RXZlbnQ6IGZhbHNlLAogICAgIHBhcmFtczogbnVs bAogfTsKIApAQCAtMjY3LDExICsyNjYsOSBAQCBmdW5jdGlvbiB2YWxpZGF0ZUFyZ3VtZW50cyhh cmdzKSB7CiAgKiBAcGFyYW0geyFPYmplY3R9IGFyZ3MKICAqLwogZnVuY3Rpb24gaW5pdGlhbGl6 ZShhcmdzKSB7Ci0gICAgdmFyIG1haW4gPSAkKCJtYWluIik7Ci0gICAgbWFpbi5jbGFzc0xpc3Qu YWRkKENsYXNzTmFtZXMuTm9Gb2N1c1JpbmcpOwotCiAgICAgdmFyIGVycm9yU3RyaW5nID0gdmFs aWRhdGVBcmd1bWVudHMoYXJncyk7CiAgICAgaWYgKGVycm9yU3RyaW5nKSB7CisgICAgICAgIHZh ciBtYWluID0gJCgibWFpbiIpOwogICAgICAgICBtYWluLnRleHRDb250ZW50ID0gIkludGVybmFs IGVycm9yOiAiICsgZXJyb3JTdHJpbmc7CiAgICAgICAgIHJlc2l6ZVdpbmRvdyhtYWluLm9mZnNl dFdpZHRoLCBtYWluLm9mZnNldEhlaWdodCk7CiAgICAgfSBlbHNlIHsKQEAgLTMwNSw2ICszMDIs NyBAQCBmdW5jdGlvbiBDYWxlbmRhclBpY2tlcihlbGVtZW50LCBjb25maWcpIHsKICAgICB0aGlz LnN0ZXAgPSAodHlwZW9mIHRoaXMuX2NvbmZpZy5zdGVwICE9PSB1bmRlZmluZWQpID8gdGhpcy5f Y29uZmlnLnN0ZXAgKiBDYWxlbmRhclBpY2tlci5CYXNlU3RlcCA6IENhbGVuZGFyUGlja2VyLkJh c2VTdGVwOwogICAgIHRoaXMueWVhck1vbnRoQ29udHJvbGxlciA9IG5ldyBZZWFyTW9udGhDb250 cm9sbGVyKHRoaXMpOwogICAgIHRoaXMuZGF5c1RhYmxlID0gbmV3IERheXNUYWJsZSh0aGlzKTsK KyAgICB0aGlzLl9oYWRLZXlFdmVudCA9IGZhbHNlOwogICAgIHRoaXMuX2xheW91dCgpOwogICAg IHZhciBpbml0aWFsRGF0ZSA9IHBhcnNlRGF0ZVN0cmluZyh0aGlzLl9jb25maWcuY3VycmVudFZh bHVlKTsKICAgICBpZiAoaW5pdGlhbERhdGUgPCB0aGlzLm1pbmltdW1EYXRlKQpAQCAtMzI4LDYg KzMyNiw4IEBAIENhbGVuZGFyUGlja2VyLnByb3RvdHlwZS5fbGF5b3V0ID0gZnVuY3Rpb24oKSB7 CiAgICAgdGhpcy55ZWFyTW9udGhDb250cm9sbGVyLmF0dGFjaFRvKHRoaXMuX2VsZW1lbnQpOwog ICAgIHRoaXMuZGF5c1RhYmxlLmF0dGFjaFRvKHRoaXMuX2VsZW1lbnQpOwogICAgIHRoaXMuX2xh eW91dEJ1dHRvbnMoKTsKKyAgICAvLyBEYXlzVGFibGUgd2lsbCBoYXZlIGZvY3VzIGJ1dCB3ZSBk b24ndCB3YW50IHRvIHNob3cgaXRzIGZvY3VzIHJpbmcgdW50aWwgdGhlIGZpcnN0IGtleSBldmVu dC4KKyAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5hZGQoQ2xhc3NOYW1lcy5Ob0ZvY3VzUmlu Zyk7CiB9OwogCiBDYWxlbmRhclBpY2tlci5wcm90b3R5cGUuaGFuZGxlVG9kYXkgPSBmdW5jdGlv bigpIHsKQEAgLTEwNTYsNyArMTA1Niw3IEBAIERheXNUYWJsZS5wcm90b3R5cGUuX2hhbmRsZU1v dXNlT3V0ID0gZnVuY3Rpb24oZXZlbnQpIHsKICAqIEBwYXJhbSB7RXZlbnR9IGV2ZW50CiAgKi8K IERheXNUYWJsZS5wcm90b3R5cGUuX2hhbmRsZUtleSA9IGZ1bmN0aW9uKGV2ZW50KSB7Ci0gICAg bWF5YmVVcGRhdGVGb2N1c1N0eWxlKCk7CisgICAgdGhpcy5waWNrZXIubWF5YmVVcGRhdGVGb2N1 c1N0eWxlKCk7CiAgICAgdmFyIHggPSB0aGlzLl94OwogICAgIHZhciB5ID0gdGhpcy5feTsKICAg ICB2YXIga2V5ID0gZXZlbnQua2V5SWRlbnRpZmllcjsKQEAgLTExNTYsNyArMTE1Niw3IEBAIERh eXNUYWJsZS5wcm90b3R5cGUudXBkYXRlU2VsZWN0aW9uID0gZnVuY3Rpb24oZXZlbnQsIHgsIHkp IHsKICAqIEBwYXJhbSB7IUV2ZW50fSBldmVudAogICovCiBDYWxlbmRhclBpY2tlci5wcm90b3R5 cGUuX2hhbmRsZUJvZHlLZXlEb3duID0gZnVuY3Rpb24oZXZlbnQpIHsKLSAgICBtYXliZVVwZGF0 ZUZvY3VzU3R5bGUoKTsKKyAgICB0aGlzLm1heWJlVXBkYXRlRm9jdXNTdHlsZSgpOwogICAgIHZh ciBrZXkgPSBldmVudC5rZXlJZGVudGlmaWVyOwogICAgIGlmIChrZXkgPT0gIlUrMDAwOSIpIHsK ICAgICAgICAgaWYgKCFldmVudC5zaGlmdEtleSAmJiBkb2N1bWVudC5hY3RpdmVFbGVtZW50ID09 IGdsb2JhbC5sYXN0Rm9jdXNhYmxlQ29udHJvbCkgewpAQCAtMTE3OCwxMSArMTE3OCwxMSBAQCBD YWxlbmRhclBpY2tlci5wcm90b3R5cGUuX2hhbmRsZUJvZHlLZXlEb3duID0gZnVuY3Rpb24oZXZl bnQpIHsKICAgICAgICAgdGhpcy5oYW5kbGVDYW5jZWwoKTsKIH0KIAotZnVuY3Rpb24gbWF5YmVV cGRhdGVGb2N1c1N0eWxlKCkgewotICAgIGlmIChnbG9iYWwuaGFkS2V5RXZlbnQpCitDYWxlbmRh clBpY2tlci5wcm90b3R5cGUubWF5YmVVcGRhdGVGb2N1c1N0eWxlID0gZnVuY3Rpb24oKSB7Cisg ICAgaWYgKHRoaXMuX2hhZEtleUV2ZW50KQogICAgICAgICByZXR1cm47Ci0gICAgZ2xvYmFsLmhh ZEtleUV2ZW50ID0gdHJ1ZTsKLSAgICAkKCJtYWluIikuY2xhc3NMaXN0LnJlbW92ZShDbGFzc05h bWVzLk5vRm9jdXNSaW5nKTsKKyAgICB0aGlzLl9oYWRLZXlFdmVudCA9IHRydWU7CisgICAgdGhp cy5fZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKENsYXNzTmFtZXMuTm9Gb2N1c1JpbmcpOwogfQog CiBpZiAod2luZG93LmRpYWxvZ0FyZ3VtZW50cykgewo=