214195 2020-07-10 12:36:04 -0700 Add OK button to Date/Time form controls. 2020-07-20 16:48:46 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=214517 InRadar P2 Normal --- 214518 1 megan_gardner megan_gardner aakash_jain ap darin sam thorton webkit-bot-watchers-bugzilla wenson_hsieh ysuzuki oldest_to_newest 1670527 0 megan_gardner 2020-07-10 12:36:04 -0700 Add OK button to Date/Time form controls. 1670645 1 404017 megan_gardner 2020-07-10 16:19:45 -0700 Created attachment 404017 Patch 1670647 2 megan_gardner 2020-07-10 16:22:02 -0700 <rdar://problem/65006000> 1670650 3 404020 megan_gardner 2020-07-10 16:24:11 -0700 Created attachment 404020 Patch 1670651 4 404017 sam 2020-07-10 16:24:31 -0700 Comment on attachment 404017 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=404017&action=review > Source/WebKit/ChangeLog:10 > + Add 'OK' button to add clarity to UI, and increase the default size of the control to > + ensure space for both buttons. Also fixed a crash that happened when closing the control before > + the animation completed. Please add tests for all these things. 1671205 5 404188 megan_gardner 2020-07-13 15:36:56 -0700 Created attachment 404188 Patch 1671208 6 404188 darin 2020-07-13 15:55:08 -0700 Comment on attachment 404188 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=404188&action=review > Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm:86 > + auto size = [view systemLayoutSizeFittingSize:UILayoutFittingCompressedSize]; Extra space after "=" here. > Source/WebKit/UIProcess/ios/forms/WKDateTimeInputControl.mm:88 > + if (size.width < 250) > + size.width = 250; std::max might be a nicer way to write this. 1672756 7 404626 megan_gardner 2020-07-17 17:56:39 -0700 Created attachment 404626 Patch for landing 1672759 8 404627 megan_gardner 2020-07-17 18:45:31 -0700 Created attachment 404627 Patch for landing 1672760 9 ews-feeder 2020-07-17 19:07:05 -0700 Committed r264563: <https://trac.webkit.org/changeset/264563> All reviewed patches have been landed. Closing bug and clearing flags on attachment 404627. 1672790 10 aakash_jain 2020-07-18 05:16:33 -0700 > Committed r264563: <https://trac.webkit.org/changeset/264563> This broke the watchOS build. See Bug 214517. The latest patch wasn't run through the EWS. Please make sure to run the patches through EWS before landing. Commit-queue only builds and tests for macOS. 1672792 11 ysuzuki 2020-07-18 05:20:20 -0700 Re-opened since this is blocked by bug 214518 1673220 12 404755 megan_gardner 2020-07-20 13:49:02 -0700 Created attachment 404755 Patch 1673279 13 404772 megan_gardner 2020-07-20 15:52:40 -0700 Created attachment 404772 Patch for landing 1673322 14 ews-feeder 2020-07-20 16:48:45 -0700 Committed r264637: <https://trac.webkit.org/changeset/264637> All reviewed patches have been landed. Closing bug and clearing flags on attachment 404772. 404017 2020-07-10 16:19:45 -0700 2020-07-13 15:36:53 -0700 Patch bug-214195-20200710161944.patch text/plain 8215 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmNhYzUyMTA2OWZjMzJm YTlkMGEzNGM0ZmU3Y2IzMDM5NzVlYTY4Zi4uNjIzZmQ1ZWZhOWJlMWM1MDExNDdjOTMyN2JkYWJl ZGNhYmQ4YWUxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA3LTEwICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIE9LIGJ1 dHRvbiB0byBEYXRlL1RpbWUgZm9ybSBjb250cm9scy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDE5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5nczoK KwogMjAyMC0wNy0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtMRkNdW0Zsb2F0c10gTm9ybWFsIGZsb3cgZWxlbWVudCB0aGF0IGVzdGFibGlzaGVzIGEgbmV3 IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dCBtdXN0IG5vdCBvdmVybGFwIHRoZSBtYXJnaW4gYm94 IG9mIGFueSBmbG9hdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMmYxYjdlNTExOTI3YjEwNDMxMjQ4MDY0MWIxYWZi MDQ0Njk4YTU4ZS4uMzc3MzljMDVjZjJhNTBkYWVjN2MwMmM0NTQyOThiMzVkZGU5MTZmMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMC0wNy0xMCAgTWVnYW4gR2FyZG5lciAgPG1lZ2Fu X2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBPSyBidXR0b24gdG8gRGF0ZS9UaW1l IGZvcm0gY29udHJvbHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTQxOTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGQgJ09LJyBidXR0b24gdG8gYWRkIGNsYXJpdHkgdG8gVUksIGFuZCBpbmNyZWFz ZSB0aGUgZGVmYXVsdCBzaXplIG9mIHRoZSBjb250cm9sIHRvCisgICAgICAgIGVuc3VyZSBzcGFj ZSBmb3IgYm90aCBidXR0b25zLiBBbHNvIGZpeGVkIGEgY3Jhc2ggdGhhdCBoYXBwZW5lZCB3aGVu IGNsb3NpbmcgdGhlIGNvbnRyb2wgYmVmb3JlCisgICAgICAgIHRoZSBhbmltYXRpb24gY29tcGxl dGVkLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250 cm9sLm1tOgorICAgICAgICAoLVtXS0RhdGVUaW1lQ29udGV4dE1lbnVWaWV3Q29udHJvbGxlciBw cmVmZXJyZWRDb250ZW50U2l6ZV0pOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIGNvbnRl eHRNZW51SW50ZXJhY3Rpb246Y29uZmlndXJhdGlvbkZvck1lbnVBdExvY2F0aW9uOl0pOgorICAg ICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIGNvbnRleHRNZW51SW50ZXJhY3Rpb246d2lsbERpc3Bs YXlNZW51Rm9yQ29uZmlndXJhdGlvbjphbmltYXRvcjpdKToKKyAgICAgICAgKC1bV0tEYXRlVGlt ZVBpY2tlciBjb250ZXh0TWVudUludGVyYWN0aW9uOndpbGxFbmRGb3JDb25maWd1cmF0aW9uOmFu aW1hdG9yOl0pOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIG9rOl0pOgorCiAyMDIwLTA3 LTEwICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAg ICBbR1RLXSBGbHVzaCB0aGUgY2Fpcm8gc3VyZmFjZSBhZnRlciBwYWludGluZyB3aGVuIHVzaW5n IHNvZnR3YXJlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJs ZS5zdHJpbmdzIGIvU291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncwpp bmRleCA3NzNkODRmNGYwN2Q2ZTM3ZmEyNDY5YTAxNTNiMTk2Y2Q3YzEwYTZiLi41ODYwMjkwYTk1 ZWJlMTY5MDIzZmNhZjJiZmY4Y2RkMDk3Y2QwNjE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VuLmxw cm9qL0xvY2FsaXphYmxlLnN0cmluZ3MKQEAgLTU0NCw2ICs1NDQsOSBAQAogLyogT0sgYnV0dG9u IGxhYmVsIGluIGRvY3VtZW50IHBhc3N3b3JkIGZhaWx1cmUgYWxlcnQgKi8KICJPSyAoZG9jdW1l bnQgcGFzc3dvcmQgZmFpbHVyZSBhbGVydCkiID0gIk9LIjsKIAorLyogVGl0bGUgb2YgdGhlIE9L IGJ1dHRvbiBpbiBkYXRlL3RpbWUgZm9ybSBjb250cm9scy4gKi8KKyJPSyAoT0sgYnV0dG9uIHRp dGxlIGluIGRhdGUvdGltZSBwaWNrZXIpIiA9ICJPSyI7CisKIC8qIE1lbnUgaXRlbSBsYWJlbCBm b3IgdGhlIHRyYWNrIHRoYXQgcmVwcmVzZW50cyBkaXNhYmxpbmcgY2xvc2VkIGNhcHRpb25zICov CiAiT2ZmIiA9ICJPZmYiOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCmluZGV4IDJjM2NlNzdhOTUx Y2NhZGMyYTNjZWRhZTc1ZWQxYmJlY2MyNGU1ODYuLjBiOGFiNjRmNjc4MDE0YmU4MGJmMDU0ZDM3 NDQwZjM2M2NjNDk1ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9m b3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCkBAIC03NiwxNSArNzYsMTcg QEAgQGltcGxlbWVudGF0aW9uIFdLRGF0ZVRpbWVDb250ZXh0TWVudVZpZXdDb250cm9sbGVyCiAt IChDR1NpemUpcHJlZmVycmVkQ29udGVudFNpemUKIHsKICAgICAvLyBGSVhNRTogV29ya2Fyb3Vu ZCwgc2hvdWxkIGJlIGFibGUgdG8gYmUgcmVhZGRyZXNzZWQgYWZ0ZXIgPHJkYXI6Ly9wcm9ibGVt LzY0MTQzNTM0PgotICAgIFVJVmlldyAqdmlldyA9IHNlbGYudmlldzsKKyAgICBVSVZpZXcgKnZp ZXcgPSBzZWxmLnZpZXcuc3Vidmlld3NbMF07CiAgICAgaWYgKFVJRWRnZUluc2V0c0VxdWFsVG9F ZGdlSW5zZXRzKHZpZXcubGF5b3V0TWFyZ2lucywgVUlFZGdlSW5zZXRzWmVybykpIHsKICAgICAg ICAgdmlldy50cmFuc2xhdGVzQXV0b3Jlc2l6aW5nTWFza0ludG9Db25zdHJhaW50cyA9IE5POwog ICAgICAgICBbdmlldyBsYXlvdXRJZk5lZWRlZF07CiAgICAgICAgIHZpZXcudHJhbnNsYXRlc0F1 dG9yZXNpemluZ01hc2tJbnRvQ29uc3RyYWludHMgPSBZRVM7CiAgICAgICAgIHZpZXcubGF5b3V0 TWFyZ2lucyA9IFVJRWRnZUluc2V0c01ha2UoMTYsIDE2LCAxNiwgMTYpOwogICAgIH0KLQotICAg IHJldHVybiBbdmlldyBzeXN0ZW1MYXlvdXRTaXplRml0dGluZ1NpemU6VUlMYXlvdXRGaXR0aW5n Q29tcHJlc3NlZFNpemVdOworICAgIGF1dG8gc2l6ZSA9ICBbdmlldyBzeXN0ZW1MYXlvdXRTaXpl Rml0dGluZ1NpemU6VUlMYXlvdXRGaXR0aW5nQ29tcHJlc3NlZFNpemVdOworICAgIGlmIChzaXpl LndpZHRoIDwgMjUwKQorICAgICAgICBzaXplLndpZHRoID0gMjUwOworICAgIHJldHVybiBzaXpl OwogfQogCiBAZW5kCkBAIC0xNjgsMTUgKzE3MCwzMCBAQCAtIChVSUNvbnRleHRNZW51Q29uZmln dXJhdGlvbiAqKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlv bgogICAgICAgICBbX3ZpZXdDb250cm9sbGVyIHNldFZpZXc6bmlsXTsKICAgICAgICAgX3ZpZXdD b250cm9sbGVyID0gYWRvcHROUyhbW1dLRGF0ZVRpbWVDb250ZXh0TWVudVZpZXdDb250cm9sbGVy IGFsbG9jXSBpbml0XSk7CiAgICAgICAgIFJldGFpblB0cjxVSU5hdmlnYXRpb25Db250cm9sbGVy PiBuYXZpZ2F0aW9uQ29udHJvbGxlciA9IGFkb3B0TlMoW1tVSU5hdmlnYXRpb25Db250cm9sbGVy IGFsbG9jXSBpbml0V2l0aFJvb3RWaWV3Q29udHJvbGxlcjpfdmlld0NvbnRyb2xsZXIuZ2V0KCld KTsKKyAgICAgICAgCiAgICAgICAgIE5TU3RyaW5nICpyZXNldFN0cmluZyA9IFdFQl9VSV9TVFJJ TkdfS0VZKCJSZXNldCIsICJSZXNldCBCdXR0b24gRGF0ZS9UaW1lIENvbnRleHQgTWVudSIsICJS ZXNldCBidXR0b24gaW4gZGF0ZSBpbnB1dCBjb250ZXh0IG1lbnUiKTsKKyAgICAgICAgTlNTdHJp bmcgKm9rU3RyaW5nID0gV0VCX1VJX1NUUklOR19LRVkoIk9LIiwgIk9LIChPSyBidXR0b24gdGl0 bGUgaW4gZGF0ZS90aW1lIHBpY2tlcikiLCAiVGl0bGUgb2YgdGhlIE9LIGJ1dHRvbiBpbiBkYXRl L3RpbWUgZm9ybSBjb250cm9scy4iKTsKIAorICAgICAgICBSZXRhaW5QdHI8VUlCYXJCdXR0b25J dGVtPiBva0JhckJ1dHRvbiA9IGFkb3B0TlMoW1tVSUJhckJ1dHRvbkl0ZW0gYWxsb2NdIGluaXRX aXRoVGl0bGU6b2tTdHJpbmcgc3R5bGU6VUlCYXJCdXR0b25JdGVtU3R5bGVEb25lIHRhcmdldDpz ZWxmIGFjdGlvbjpAc2VsZWN0b3Iob2s6KV0pOwogICAgICAgICBSZXRhaW5QdHI8VUlCYXJCdXR0 b25JdGVtPiBibGFua0JhckJ1dHRvbiA9IGFkb3B0TlMoW1tVSUJhckJ1dHRvbkl0ZW0gYWxsb2Nd IGluaXRXaXRoQmFyQnV0dG9uU3lzdGVtSXRlbTpVSUJhckJ1dHRvblN5c3RlbUl0ZW1GbGV4aWJs ZVNwYWNlIHRhcmdldDpuaWwgYWN0aW9uOm5pbF0pOwogICAgICAgICBSZXRhaW5QdHI8VUlCYXJC dXR0b25JdGVtPiByZXNldEJhckJ1dHRvbiA9IGFkb3B0TlMoW1tVSUJhckJ1dHRvbkl0ZW0gYWxs b2NdIGluaXRXaXRoVGl0bGU6cmVzZXRTdHJpbmcgc3R5bGU6VUlCYXJCdXR0b25JdGVtU3R5bGVQ bGFpbiB0YXJnZXQ6c2VsZiBhY3Rpb246QHNlbGVjdG9yKHJlc2V0OildKTsKICAgICAgICAgCi0g ICAgICAgIFtfdmlld0NvbnRyb2xsZXIgc2V0VG9vbGJhckl0ZW1zOkBbYmxhbmtCYXJCdXR0b24u Z2V0KCksIHJlc2V0QmFyQnV0dG9uLmdldCgpXV07CisgICAgICAgIFtfdmlld0NvbnRyb2xsZXIg c2V0VG9vbGJhckl0ZW1zOkBbcmVzZXRCYXJCdXR0b24uZ2V0KCksIGJsYW5rQmFyQnV0dG9uLmdl dCgpLCBva0JhckJ1dHRvbi5nZXQoKV1dOwogICAgICAgICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIg c2V0VG9vbGJhckhpZGRlbjpOT107CisgICAgICAgIAorICAgICAgICBhdXRvIGNlbnRlcmluZ1Zp ZXcgPSBhZG9wdE5TKFtbVUlWaWV3IGFsbG9jXSBpbml0XSk7CisgICAgICAgIAorICAgICAgICBb Y2VudGVyaW5nVmlldyBhZGRTdWJ2aWV3Ol9kYXRlUGlja2VyLmdldCgpXTsKKyAgICAgICAgCisg ICAgICAgIF9kYXRlUGlja2VyLmdldCgpLnRyYW5zbGF0ZXNBdXRvcmVzaXppbmdNYXNrSW50b0Nv bnN0cmFpbnRzID0gTk87CisgICAgICAgIGF1dG8gd2lkdGhDb25zdHJhaW50ID0gW1tjZW50ZXJp bmdWaWV3IHdpZHRoQW5jaG9yXSBjb25zdHJhaW50R3JlYXRlclRoYW5PckVxdWFsVG9BbmNob3I6 W19kYXRlUGlja2VyIHdpZHRoQW5jaG9yXV07CisgICAgICAgIGF1dG8gaGVpZ2h0Q29uc3RyYWlu dCA9IFtbY2VudGVyaW5nVmlldyBoZWlnaHRBbmNob3JdIGNvbnN0cmFpbnRFcXVhbFRvQW5jaG9y OltfZGF0ZVBpY2tlciBoZWlnaHRBbmNob3JdXTsKKyAgICAgICAgYXV0byBob3Jpem9udGFsQ29u c3RyYWludCA9IFtbY2VudGVyaW5nVmlldyBjZW50ZXJYQW5jaG9yXSBjb25zdHJhaW50RXF1YWxU b0FuY2hvcjpbX2RhdGVQaWNrZXIgY2VudGVyWEFuY2hvcl1dOworICAgICAgICBhdXRvIHZlcnRp Y2FsQ29uc3RyYWludCA9IFtbY2VudGVyaW5nVmlldyBjZW50ZXJZQW5jaG9yXSBjb25zdHJhaW50 RXF1YWxUb0FuY2hvcjpbX2RhdGVQaWNrZXIgY2VudGVyWUFuY2hvcl1dOwogCi0gICAgICAgIFtf dmlld0NvbnRyb2xsZXIgc2V0VmlldzpfZGF0ZVBpY2tlci5nZXQoKV07CisgICAgICAgIFtOU0xh eW91dENvbnN0cmFpbnQgYWN0aXZhdGVDb25zdHJhaW50czpAW3ZlcnRpY2FsQ29uc3RyYWludCwg aG9yaXpvbnRhbENvbnN0cmFpbnQsIHdpZHRoQ29uc3RyYWludCwgaGVpZ2h0Q29uc3RyYWludF1d OworCisgICAgICAgIFtfdmlld0NvbnRyb2xsZXIgc2V0VmlldzpjZW50ZXJpbmdWaWV3LmdldCgp XTsKIAogICAgICAgICBOU1N0cmluZyAqdGl0bGVUZXh0ID0gX3ZpZXcuaW5wdXRMYWJlbFRleHQ7 CiAgICAgICAgIGlmICghW3RpdGxlVGV4dCBpc0VxdWFsOkAiIl0pIHsKQEAgLTE5MCwxMCArMjA3 LDEwIEBAIC0gKFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopY29udGV4dE1lbnVJbnRlcmFj dGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uCiAgICAgICAgIH0gZWxzZQogICAgICAgICAg ICAgW25hdmlnYXRpb25Db250cm9sbGVyIHNldE5hdmlnYXRpb25CYXJIaWRkZW46WUVTIGFuaW1h dGVkOk5PXTsKICAgICAgICAgCi0gICAgICAgIFtuYXZpZ2F0aW9uQ29udHJvbGxlciBuYXZpZ2F0 aW9uQmFyXS5iYWNrZ3JvdW5kQ29sb3IgPSBVSUNvbG9yLmNsZWFyQ29sb3I7CiAgICAgICAgIFtu YXZpZ2F0aW9uQ29udHJvbGxlciBuYXZpZ2F0aW9uQmFyXS50cmFuc2x1Y2VudCA9IE5POwotICAg ICAgICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIgdG9vbGJhcl0uYmFja2dyb3VuZENvbG9yID0gVUlD b2xvci5jbGVhckNvbG9yOworICAgICAgICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIgbmF2aWdhdGlv bkJhcl0uYmFyVGludENvbG9yID0gW1VJQ29sb3Igc3lzdGVtQmFja2dyb3VuZENvbG9yXTsKICAg ICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIHRvb2xiYXJdLnRyYW5zbHVjZW50ID0gTk87Cisg ICAgICAgIFtuYXZpZ2F0aW9uQ29udHJvbGxlciB0b29sYmFyXS5iYXJUaW50Q29sb3IgPSBbVUlD b2xvciBzeXN0ZW1CYWNrZ3JvdW5kQ29sb3JdOwogICAgICAgICByZXR1cm4gbmF2aWdhdGlvbkNv bnRyb2xsZXIuZ2V0KCk7CiAgICAgfSBhY3Rpb25Qcm92aWRlcjpuaWxdOwogfQpAQCAtMjAyLDcg KzIxOSw4IEBAIC0gKHZvaWQpY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUlu dGVyYWN0aW9uICopaW50ZXJhY3Rpb24gd2lsbERpc3BsCiB7CiAgICAgW2FuaW1hdG9yIGFkZENv bXBsZXRpb246W3dlYWtTZWxmID0gV2Vha09iakNQdHI8V0tEYXRlVGltZVBpY2tlcj4oc2VsZild IHsKICAgICAgICAgYXV0byBzdHJvbmdTZWxmID0gd2Vha1NlbGYuZ2V0KCk7Ci0gICAgICAgIFtz dHJvbmdTZWxmLT5fdmlldy53ZWJWaWV3IF9kaWRTaG93Q29udGV4dE1lbnVdOworICAgICAgICBp ZiAoc3Ryb25nU2VsZikKKyAgICAgICAgICAgIFtzdHJvbmdTZWxmLT5fdmlldy53ZWJWaWV3IF9k aWRTaG93Q29udGV4dE1lbnVdOwogICAgIH1dOwogfQogCkBAIC0yMTAsOCArMjI4LDEwIEBAIC0g KHZvaWQpY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uICop aW50ZXJhY3Rpb24gd2lsbEVuZEZvCiB7CiAgICAgW2FuaW1hdG9yIGFkZENvbXBsZXRpb246W3dl YWtTZWxmID0gV2Vha09iakNQdHI8V0tEYXRlVGltZVBpY2tlcj4oc2VsZildIHsKICAgICAgICAg YXV0byBzdHJvbmdTZWxmID0gd2Vha1NlbGYuZ2V0KCk7Ci0gICAgICAgIFtzdHJvbmdTZWxmLT5f dmlldyBhY2Nlc3NvcnlEb25lXTsKLSAgICAgICAgW3N0cm9uZ1NlbGYtPl92aWV3LndlYlZpZXcg X2RpZERpc21pc3NDb250ZXh0TWVudV07CisgICAgICAgIGlmIChzdHJvbmdTZWxmKSB7CisgICAg ICAgICAgICBbc3Ryb25nU2VsZi0+X3ZpZXcgYWNjZXNzb3J5RG9uZV07CisgICAgICAgICAgICBb c3Ryb25nU2VsZi0+X3ZpZXcud2ViVmlldyBfZGlkRGlzbWlzc0NvbnRleHRNZW51XTsKKyAgICAg ICAgfQogICAgIH1dOwogfQogCkBAIC0yNDksNiArMjY5LDExIEBAIC0gKHZvaWQpcmVzZXQ6KGlk KXNlbmRlcgogICAgIFtfdmlldyBwYWdlXS0+c2V0Rm9jdXNlZEVsZW1lbnRWYWx1ZShTdHJpbmco KSk7CiB9CiAKKy0gKHZvaWQpb2s6KGlkKXNlbmRlcgoreworICAgIFtfZGF0ZVRpbWVDb250ZXh0 TWVudUludGVyYWN0aW9uIGRpc21pc3NNZW51XTsKK30KKwogLSAoTlNTdHJpbmcgKiljYWxlbmRh clR5cGUKIHsKICAgICByZXR1cm4gW19kYXRlUGlja2VyIGNhbGVuZGFyXS5jYWxlbmRhcklkZW50 aWZpZXI7Cg== 404020 2020-07-10 16:24:11 -0700 2020-07-13 15:36:54 -0700 Patch bug-214195-20200710162410.patch text/plain 8282 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmNhYzUyMTA2OWZjMzJm YTlkMGEzNGM0ZmU3Y2IzMDM5NzVlYTY4Zi4uNjIzZmQ1ZWZhOWJlMWM1MDExNDdjOTMyN2JkYWJl ZGNhYmQ4YWUxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA3LTEwICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIE9LIGJ1 dHRvbiB0byBEYXRlL1RpbWUgZm9ybSBjb250cm9scy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDE5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5nczoK KwogMjAyMC0wNy0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtMRkNdW0Zsb2F0c10gTm9ybWFsIGZsb3cgZWxlbWVudCB0aGF0IGVzdGFibGlzaGVzIGEgbmV3 IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dCBtdXN0IG5vdCBvdmVybGFwIHRoZSBtYXJnaW4gYm94 IG9mIGFueSBmbG9hdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMmYxYjdlNTExOTI3YjEwNDMxMjQ4MDY0MWIxYWZi MDQ0Njk4YTU4ZS4uODlmYTUwZjNmN2IzZTVlZGVmNTMxMzUzNTgwNTkxZTkxZWM4YTI3MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAyMC0wNy0xMCAgTWVnYW4gR2FyZG5lciAgPG1lZ2Fu X2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBPSyBidXR0b24gdG8gRGF0ZS9UaW1l IGZvcm0gY29udHJvbHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTQxOTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY1MDA2MDAwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCAnT0snIGJ1dHRv biB0byBhZGQgY2xhcml0eSB0byBVSSwgYW5kIGluY3JlYXNlIHRoZSBkZWZhdWx0IHNpemUgb2Yg dGhlIGNvbnRyb2wgdG8KKyAgICAgICAgZW5zdXJlIHNwYWNlIGZvciBib3RoIGJ1dHRvbnMuIEFs c28gZml4ZWQgYSBjcmFzaCB0aGF0IGhhcHBlbmVkIHdoZW4gY2xvc2luZyB0aGUgY29udHJvbCBi ZWZvcmUKKyAgICAgICAgdGhlIGFuaW1hdGlvbiBjb21wbGV0ZWQuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJbnB1dENvbnRyb2wubW06CisgICAgICAgICgtW1dL RGF0ZVRpbWVDb250ZXh0TWVudVZpZXdDb250cm9sbGVyIHByZWZlcnJlZENvbnRlbnRTaXplXSk6 CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNrZXIgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpjb25m aWd1cmF0aW9uRm9yTWVudUF0TG9jYXRpb246XSk6CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNr ZXIgY29udGV4dE1lbnVJbnRlcmFjdGlvbjp3aWxsRGlzcGxheU1lbnVGb3JDb25maWd1cmF0aW9u OmFuaW1hdG9yOl0pOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIGNvbnRleHRNZW51SW50 ZXJhY3Rpb246d2lsbEVuZEZvckNvbmZpZ3VyYXRpb246YW5pbWF0b3I6XSk6CisgICAgICAgICgt W1dLRGF0ZVRpbWVQaWNrZXIgb2s6XSk6CisKIDIwMjAtMDctMTAgIENhcmxvcyBHYXJjaWEgQ2Ft cG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIEZsdXNoIHRoZSBjYWly byBzdXJmYWNlIGFmdGVyIHBhaW50aW5nIHdoZW4gdXNpbmcgc29mdHdhcmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MgYi9Tb3VyY2UvV2Vi Q29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCmluZGV4IDc3M2Q4NGY0ZjA3ZDZlMzdm YTI0NjlhMDE1M2IxOTZjZDdjMTBhNmIuLjU4NjAyOTBhOTVlYmUxNjkwMjNmY2FmMmJmZjhjZGQw OTdjZDA2MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxl LnN0cmluZ3MKKysrIGIvU291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5n cwpAQCAtNTQ0LDYgKzU0NCw5IEBACiAvKiBPSyBidXR0b24gbGFiZWwgaW4gZG9jdW1lbnQgcGFz c3dvcmQgZmFpbHVyZSBhbGVydCAqLwogIk9LIChkb2N1bWVudCBwYXNzd29yZCBmYWlsdXJlIGFs ZXJ0KSIgPSAiT0siOwogCisvKiBUaXRsZSBvZiB0aGUgT0sgYnV0dG9uIGluIGRhdGUvdGltZSBm b3JtIGNvbnRyb2xzLiAqLworIk9LIChPSyBidXR0b24gdGl0bGUgaW4gZGF0ZS90aW1lIHBpY2tl cikiID0gIk9LIjsKKwogLyogTWVudSBpdGVtIGxhYmVsIGZvciB0aGUgdHJhY2sgdGhhdCByZXBy ZXNlbnRzIGRpc2FibGluZyBjbG9zZWQgY2FwdGlvbnMgKi8KICJPZmYiID0gIk9mZiI7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5w dXRDb250cm9sLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRp bWVJbnB1dENvbnRyb2wubW0KaW5kZXggMmMzY2U3N2E5NTFjY2FkYzJhM2NlZGFlNzVlZDFiYmVj YzI0ZTU4Ni4uMjA4YTE0NGU4MWUxNTZmNDBmOWMyNmIyNjdlZTgwODEyMzVmNzRlNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJbnB1dENv bnRyb2wubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRp bWVJbnB1dENvbnRyb2wubW0KQEAgLTc2LDE1ICs3NiwxNyBAQCBAaW1wbGVtZW50YXRpb24gV0tE YXRlVGltZUNvbnRleHRNZW51Vmlld0NvbnRyb2xsZXIKIC0gKENHU2l6ZSlwcmVmZXJyZWRDb250 ZW50U2l6ZQogewogICAgIC8vIEZJWE1FOiBXb3JrYXJvdW5kLCBzaG91bGQgYmUgYWJsZSB0byBi ZSByZWFkZHJlc3NlZCBhZnRlciA8cmRhcjovL3Byb2JsZW0vNjQxNDM1MzQ+Ci0gICAgVUlWaWV3 ICp2aWV3ID0gc2VsZi52aWV3OworICAgIFVJVmlldyAqdmlldyA9IHNlbGYudmlldy5zdWJ2aWV3 c1swXTsKICAgICBpZiAoVUlFZGdlSW5zZXRzRXF1YWxUb0VkZ2VJbnNldHModmlldy5sYXlvdXRN YXJnaW5zLCBVSUVkZ2VJbnNldHNaZXJvKSkgewogICAgICAgICB2aWV3LnRyYW5zbGF0ZXNBdXRv cmVzaXppbmdNYXNrSW50b0NvbnN0cmFpbnRzID0gTk87CiAgICAgICAgIFt2aWV3IGxheW91dElm TmVlZGVkXTsKICAgICAgICAgdmlldy50cmFuc2xhdGVzQXV0b3Jlc2l6aW5nTWFza0ludG9Db25z dHJhaW50cyA9IFlFUzsKICAgICAgICAgdmlldy5sYXlvdXRNYXJnaW5zID0gVUlFZGdlSW5zZXRz TWFrZSgxNiwgMTYsIDE2LCAxNik7CiAgICAgfQotCi0gICAgcmV0dXJuIFt2aWV3IHN5c3RlbUxh eW91dFNpemVGaXR0aW5nU2l6ZTpVSUxheW91dEZpdHRpbmdDb21wcmVzc2VkU2l6ZV07CisgICAg YXV0byBzaXplID0gIFt2aWV3IHN5c3RlbUxheW91dFNpemVGaXR0aW5nU2l6ZTpVSUxheW91dEZp dHRpbmdDb21wcmVzc2VkU2l6ZV07CisgICAgaWYgKHNpemUud2lkdGggPCAyNTApCisgICAgICAg IHNpemUud2lkdGggPSAyNTA7CisgICAgcmV0dXJuIHNpemU7CiB9CiAKIEBlbmQKQEAgLTE2OCwx NSArMTcwLDMwIEBAIC0gKFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopY29udGV4dE1lbnVJ bnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uCiAgICAgICAgIFtfdmlld0NvbnRy b2xsZXIgc2V0VmlldzpuaWxdOwogICAgICAgICBfdmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFtb V0tEYXRlVGltZUNvbnRleHRNZW51Vmlld0NvbnRyb2xsZXIgYWxsb2NdIGluaXRdKTsKICAgICAg ICAgUmV0YWluUHRyPFVJTmF2aWdhdGlvbkNvbnRyb2xsZXI+IG5hdmlnYXRpb25Db250cm9sbGVy ID0gYWRvcHROUyhbW1VJTmF2aWdhdGlvbkNvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoUm9vdFZp ZXdDb250cm9sbGVyOl92aWV3Q29udHJvbGxlci5nZXQoKV0pOworICAgICAgICAKICAgICAgICAg TlNTdHJpbmcgKnJlc2V0U3RyaW5nID0gV0VCX1VJX1NUUklOR19LRVkoIlJlc2V0IiwgIlJlc2V0 IEJ1dHRvbiBEYXRlL1RpbWUgQ29udGV4dCBNZW51IiwgIlJlc2V0IGJ1dHRvbiBpbiBkYXRlIGlu cHV0IGNvbnRleHQgbWVudSIpOworICAgICAgICBOU1N0cmluZyAqb2tTdHJpbmcgPSBXRUJfVUlf U1RSSU5HX0tFWSgiT0siLCAiT0sgKE9LIGJ1dHRvbiB0aXRsZSBpbiBkYXRlL3RpbWUgcGlja2Vy KSIsICJUaXRsZSBvZiB0aGUgT0sgYnV0dG9uIGluIGRhdGUvdGltZSBmb3JtIGNvbnRyb2xzLiIp OwogCisgICAgICAgIFJldGFpblB0cjxVSUJhckJ1dHRvbkl0ZW0+IG9rQmFyQnV0dG9uID0gYWRv cHROUyhbW1VJQmFyQnV0dG9uSXRlbSBhbGxvY10gaW5pdFdpdGhUaXRsZTpva1N0cmluZyBzdHls ZTpVSUJhckJ1dHRvbkl0ZW1TdHlsZURvbmUgdGFyZ2V0OnNlbGYgYWN0aW9uOkBzZWxlY3Rvcihv azopXSk7CiAgICAgICAgIFJldGFpblB0cjxVSUJhckJ1dHRvbkl0ZW0+IGJsYW5rQmFyQnV0dG9u ID0gYWRvcHROUyhbW1VJQmFyQnV0dG9uSXRlbSBhbGxvY10gaW5pdFdpdGhCYXJCdXR0b25TeXN0 ZW1JdGVtOlVJQmFyQnV0dG9uU3lzdGVtSXRlbUZsZXhpYmxlU3BhY2UgdGFyZ2V0Om5pbCBhY3Rp b246bmlsXSk7CiAgICAgICAgIFJldGFpblB0cjxVSUJhckJ1dHRvbkl0ZW0+IHJlc2V0QmFyQnV0 dG9uID0gYWRvcHROUyhbW1VJQmFyQnV0dG9uSXRlbSBhbGxvY10gaW5pdFdpdGhUaXRsZTpyZXNl dFN0cmluZyBzdHlsZTpVSUJhckJ1dHRvbkl0ZW1TdHlsZVBsYWluIHRhcmdldDpzZWxmIGFjdGlv bjpAc2VsZWN0b3IocmVzZXQ6KV0pOwogICAgICAgICAKLSAgICAgICAgW192aWV3Q29udHJvbGxl ciBzZXRUb29sYmFySXRlbXM6QFtibGFua0JhckJ1dHRvbi5nZXQoKSwgcmVzZXRCYXJCdXR0b24u Z2V0KCldXTsKKyAgICAgICAgW192aWV3Q29udHJvbGxlciBzZXRUb29sYmFySXRlbXM6QFtyZXNl dEJhckJ1dHRvbi5nZXQoKSwgYmxhbmtCYXJCdXR0b24uZ2V0KCksIG9rQmFyQnV0dG9uLmdldCgp XV07CiAgICAgICAgIFtuYXZpZ2F0aW9uQ29udHJvbGxlciBzZXRUb29sYmFySGlkZGVuOk5PXTsK KyAgICAgICAgCisgICAgICAgIGF1dG8gY2VudGVyaW5nVmlldyA9IGFkb3B0TlMoW1tVSVZpZXcg YWxsb2NdIGluaXRdKTsKKyAgICAgICAgCisgICAgICAgIFtjZW50ZXJpbmdWaWV3IGFkZFN1YnZp ZXc6X2RhdGVQaWNrZXIuZ2V0KCldOworICAgICAgICAKKyAgICAgICAgX2RhdGVQaWNrZXIuZ2V0 KCkudHJhbnNsYXRlc0F1dG9yZXNpemluZ01hc2tJbnRvQ29uc3RyYWludHMgPSBOTzsKKyAgICAg ICAgYXV0byB3aWR0aENvbnN0cmFpbnQgPSBbW2NlbnRlcmluZ1ZpZXcgd2lkdGhBbmNob3JdIGNv bnN0cmFpbnRHcmVhdGVyVGhhbk9yRXF1YWxUb0FuY2hvcjpbX2RhdGVQaWNrZXIgd2lkdGhBbmNo b3JdXTsKKyAgICAgICAgYXV0byBoZWlnaHRDb25zdHJhaW50ID0gW1tjZW50ZXJpbmdWaWV3IGhl aWdodEFuY2hvcl0gY29uc3RyYWludEVxdWFsVG9BbmNob3I6W19kYXRlUGlja2VyIGhlaWdodEFu Y2hvcl1dOworICAgICAgICBhdXRvIGhvcml6b250YWxDb25zdHJhaW50ID0gW1tjZW50ZXJpbmdW aWV3IGNlbnRlclhBbmNob3JdIGNvbnN0cmFpbnRFcXVhbFRvQW5jaG9yOltfZGF0ZVBpY2tlciBj ZW50ZXJYQW5jaG9yXV07CisgICAgICAgIGF1dG8gdmVydGljYWxDb25zdHJhaW50ID0gW1tjZW50 ZXJpbmdWaWV3IGNlbnRlcllBbmNob3JdIGNvbnN0cmFpbnRFcXVhbFRvQW5jaG9yOltfZGF0ZVBp Y2tlciBjZW50ZXJZQW5jaG9yXV07CisKKyAgICAgICAgW05TTGF5b3V0Q29uc3RyYWludCBhY3Rp dmF0ZUNvbnN0cmFpbnRzOkBbdmVydGljYWxDb25zdHJhaW50LCBob3Jpem9udGFsQ29uc3RyYWlu dCwgd2lkdGhDb25zdHJhaW50LCBoZWlnaHRDb25zdHJhaW50XV07CiAKLSAgICAgICAgW192aWV3 Q29udHJvbGxlciBzZXRWaWV3Ol9kYXRlUGlja2VyLmdldCgpXTsKKyAgICAgICAgW192aWV3Q29u dHJvbGxlciBzZXRWaWV3OmNlbnRlcmluZ1ZpZXcuZ2V0KCldOwogCiAgICAgICAgIE5TU3RyaW5n ICp0aXRsZVRleHQgPSBfdmlldy5pbnB1dExhYmVsVGV4dDsKICAgICAgICAgaWYgKCFbdGl0bGVU ZXh0IGlzRXF1YWw6QCIiXSkgewpAQCAtMTkwLDEwICsyMDcsMTAgQEAgLSAoVUlDb250ZXh0TWVu dUNvbmZpZ3VyYXRpb24gKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50 ZXJhY3Rpb24KICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBbbmF2aWdhdGlvbkNvbnRyb2xs ZXIgc2V0TmF2aWdhdGlvbkJhckhpZGRlbjpZRVMgYW5pbWF0ZWQ6Tk9dOwogICAgICAgICAKLSAg ICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIG5hdmlnYXRpb25CYXJdLmJhY2tncm91bmRDb2xv ciA9IFVJQ29sb3IuY2xlYXJDb2xvcjsKICAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIG5h dmlnYXRpb25CYXJdLnRyYW5zbHVjZW50ID0gTk87Ci0gICAgICAgIFtuYXZpZ2F0aW9uQ29udHJv bGxlciB0b29sYmFyXS5iYWNrZ3JvdW5kQ29sb3IgPSBVSUNvbG9yLmNsZWFyQ29sb3I7CisgICAg ICAgIFtuYXZpZ2F0aW9uQ29udHJvbGxlciBuYXZpZ2F0aW9uQmFyXS5iYXJUaW50Q29sb3IgPSBb VUlDb2xvciBzeXN0ZW1CYWNrZ3JvdW5kQ29sb3JdOwogICAgICAgICBbbmF2aWdhdGlvbkNvbnRy b2xsZXIgdG9vbGJhcl0udHJhbnNsdWNlbnQgPSBOTzsKKyAgICAgICAgW25hdmlnYXRpb25Db250 cm9sbGVyIHRvb2xiYXJdLmJhclRpbnRDb2xvciA9IFtVSUNvbG9yIHN5c3RlbUJhY2tncm91bmRD b2xvcl07CiAgICAgICAgIHJldHVybiBuYXZpZ2F0aW9uQ29udHJvbGxlci5nZXQoKTsKICAgICB9 IGFjdGlvblByb3ZpZGVyOm5pbF07CiB9CkBAIC0yMDIsNyArMjE5LDggQEAgLSAodm9pZCljb250 ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlv biB3aWxsRGlzcGwKIHsKICAgICBbYW5pbWF0b3IgYWRkQ29tcGxldGlvbjpbd2Vha1NlbGYgPSBX ZWFrT2JqQ1B0cjxXS0RhdGVUaW1lUGlja2VyPihzZWxmKV0gewogICAgICAgICBhdXRvIHN0cm9u Z1NlbGYgPSB3ZWFrU2VsZi5nZXQoKTsKLSAgICAgICAgW3N0cm9uZ1NlbGYtPl92aWV3LndlYlZp ZXcgX2RpZFNob3dDb250ZXh0TWVudV07CisgICAgICAgIGlmIChzdHJvbmdTZWxmKQorICAgICAg ICAgICAgW3N0cm9uZ1NlbGYtPl92aWV3LndlYlZpZXcgX2RpZFNob3dDb250ZXh0TWVudV07CiAg ICAgfV07CiB9CiAKQEAgLTIxMCw4ICsyMjgsMTAgQEAgLSAodm9pZCljb250ZXh0TWVudUludGVy YWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiB3aWxsRW5kRm8K IHsKICAgICBbYW5pbWF0b3IgYWRkQ29tcGxldGlvbjpbd2Vha1NlbGYgPSBXZWFrT2JqQ1B0cjxX S0RhdGVUaW1lUGlja2VyPihzZWxmKV0gewogICAgICAgICBhdXRvIHN0cm9uZ1NlbGYgPSB3ZWFr U2VsZi5nZXQoKTsKLSAgICAgICAgW3N0cm9uZ1NlbGYtPl92aWV3IGFjY2Vzc29yeURvbmVdOwot ICAgICAgICBbc3Ryb25nU2VsZi0+X3ZpZXcud2ViVmlldyBfZGlkRGlzbWlzc0NvbnRleHRNZW51 XTsKKyAgICAgICAgaWYgKHN0cm9uZ1NlbGYpIHsKKyAgICAgICAgICAgIFtzdHJvbmdTZWxmLT5f dmlldyBhY2Nlc3NvcnlEb25lXTsKKyAgICAgICAgICAgIFtzdHJvbmdTZWxmLT5fdmlldy53ZWJW aWV3IF9kaWREaXNtaXNzQ29udGV4dE1lbnVdOworICAgICAgICB9CiAgICAgfV07CiB9CiAKQEAg LTI0OSw2ICsyNjksMTMgQEAgLSAodm9pZClyZXNldDooaWQpc2VuZGVyCiAgICAgW192aWV3IHBh Z2VdLT5zZXRGb2N1c2VkRWxlbWVudFZhbHVlKFN0cmluZygpKTsKIH0KIAorLSAodm9pZClvazoo aWQpc2VuZGVyCit7CisjaWYgVVNFKFVJQ09OVEVYVE1FTlUpCisgICAgW19kYXRlVGltZUNvbnRl eHRNZW51SW50ZXJhY3Rpb24gZGlzbWlzc01lbnVdOworI2VuZGlmCit9CisKIC0gKE5TU3RyaW5n ICopY2FsZW5kYXJUeXBlCiB7CiAgICAgcmV0dXJuIFtfZGF0ZVBpY2tlciBjYWxlbmRhcl0uY2Fs ZW5kYXJJZGVudGlmaWVyOwo= 404188 2020-07-13 15:36:56 -0700 2020-07-17 17:56:37 -0700 Patch bug-214195-20200713153655.patch text/plain 8894 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0MjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmNhYzUyMTA2OWZjMzJm YTlkMGEzNGM0ZmU3Y2IzMDM5NzVlYTY4Zi4uNjIzZmQ1ZWZhOWJlMWM1MDExNDdjOTMyN2JkYWJl ZGNhYmQ4YWUxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA3LTEwICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIE9LIGJ1 dHRvbiB0byBEYXRlL1RpbWUgZm9ybSBjb250cm9scy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDE5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5nczoK KwogMjAyMC0wNy0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtMRkNdW0Zsb2F0c10gTm9ybWFsIGZsb3cgZWxlbWVudCB0aGF0IGVzdGFibGlzaGVzIGEgbmV3 IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dCBtdXN0IG5vdCBvdmVybGFwIHRoZSBtYXJnaW4gYm94 IG9mIGFueSBmbG9hdHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMmYxYjdlNTExOTI3YjEwNDMxMjQ4MDY0MWIxYWZi MDQ0Njk4YTU4ZS4uODlmYTUwZjNmN2IzZTVlZGVmNTMxMzUzNTgwNTkxZTkxZWM4YTI3MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAyMC0wNy0xMCAgTWVnYW4gR2FyZG5lciAgPG1lZ2Fu X2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBPSyBidXR0b24gdG8gRGF0ZS9UaW1l IGZvcm0gY29udHJvbHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTQxOTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY1MDA2MDAwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCAnT0snIGJ1dHRv biB0byBhZGQgY2xhcml0eSB0byBVSSwgYW5kIGluY3JlYXNlIHRoZSBkZWZhdWx0IHNpemUgb2Yg dGhlIGNvbnRyb2wgdG8KKyAgICAgICAgZW5zdXJlIHNwYWNlIGZvciBib3RoIGJ1dHRvbnMuIEFs c28gZml4ZWQgYSBjcmFzaCB0aGF0IGhhcHBlbmVkIHdoZW4gY2xvc2luZyB0aGUgY29udHJvbCBi ZWZvcmUKKyAgICAgICAgdGhlIGFuaW1hdGlvbiBjb21wbGV0ZWQuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJbnB1dENvbnRyb2wubW06CisgICAgICAgICgtW1dL RGF0ZVRpbWVDb250ZXh0TWVudVZpZXdDb250cm9sbGVyIHByZWZlcnJlZENvbnRlbnRTaXplXSk6 CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNrZXIgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpjb25m aWd1cmF0aW9uRm9yTWVudUF0TG9jYXRpb246XSk6CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNr ZXIgY29udGV4dE1lbnVJbnRlcmFjdGlvbjp3aWxsRGlzcGxheU1lbnVGb3JDb25maWd1cmF0aW9u OmFuaW1hdG9yOl0pOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIGNvbnRleHRNZW51SW50 ZXJhY3Rpb246d2lsbEVuZEZvckNvbmZpZ3VyYXRpb246YW5pbWF0b3I6XSk6CisgICAgICAgICgt W1dLRGF0ZVRpbWVQaWNrZXIgb2s6XSk6CisKIDIwMjAtMDctMTAgIENhcmxvcyBHYXJjaWEgQ2Ft cG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIEZsdXNoIHRoZSBjYWly byBzdXJmYWNlIGFmdGVyIHBhaW50aW5nIHdoZW4gdXNpbmcgc29mdHdhcmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MgYi9Tb3VyY2UvV2Vi Q29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCmluZGV4IDc3M2Q4NGY0ZjA3ZDZlMzdm YTI0NjlhMDE1M2IxOTZjZDdjMTBhNmIuLjU4NjAyOTBhOTVlYmUxNjkwMjNmY2FmMmJmZjhjZGQw OTdjZDA2MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxl LnN0cmluZ3MKKysrIGIvU291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5n cwpAQCAtNTQ0LDYgKzU0NCw5IEBACiAvKiBPSyBidXR0b24gbGFiZWwgaW4gZG9jdW1lbnQgcGFz c3dvcmQgZmFpbHVyZSBhbGVydCAqLwogIk9LIChkb2N1bWVudCBwYXNzd29yZCBmYWlsdXJlIGFs ZXJ0KSIgPSAiT0siOwogCisvKiBUaXRsZSBvZiB0aGUgT0sgYnV0dG9uIGluIGRhdGUvdGltZSBm b3JtIGNvbnRyb2xzLiAqLworIk9LIChPSyBidXR0b24gdGl0bGUgaW4gZGF0ZS90aW1lIHBpY2tl cikiID0gIk9LIjsKKwogLyogTWVudSBpdGVtIGxhYmVsIGZvciB0aGUgdHJhY2sgdGhhdCByZXBy ZXNlbnRzIGRpc2FibGluZyBjbG9zZWQgY2FwdGlvbnMgKi8KICJPZmYiID0gIk9mZiI7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oIGIvU291 cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmgKaW5kZXggYmE3ZTU0ZDA1NTZj NDgzZjIyZTRhY2Y0YWNkMmI5M2Y1OWZiNzZkYi4uM2VkODQ1NzcwNGYwMjEyYTY2YjVmMjI0MDg1 ZTMzNzZkOTMxMGE0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9z L1VJS2l0U1BJLmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJ LmgKQEAgLTExNzQsNiArMTE3NCw3IEBAIHR5cGVkZWYgTlNfRU5VTShOU1VJbnRlZ2VyLCBfVUlD b250ZXh0TWVudUxheW91dCkgewogQGludGVyZmFjZSBVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24g KCkKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgVUlHZXN0dXJlUmVjb2duaXplciAq Z2VzdHVyZVJlY29nbml6ZXJGb3JGYWlsdXJlUmVsYXRpb25zaGlwczsKIC0gKHZvaWQpX3ByZXNl bnRNZW51QXRMb2NhdGlvbjooQ0dQb2ludClsb2NhdGlvbjsKKy0gKHZvaWQpZGlzbWlzc01lbnU7 CiBAZW5kCiAKICNlbmRpZiAvLyBVU0UoVUlDT05URVhUTUVOVSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJbnB1dENvbnRyb2wu bW0KaW5kZXggMmMzY2U3N2E5NTFjY2FkYzJhM2NlZGFlNzVlZDFiYmVjYzI0ZTU4Ni4uMjA4YTE0 NGU4MWUxNTZmNDBmOWMyNmIyNjdlZTgwODEyMzVmNzRlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJbnB1dENvbnRyb2wubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJbnB1dENvbnRyb2wu bW0KQEAgLTc2LDE1ICs3NiwxNyBAQCBAaW1wbGVtZW50YXRpb24gV0tEYXRlVGltZUNvbnRleHRN ZW51Vmlld0NvbnRyb2xsZXIKIC0gKENHU2l6ZSlwcmVmZXJyZWRDb250ZW50U2l6ZQogewogICAg IC8vIEZJWE1FOiBXb3JrYXJvdW5kLCBzaG91bGQgYmUgYWJsZSB0byBiZSByZWFkZHJlc3NlZCBh ZnRlciA8cmRhcjovL3Byb2JsZW0vNjQxNDM1MzQ+Ci0gICAgVUlWaWV3ICp2aWV3ID0gc2VsZi52 aWV3OworICAgIFVJVmlldyAqdmlldyA9IHNlbGYudmlldy5zdWJ2aWV3c1swXTsKICAgICBpZiAo VUlFZGdlSW5zZXRzRXF1YWxUb0VkZ2VJbnNldHModmlldy5sYXlvdXRNYXJnaW5zLCBVSUVkZ2VJ bnNldHNaZXJvKSkgewogICAgICAgICB2aWV3LnRyYW5zbGF0ZXNBdXRvcmVzaXppbmdNYXNrSW50 b0NvbnN0cmFpbnRzID0gTk87CiAgICAgICAgIFt2aWV3IGxheW91dElmTmVlZGVkXTsKICAgICAg ICAgdmlldy50cmFuc2xhdGVzQXV0b3Jlc2l6aW5nTWFza0ludG9Db25zdHJhaW50cyA9IFlFUzsK ICAgICAgICAgdmlldy5sYXlvdXRNYXJnaW5zID0gVUlFZGdlSW5zZXRzTWFrZSgxNiwgMTYsIDE2 LCAxNik7CiAgICAgfQotCi0gICAgcmV0dXJuIFt2aWV3IHN5c3RlbUxheW91dFNpemVGaXR0aW5n U2l6ZTpVSUxheW91dEZpdHRpbmdDb21wcmVzc2VkU2l6ZV07CisgICAgYXV0byBzaXplID0gIFt2 aWV3IHN5c3RlbUxheW91dFNpemVGaXR0aW5nU2l6ZTpVSUxheW91dEZpdHRpbmdDb21wcmVzc2Vk U2l6ZV07CisgICAgaWYgKHNpemUud2lkdGggPCAyNTApCisgICAgICAgIHNpemUud2lkdGggPSAy NTA7CisgICAgcmV0dXJuIHNpemU7CiB9CiAKIEBlbmQKQEAgLTE2OCwxNSArMTcwLDMwIEBAIC0g KFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlD b250ZXh0TWVudUludGVyYWN0aW9uCiAgICAgICAgIFtfdmlld0NvbnRyb2xsZXIgc2V0Vmlldzpu aWxdOwogICAgICAgICBfdmlld0NvbnRyb2xsZXIgPSBhZG9wdE5TKFtbV0tEYXRlVGltZUNvbnRl eHRNZW51Vmlld0NvbnRyb2xsZXIgYWxsb2NdIGluaXRdKTsKICAgICAgICAgUmV0YWluUHRyPFVJ TmF2aWdhdGlvbkNvbnRyb2xsZXI+IG5hdmlnYXRpb25Db250cm9sbGVyID0gYWRvcHROUyhbW1VJ TmF2aWdhdGlvbkNvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoUm9vdFZpZXdDb250cm9sbGVyOl92 aWV3Q29udHJvbGxlci5nZXQoKV0pOworICAgICAgICAKICAgICAgICAgTlNTdHJpbmcgKnJlc2V0 U3RyaW5nID0gV0VCX1VJX1NUUklOR19LRVkoIlJlc2V0IiwgIlJlc2V0IEJ1dHRvbiBEYXRlL1Rp bWUgQ29udGV4dCBNZW51IiwgIlJlc2V0IGJ1dHRvbiBpbiBkYXRlIGlucHV0IGNvbnRleHQgbWVu dSIpOworICAgICAgICBOU1N0cmluZyAqb2tTdHJpbmcgPSBXRUJfVUlfU1RSSU5HX0tFWSgiT0si LCAiT0sgKE9LIGJ1dHRvbiB0aXRsZSBpbiBkYXRlL3RpbWUgcGlja2VyKSIsICJUaXRsZSBvZiB0 aGUgT0sgYnV0dG9uIGluIGRhdGUvdGltZSBmb3JtIGNvbnRyb2xzLiIpOwogCisgICAgICAgIFJl dGFpblB0cjxVSUJhckJ1dHRvbkl0ZW0+IG9rQmFyQnV0dG9uID0gYWRvcHROUyhbW1VJQmFyQnV0 dG9uSXRlbSBhbGxvY10gaW5pdFdpdGhUaXRsZTpva1N0cmluZyBzdHlsZTpVSUJhckJ1dHRvbkl0 ZW1TdHlsZURvbmUgdGFyZ2V0OnNlbGYgYWN0aW9uOkBzZWxlY3RvcihvazopXSk7CiAgICAgICAg IFJldGFpblB0cjxVSUJhckJ1dHRvbkl0ZW0+IGJsYW5rQmFyQnV0dG9uID0gYWRvcHROUyhbW1VJ QmFyQnV0dG9uSXRlbSBhbGxvY10gaW5pdFdpdGhCYXJCdXR0b25TeXN0ZW1JdGVtOlVJQmFyQnV0 dG9uU3lzdGVtSXRlbUZsZXhpYmxlU3BhY2UgdGFyZ2V0Om5pbCBhY3Rpb246bmlsXSk7CiAgICAg ICAgIFJldGFpblB0cjxVSUJhckJ1dHRvbkl0ZW0+IHJlc2V0QmFyQnV0dG9uID0gYWRvcHROUyhb W1VJQmFyQnV0dG9uSXRlbSBhbGxvY10gaW5pdFdpdGhUaXRsZTpyZXNldFN0cmluZyBzdHlsZTpV SUJhckJ1dHRvbkl0ZW1TdHlsZVBsYWluIHRhcmdldDpzZWxmIGFjdGlvbjpAc2VsZWN0b3IocmVz ZXQ6KV0pOwogICAgICAgICAKLSAgICAgICAgW192aWV3Q29udHJvbGxlciBzZXRUb29sYmFySXRl bXM6QFtibGFua0JhckJ1dHRvbi5nZXQoKSwgcmVzZXRCYXJCdXR0b24uZ2V0KCldXTsKKyAgICAg ICAgW192aWV3Q29udHJvbGxlciBzZXRUb29sYmFySXRlbXM6QFtyZXNldEJhckJ1dHRvbi5nZXQo KSwgYmxhbmtCYXJCdXR0b24uZ2V0KCksIG9rQmFyQnV0dG9uLmdldCgpXV07CiAgICAgICAgIFtu YXZpZ2F0aW9uQ29udHJvbGxlciBzZXRUb29sYmFySGlkZGVuOk5PXTsKKyAgICAgICAgCisgICAg ICAgIGF1dG8gY2VudGVyaW5nVmlldyA9IGFkb3B0TlMoW1tVSVZpZXcgYWxsb2NdIGluaXRdKTsK KyAgICAgICAgCisgICAgICAgIFtjZW50ZXJpbmdWaWV3IGFkZFN1YnZpZXc6X2RhdGVQaWNrZXIu Z2V0KCldOworICAgICAgICAKKyAgICAgICAgX2RhdGVQaWNrZXIuZ2V0KCkudHJhbnNsYXRlc0F1 dG9yZXNpemluZ01hc2tJbnRvQ29uc3RyYWludHMgPSBOTzsKKyAgICAgICAgYXV0byB3aWR0aENv bnN0cmFpbnQgPSBbW2NlbnRlcmluZ1ZpZXcgd2lkdGhBbmNob3JdIGNvbnN0cmFpbnRHcmVhdGVy VGhhbk9yRXF1YWxUb0FuY2hvcjpbX2RhdGVQaWNrZXIgd2lkdGhBbmNob3JdXTsKKyAgICAgICAg YXV0byBoZWlnaHRDb25zdHJhaW50ID0gW1tjZW50ZXJpbmdWaWV3IGhlaWdodEFuY2hvcl0gY29u c3RyYWludEVxdWFsVG9BbmNob3I6W19kYXRlUGlja2VyIGhlaWdodEFuY2hvcl1dOworICAgICAg ICBhdXRvIGhvcml6b250YWxDb25zdHJhaW50ID0gW1tjZW50ZXJpbmdWaWV3IGNlbnRlclhBbmNo b3JdIGNvbnN0cmFpbnRFcXVhbFRvQW5jaG9yOltfZGF0ZVBpY2tlciBjZW50ZXJYQW5jaG9yXV07 CisgICAgICAgIGF1dG8gdmVydGljYWxDb25zdHJhaW50ID0gW1tjZW50ZXJpbmdWaWV3IGNlbnRl cllBbmNob3JdIGNvbnN0cmFpbnRFcXVhbFRvQW5jaG9yOltfZGF0ZVBpY2tlciBjZW50ZXJZQW5j aG9yXV07CisKKyAgICAgICAgW05TTGF5b3V0Q29uc3RyYWludCBhY3RpdmF0ZUNvbnN0cmFpbnRz OkBbdmVydGljYWxDb25zdHJhaW50LCBob3Jpem9udGFsQ29uc3RyYWludCwgd2lkdGhDb25zdHJh aW50LCBoZWlnaHRDb25zdHJhaW50XV07CiAKLSAgICAgICAgW192aWV3Q29udHJvbGxlciBzZXRW aWV3Ol9kYXRlUGlja2VyLmdldCgpXTsKKyAgICAgICAgW192aWV3Q29udHJvbGxlciBzZXRWaWV3 OmNlbnRlcmluZ1ZpZXcuZ2V0KCldOwogCiAgICAgICAgIE5TU3RyaW5nICp0aXRsZVRleHQgPSBf dmlldy5pbnB1dExhYmVsVGV4dDsKICAgICAgICAgaWYgKCFbdGl0bGVUZXh0IGlzRXF1YWw6QCIi XSkgewpAQCAtMTkwLDEwICsyMDcsMTAgQEAgLSAoVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24g Kiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24KICAgICAg ICAgfSBlbHNlCiAgICAgICAgICAgICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIgc2V0TmF2aWdhdGlv bkJhckhpZGRlbjpZRVMgYW5pbWF0ZWQ6Tk9dOwogICAgICAgICAKLSAgICAgICAgW25hdmlnYXRp b25Db250cm9sbGVyIG5hdmlnYXRpb25CYXJdLmJhY2tncm91bmRDb2xvciA9IFVJQ29sb3IuY2xl YXJDb2xvcjsKICAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIG5hdmlnYXRpb25CYXJdLnRy YW5zbHVjZW50ID0gTk87Ci0gICAgICAgIFtuYXZpZ2F0aW9uQ29udHJvbGxlciB0b29sYmFyXS5i YWNrZ3JvdW5kQ29sb3IgPSBVSUNvbG9yLmNsZWFyQ29sb3I7CisgICAgICAgIFtuYXZpZ2F0aW9u Q29udHJvbGxlciBuYXZpZ2F0aW9uQmFyXS5iYXJUaW50Q29sb3IgPSBbVUlDb2xvciBzeXN0ZW1C YWNrZ3JvdW5kQ29sb3JdOwogICAgICAgICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIgdG9vbGJhcl0u dHJhbnNsdWNlbnQgPSBOTzsKKyAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIHRvb2xiYXJd LmJhclRpbnRDb2xvciA9IFtVSUNvbG9yIHN5c3RlbUJhY2tncm91bmRDb2xvcl07CiAgICAgICAg IHJldHVybiBuYXZpZ2F0aW9uQ29udHJvbGxlci5nZXQoKTsKICAgICB9IGFjdGlvblByb3ZpZGVy Om5pbF07CiB9CkBAIC0yMDIsNyArMjE5LDggQEAgLSAodm9pZCljb250ZXh0TWVudUludGVyYWN0 aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiB3aWxsRGlzcGwKIHsK ICAgICBbYW5pbWF0b3IgYWRkQ29tcGxldGlvbjpbd2Vha1NlbGYgPSBXZWFrT2JqQ1B0cjxXS0Rh dGVUaW1lUGlja2VyPihzZWxmKV0gewogICAgICAgICBhdXRvIHN0cm9uZ1NlbGYgPSB3ZWFrU2Vs Zi5nZXQoKTsKLSAgICAgICAgW3N0cm9uZ1NlbGYtPl92aWV3LndlYlZpZXcgX2RpZFNob3dDb250 ZXh0TWVudV07CisgICAgICAgIGlmIChzdHJvbmdTZWxmKQorICAgICAgICAgICAgW3N0cm9uZ1Nl bGYtPl92aWV3LndlYlZpZXcgX2RpZFNob3dDb250ZXh0TWVudV07CiAgICAgfV07CiB9CiAKQEAg LTIxMCw4ICsyMjgsMTAgQEAgLSAodm9pZCljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRl eHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiB3aWxsRW5kRm8KIHsKICAgICBbYW5pbWF0 b3IgYWRkQ29tcGxldGlvbjpbd2Vha1NlbGYgPSBXZWFrT2JqQ1B0cjxXS0RhdGVUaW1lUGlja2Vy PihzZWxmKV0gewogICAgICAgICBhdXRvIHN0cm9uZ1NlbGYgPSB3ZWFrU2VsZi5nZXQoKTsKLSAg ICAgICAgW3N0cm9uZ1NlbGYtPl92aWV3IGFjY2Vzc29yeURvbmVdOwotICAgICAgICBbc3Ryb25n U2VsZi0+X3ZpZXcud2ViVmlldyBfZGlkRGlzbWlzc0NvbnRleHRNZW51XTsKKyAgICAgICAgaWYg KHN0cm9uZ1NlbGYpIHsKKyAgICAgICAgICAgIFtzdHJvbmdTZWxmLT5fdmlldyBhY2Nlc3NvcnlE b25lXTsKKyAgICAgICAgICAgIFtzdHJvbmdTZWxmLT5fdmlldy53ZWJWaWV3IF9kaWREaXNtaXNz Q29udGV4dE1lbnVdOworICAgICAgICB9CiAgICAgfV07CiB9CiAKQEAgLTI0OSw2ICsyNjksMTMg QEAgLSAodm9pZClyZXNldDooaWQpc2VuZGVyCiAgICAgW192aWV3IHBhZ2VdLT5zZXRGb2N1c2Vk RWxlbWVudFZhbHVlKFN0cmluZygpKTsKIH0KIAorLSAodm9pZClvazooaWQpc2VuZGVyCit7Cisj aWYgVVNFKFVJQ09OVEVYVE1FTlUpCisgICAgW19kYXRlVGltZUNvbnRleHRNZW51SW50ZXJhY3Rp b24gZGlzbWlzc01lbnVdOworI2VuZGlmCit9CisKIC0gKE5TU3RyaW5nICopY2FsZW5kYXJUeXBl CiB7CiAgICAgcmV0dXJuIFtfZGF0ZVBpY2tlciBjYWxlbmRhcl0uY2FsZW5kYXJJZGVudGlmaWVy Owo= 404626 2020-07-17 17:56:39 -0700 2020-07-17 18:45:30 -0700 Patch for landing bug-214195-20200717175638.patch text/plain 9026 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2IzNDBkNDQ4Yjc1Nzhm MzdlZTc0Mzg2NmI4OTE4ZDUzMzk3NDQ0Yi4uNmZkMzA2MTM1NzBjNDA2ZTQ3NTQxYWY0ZGI5ZWFi NzkzMTg5NzNlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA3LTEwICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIE9LIGJ1 dHRvbiB0byBEYXRlL1RpbWUgZm9ybSBjb250cm9scy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDE5NQorCisgICAgICAgIFJldmlld2VkIGJ5IERh cmluIEFkbGVyLgorCisgICAgICAgICogZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5nczoKKwog MjAyMC0wNy0xNiAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAg ICAgICBVc2UgQVZSb3V0ZVBpY2tlclZpZXcgd2hlbiBhdmFpbGFibGUgZm9yIGNob29zaW5nIEFp clBsYXkgZGV2aWNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA0ZDM2NDhkZDY3NjM4N2FkYTU2NjYyODczMTY2NDIz ZmRlZDNiOGQyLi40ZmU0ZmZhNjg3OTkzYjc4OGQwNzY2MDJlY2JhYzYxM2ZmMmNhOWJiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA3LTEwICBNZWdhbiBHYXJkbmVyICA8bWVnYW5f Z2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIE9LIGJ1dHRvbiB0byBEYXRlL1RpbWUg Zm9ybSBjb250cm9scy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIxNDE5NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjUwMDYwMDA+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgQWRkICdPSycgYnV0dG9uIHRv IGFkZCBjbGFyaXR5IHRvIFVJLCBhbmQgaW5jcmVhc2UgdGhlIGRlZmF1bHQgc2l6ZSBvZiB0aGUg Y29udHJvbCB0bworICAgICAgICBlbnN1cmUgc3BhY2UgZm9yIGJvdGggYnV0dG9ucy4gQWxzbyBm aXhlZCBhIGNyYXNoIHRoYXQgaGFwcGVuZWQgd2hlbiBjbG9zaW5nIHRoZSBjb250cm9sIGJlZm9y ZQorICAgICAgICB0aGUgYW5pbWF0aW9uIGNvbXBsZXRlZC4KKworICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5tbToKKyAgICAgICAgKC1bV0tEYXRl VGltZUNvbnRleHRNZW51Vmlld0NvbnRyb2xsZXIgcHJlZmVycmVkQ29udGVudFNpemVdKToKKyAg ICAgICAgKC1bV0tEYXRlVGltZVBpY2tlciBjb250ZXh0TWVudUludGVyYWN0aW9uOmNvbmZpZ3Vy YXRpb25Gb3JNZW51QXRMb2NhdGlvbjpdKToKKyAgICAgICAgKC1bV0tEYXRlVGltZVBpY2tlciBj b250ZXh0TWVudUludGVyYWN0aW9uOndpbGxEaXNwbGF5TWVudUZvckNvbmZpZ3VyYXRpb246YW5p bWF0b3I6XSk6CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNrZXIgY29udGV4dE1lbnVJbnRlcmFj dGlvbjp3aWxsRW5kRm9yQ29uZmlndXJhdGlvbjphbmltYXRvcjpdKToKKyAgICAgICAgKC1bV0tE YXRlVGltZVBpY2tlciBvazpdKToKKwogMjAyMC0wNy0xNiAgRXJpYyBDYXJsc29uICA8ZXJpYy5j YXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgQVZSb3V0ZVBpY2tlclZpZXcgd2hlbiBh dmFpbGFibGUgZm9yIGNob29zaW5nIEFpclBsYXkgZGV2aWNlcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncyBiL1NvdXJjZS9XZWJDb3JlL2Vu Lmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MKaW5kZXggNzczZDg0ZjRmMDdkNmUzN2ZhMjQ2OWEw MTUzYjE5NmNkN2MxMGE2Yi4uNTg2MDI5MGE5NWViZTE2OTAyM2ZjYWYyYmZmOGNkZDA5N2NkMDYx NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5n cworKysgYi9Tb3VyY2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCkBAIC01 NDQsNiArNTQ0LDkgQEAKIC8qIE9LIGJ1dHRvbiBsYWJlbCBpbiBkb2N1bWVudCBwYXNzd29yZCBm YWlsdXJlIGFsZXJ0ICovCiAiT0sgKGRvY3VtZW50IHBhc3N3b3JkIGZhaWx1cmUgYWxlcnQpIiA9 ICJPSyI7CiAKKy8qIFRpdGxlIG9mIHRoZSBPSyBidXR0b24gaW4gZGF0ZS90aW1lIGZvcm0gY29u dHJvbHMuICovCisiT0sgKE9LIGJ1dHRvbiB0aXRsZSBpbiBkYXRlL3RpbWUgcGlja2VyKSIgPSAi T0siOworCiAvKiBNZW51IGl0ZW0gbGFiZWwgZm9yIHRoZSB0cmFjayB0aGF0IHJlcHJlc2VudHMg ZGlzYWJsaW5nIGNsb3NlZCBjYXB0aW9ucyAqLwogIk9mZiIgPSAiT2ZmIjsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmggYi9Tb3VyY2UvV2Vi S2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaAppbmRleCA1OGM4Y2YwYjc2MmQzYzY2MWY3 YTZkZjlhNTUwODA2NzdhOGRhN2NjLi4xNzY3NTBjZmU2MTNmODRhZDQyNDUxMTlkY2NlYzg2MTRi NDdhYTMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRT UEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaApAQCAt MTE3Nyw2ICsxMTc3LDcgQEAgdHlwZWRlZiBOU19FTlVNKE5TVUludGVnZXIsIF9VSUNvbnRleHRN ZW51TGF5b3V0KSB7CiBAaW50ZXJmYWNlIFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAoKQogQHBy b3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBVSUdlc3R1cmVSZWNvZ25pemVyICpnZXN0dXJl UmVjb2duaXplckZvckZhaWx1cmVSZWxhdGlvbnNoaXBzOwogLSAodm9pZClfcHJlc2VudE1lbnVB dExvY2F0aW9uOihDR1BvaW50KWxvY2F0aW9uOworLSAodm9pZClkaXNtaXNzTWVudTsKIEBlbmQK IAogI2VuZGlmIC8vIFVTRShVSUNPTlRFWFRNRU5VKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRGF0ZVRpbWVJbnB1dENvbnRyb2wubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5tbQppbmRl eCAyYzNjZTc3YTk1MWNjYWRjMmEzY2VkYWU3NWVkMWJiZWNjMjRlNTg2Li5kMzlmMjFkMTM3NjRk MTNhNGYzMTRhZWE1NjExMjMyNWVhM2RiNDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5tbQpAQCAt MzYsNiArMzYsNyBAQAogI2ltcG9ydCA8VUlLaXQvVUlCYXJCdXR0b25JdGVtLmg+CiAjaW1wb3J0 IDxVSUtpdC9VSURhdGVQaWNrZXIuaD4KICNpbXBvcnQgPFdlYkNvcmUvTG9jYWxpemVkU3RyaW5n cy5oPgorI2ltcG9ydCA8YWxnb3JpdGhtPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogCiB1 c2luZyBuYW1lc3BhY2UgV2ViS2l0OwpAQCAtNzYsMTUgKzc3LDE3IEBAIEBpbXBsZW1lbnRhdGlv biBXS0RhdGVUaW1lQ29udGV4dE1lbnVWaWV3Q29udHJvbGxlcgogLSAoQ0dTaXplKXByZWZlcnJl ZENvbnRlbnRTaXplCiB7CiAgICAgLy8gRklYTUU6IFdvcmthcm91bmQsIHNob3VsZCBiZSBhYmxl IHRvIGJlIHJlYWRkcmVzc2VkIGFmdGVyIDxyZGFyOi8vcHJvYmxlbS82NDE0MzUzND4KLSAgICBV SVZpZXcgKnZpZXcgPSBzZWxmLnZpZXc7CisgICAgVUlWaWV3ICp2aWV3ID0gc2VsZi52aWV3LnN1 YnZpZXdzWzBdOwogICAgIGlmIChVSUVkZ2VJbnNldHNFcXVhbFRvRWRnZUluc2V0cyh2aWV3Lmxh eW91dE1hcmdpbnMsIFVJRWRnZUluc2V0c1plcm8pKSB7CiAgICAgICAgIHZpZXcudHJhbnNsYXRl c0F1dG9yZXNpemluZ01hc2tJbnRvQ29uc3RyYWludHMgPSBOTzsKICAgICAgICAgW3ZpZXcgbGF5 b3V0SWZOZWVkZWRdOwogICAgICAgICB2aWV3LnRyYW5zbGF0ZXNBdXRvcmVzaXppbmdNYXNrSW50 b0NvbnN0cmFpbnRzID0gWUVTOwogICAgICAgICB2aWV3LmxheW91dE1hcmdpbnMgPSBVSUVkZ2VJ bnNldHNNYWtlKDE2LCAxNiwgMTYsIDE2KTsKICAgICB9Ci0KLSAgICByZXR1cm4gW3ZpZXcgc3lz dGVtTGF5b3V0U2l6ZUZpdHRpbmdTaXplOlVJTGF5b3V0Rml0dGluZ0NvbXByZXNzZWRTaXplXTsK KyAgICBhdXRvIHNpemUgPSBbdmlldyBzeXN0ZW1MYXlvdXRTaXplRml0dGluZ1NpemU6VUlMYXlv dXRGaXR0aW5nQ29tcHJlc3NlZFNpemVdOworICAgIAorICAgIHNpemUud2lkdGggPSBzdGQ6Om1h eChzaXplLndpZHRoLCAyNTAuMCk7CisgICAgcmV0dXJuIHNpemU7CiB9CiAKIEBlbmQKQEAgLTE2 OCwxNSArMTcxLDMwIEBAIC0gKFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICopY29udGV4dE1l bnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0aW9uCiAgICAgICAgIFtfdmlld0Nv bnRyb2xsZXIgc2V0VmlldzpuaWxdOwogICAgICAgICBfdmlld0NvbnRyb2xsZXIgPSBhZG9wdE5T KFtbV0tEYXRlVGltZUNvbnRleHRNZW51Vmlld0NvbnRyb2xsZXIgYWxsb2NdIGluaXRdKTsKICAg ICAgICAgUmV0YWluUHRyPFVJTmF2aWdhdGlvbkNvbnRyb2xsZXI+IG5hdmlnYXRpb25Db250cm9s bGVyID0gYWRvcHROUyhbW1VJTmF2aWdhdGlvbkNvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoUm9v dFZpZXdDb250cm9sbGVyOl92aWV3Q29udHJvbGxlci5nZXQoKV0pOworICAgICAgICAKICAgICAg ICAgTlNTdHJpbmcgKnJlc2V0U3RyaW5nID0gV0VCX1VJX1NUUklOR19LRVkoIlJlc2V0IiwgIlJl c2V0IEJ1dHRvbiBEYXRlL1RpbWUgQ29udGV4dCBNZW51IiwgIlJlc2V0IGJ1dHRvbiBpbiBkYXRl IGlucHV0IGNvbnRleHQgbWVudSIpOworICAgICAgICBOU1N0cmluZyAqb2tTdHJpbmcgPSBXRUJf VUlfU1RSSU5HX0tFWSgiT0siLCAiT0sgKE9LIGJ1dHRvbiB0aXRsZSBpbiBkYXRlL3RpbWUgcGlj a2VyKSIsICJUaXRsZSBvZiB0aGUgT0sgYnV0dG9uIGluIGRhdGUvdGltZSBmb3JtIGNvbnRyb2xz LiIpOwogCisgICAgICAgIFJldGFpblB0cjxVSUJhckJ1dHRvbkl0ZW0+IG9rQmFyQnV0dG9uID0g YWRvcHROUyhbW1VJQmFyQnV0dG9uSXRlbSBhbGxvY10gaW5pdFdpdGhUaXRsZTpva1N0cmluZyBz dHlsZTpVSUJhckJ1dHRvbkl0ZW1TdHlsZURvbmUgdGFyZ2V0OnNlbGYgYWN0aW9uOkBzZWxlY3Rv cihvazopXSk7CiAgICAgICAgIFJldGFpblB0cjxVSUJhckJ1dHRvbkl0ZW0+IGJsYW5rQmFyQnV0 dG9uID0gYWRvcHROUyhbW1VJQmFyQnV0dG9uSXRlbSBhbGxvY10gaW5pdFdpdGhCYXJCdXR0b25T eXN0ZW1JdGVtOlVJQmFyQnV0dG9uU3lzdGVtSXRlbUZsZXhpYmxlU3BhY2UgdGFyZ2V0Om5pbCBh Y3Rpb246bmlsXSk7CiAgICAgICAgIFJldGFpblB0cjxVSUJhckJ1dHRvbkl0ZW0+IHJlc2V0QmFy QnV0dG9uID0gYWRvcHROUyhbW1VJQmFyQnV0dG9uSXRlbSBhbGxvY10gaW5pdFdpdGhUaXRsZTpy ZXNldFN0cmluZyBzdHlsZTpVSUJhckJ1dHRvbkl0ZW1TdHlsZVBsYWluIHRhcmdldDpzZWxmIGFj dGlvbjpAc2VsZWN0b3IocmVzZXQ6KV0pOwogICAgICAgICAKLSAgICAgICAgW192aWV3Q29udHJv bGxlciBzZXRUb29sYmFySXRlbXM6QFtibGFua0JhckJ1dHRvbi5nZXQoKSwgcmVzZXRCYXJCdXR0 b24uZ2V0KCldXTsKKyAgICAgICAgW192aWV3Q29udHJvbGxlciBzZXRUb29sYmFySXRlbXM6QFty ZXNldEJhckJ1dHRvbi5nZXQoKSwgYmxhbmtCYXJCdXR0b24uZ2V0KCksIG9rQmFyQnV0dG9uLmdl dCgpXV07CiAgICAgICAgIFtuYXZpZ2F0aW9uQ29udHJvbGxlciBzZXRUb29sYmFySGlkZGVuOk5P XTsKKyAgICAgICAgCisgICAgICAgIGF1dG8gY2VudGVyaW5nVmlldyA9IGFkb3B0TlMoW1tVSVZp ZXcgYWxsb2NdIGluaXRdKTsKKyAgICAgICAgCisgICAgICAgIFtjZW50ZXJpbmdWaWV3IGFkZFN1 YnZpZXc6X2RhdGVQaWNrZXIuZ2V0KCldOworICAgICAgICAKKyAgICAgICAgX2RhdGVQaWNrZXIu Z2V0KCkudHJhbnNsYXRlc0F1dG9yZXNpemluZ01hc2tJbnRvQ29uc3RyYWludHMgPSBOTzsKKyAg ICAgICAgYXV0byB3aWR0aENvbnN0cmFpbnQgPSBbW2NlbnRlcmluZ1ZpZXcgd2lkdGhBbmNob3Jd IGNvbnN0cmFpbnRHcmVhdGVyVGhhbk9yRXF1YWxUb0FuY2hvcjpbX2RhdGVQaWNrZXIgd2lkdGhB bmNob3JdXTsKKyAgICAgICAgYXV0byBoZWlnaHRDb25zdHJhaW50ID0gW1tjZW50ZXJpbmdWaWV3 IGhlaWdodEFuY2hvcl0gY29uc3RyYWludEVxdWFsVG9BbmNob3I6W19kYXRlUGlja2VyIGhlaWdo dEFuY2hvcl1dOworICAgICAgICBhdXRvIGhvcml6b250YWxDb25zdHJhaW50ID0gW1tjZW50ZXJp bmdWaWV3IGNlbnRlclhBbmNob3JdIGNvbnN0cmFpbnRFcXVhbFRvQW5jaG9yOltfZGF0ZVBpY2tl ciBjZW50ZXJYQW5jaG9yXV07CisgICAgICAgIGF1dG8gdmVydGljYWxDb25zdHJhaW50ID0gW1tj ZW50ZXJpbmdWaWV3IGNlbnRlcllBbmNob3JdIGNvbnN0cmFpbnRFcXVhbFRvQW5jaG9yOltfZGF0 ZVBpY2tlciBjZW50ZXJZQW5jaG9yXV07CiAKLSAgICAgICAgW192aWV3Q29udHJvbGxlciBzZXRW aWV3Ol9kYXRlUGlja2VyLmdldCgpXTsKKyAgICAgICAgW05TTGF5b3V0Q29uc3RyYWludCBhY3Rp dmF0ZUNvbnN0cmFpbnRzOkBbdmVydGljYWxDb25zdHJhaW50LCBob3Jpem9udGFsQ29uc3RyYWlu dCwgd2lkdGhDb25zdHJhaW50LCBoZWlnaHRDb25zdHJhaW50XV07CisKKyAgICAgICAgW192aWV3 Q29udHJvbGxlciBzZXRWaWV3OmNlbnRlcmluZ1ZpZXcuZ2V0KCldOwogCiAgICAgICAgIE5TU3Ry aW5nICp0aXRsZVRleHQgPSBfdmlldy5pbnB1dExhYmVsVGV4dDsKICAgICAgICAgaWYgKCFbdGl0 bGVUZXh0IGlzRXF1YWw6QCIiXSkgewpAQCAtMTkwLDEwICsyMDgsMTAgQEAgLSAoVUlDb250ZXh0 TWVudUNvbmZpZ3VyYXRpb24gKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51 SW50ZXJhY3Rpb24KICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBbbmF2aWdhdGlvbkNvbnRy b2xsZXIgc2V0TmF2aWdhdGlvbkJhckhpZGRlbjpZRVMgYW5pbWF0ZWQ6Tk9dOwogICAgICAgICAK LSAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIG5hdmlnYXRpb25CYXJdLmJhY2tncm91bmRD b2xvciA9IFVJQ29sb3IuY2xlYXJDb2xvcjsKICAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVy IG5hdmlnYXRpb25CYXJdLnRyYW5zbHVjZW50ID0gTk87Ci0gICAgICAgIFtuYXZpZ2F0aW9uQ29u dHJvbGxlciB0b29sYmFyXS5iYWNrZ3JvdW5kQ29sb3IgPSBVSUNvbG9yLmNsZWFyQ29sb3I7Cisg ICAgICAgIFtuYXZpZ2F0aW9uQ29udHJvbGxlciBuYXZpZ2F0aW9uQmFyXS5iYXJUaW50Q29sb3Ig PSBbVUlDb2xvciBzeXN0ZW1CYWNrZ3JvdW5kQ29sb3JdOwogICAgICAgICBbbmF2aWdhdGlvbkNv bnRyb2xsZXIgdG9vbGJhcl0udHJhbnNsdWNlbnQgPSBOTzsKKyAgICAgICAgW25hdmlnYXRpb25D b250cm9sbGVyIHRvb2xiYXJdLmJhclRpbnRDb2xvciA9IFtVSUNvbG9yIHN5c3RlbUJhY2tncm91 bmRDb2xvcl07CiAgICAgICAgIHJldHVybiBuYXZpZ2F0aW9uQ29udHJvbGxlci5nZXQoKTsKICAg ICB9IGFjdGlvblByb3ZpZGVyOm5pbF07CiB9CkBAIC0yMDIsNyArMjIwLDggQEAgLSAodm9pZClj b250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFj dGlvbiB3aWxsRGlzcGwKIHsKICAgICBbYW5pbWF0b3IgYWRkQ29tcGxldGlvbjpbd2Vha1NlbGYg PSBXZWFrT2JqQ1B0cjxXS0RhdGVUaW1lUGlja2VyPihzZWxmKV0gewogICAgICAgICBhdXRvIHN0 cm9uZ1NlbGYgPSB3ZWFrU2VsZi5nZXQoKTsKLSAgICAgICAgW3N0cm9uZ1NlbGYtPl92aWV3Lndl YlZpZXcgX2RpZFNob3dDb250ZXh0TWVudV07CisgICAgICAgIGlmIChzdHJvbmdTZWxmKQorICAg ICAgICAgICAgW3N0cm9uZ1NlbGYtPl92aWV3LndlYlZpZXcgX2RpZFNob3dDb250ZXh0TWVudV07 CiAgICAgfV07CiB9CiAKQEAgLTIxMCw4ICsyMjksMTAgQEAgLSAodm9pZCljb250ZXh0TWVudUlu dGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiB3aWxsRW5k Rm8KIHsKICAgICBbYW5pbWF0b3IgYWRkQ29tcGxldGlvbjpbd2Vha1NlbGYgPSBXZWFrT2JqQ1B0 cjxXS0RhdGVUaW1lUGlja2VyPihzZWxmKV0gewogICAgICAgICBhdXRvIHN0cm9uZ1NlbGYgPSB3 ZWFrU2VsZi5nZXQoKTsKLSAgICAgICAgW3N0cm9uZ1NlbGYtPl92aWV3IGFjY2Vzc29yeURvbmVd OwotICAgICAgICBbc3Ryb25nU2VsZi0+X3ZpZXcud2ViVmlldyBfZGlkRGlzbWlzc0NvbnRleHRN ZW51XTsKKyAgICAgICAgaWYgKHN0cm9uZ1NlbGYpIHsKKyAgICAgICAgICAgIFtzdHJvbmdTZWxm LT5fdmlldyBhY2Nlc3NvcnlEb25lXTsKKyAgICAgICAgICAgIFtzdHJvbmdTZWxmLT5fdmlldy53 ZWJWaWV3IF9kaWREaXNtaXNzQ29udGV4dE1lbnVdOworICAgICAgICB9CiAgICAgfV07CiB9CiAK QEAgLTI0OSw2ICsyNzAsMTMgQEAgLSAodm9pZClyZXNldDooaWQpc2VuZGVyCiAgICAgW192aWV3 IHBhZ2VdLT5zZXRGb2N1c2VkRWxlbWVudFZhbHVlKFN0cmluZygpKTsKIH0KIAorLSAodm9pZClv azooaWQpc2VuZGVyCit7CisjaWYgVVNFKFVJQ09OVEVYVE1FTlUpCisgICAgW19kYXRlVGltZUNv bnRleHRNZW51SW50ZXJhY3Rpb24gZGlzbWlzc01lbnVdOworI2VuZGlmCit9CisKIC0gKE5TU3Ry aW5nICopY2FsZW5kYXJUeXBlCiB7CiAgICAgcmV0dXJuIFtfZGF0ZVBpY2tlciBjYWxlbmRhcl0u Y2FsZW5kYXJJZGVudGlmaWVyOwo= 404627 2020-07-17 18:45:31 -0700 2020-07-20 13:49:00 -0700 Patch for landing bug-214195-20200717184531.patch text/plain 8974 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDA5NjhmNmJhNjczYmQ3 YTBkZmRhOTU2ZWJhNWJmYWUwNDQwOTUxMi4uMTg0NDMwMjVkNzYwOTRkNWJmZWU5Mzk3MTgwOTg1 YzA0NmRlZDliNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA3LTEwICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIE9LIGJ1 dHRvbiB0byBEYXRlL1RpbWUgZm9ybSBjb250cm9scy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDE5NQorCisgICAgICAgIFJldmlld2VkIGJ5IERh cmluIEFkbGVyLgorCisgICAgICAgICogZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5nczoKKwog MjAyMC0wNy0xNyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAg ICAgICBGb2xsb3d1cCB0byByMjY0NTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlhOTg2MDRmYzE2M2I0OGQ0OGUw MWFjMWIyMGViYjE5MGNhMGU5YzAuLmZiMWEyNzE1NjdlNjc0OWM1Y2VmNjM2NTgxZGYwNjRiOTk4 Yzk4MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDctMTAgIE1lZ2FuIEdhcmRu ZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgT0sgYnV0dG9uIHRv IERhdGUvVGltZSBmb3JtIGNvbnRyb2xzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MTk1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NTAwNjAw MD4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBBZGQgJ09L JyBidXR0b24gdG8gYWRkIGNsYXJpdHkgdG8gVUksIGFuZCBpbmNyZWFzZSB0aGUgZGVmYXVsdCBz aXplIG9mIHRoZSBjb250cm9sIHRvCisgICAgICAgIGVuc3VyZSBzcGFjZSBmb3IgYm90aCBidXR0 b25zLiBBbHNvIGZpeGVkIGEgY3Jhc2ggdGhhdCBoYXBwZW5lZCB3aGVuIGNsb3NpbmcgdGhlIGNv bnRyb2wgYmVmb3JlCisgICAgICAgIHRoZSBhbmltYXRpb24gY29tcGxldGVkLgorCisgICAgICAg ICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tOgorICAgICAg ICAoLVtXS0RhdGVUaW1lQ29udGV4dE1lbnVWaWV3Q29udHJvbGxlciBwcmVmZXJyZWRDb250ZW50 U2l6ZV0pOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIGNvbnRleHRNZW51SW50ZXJhY3Rp b246Y29uZmlndXJhdGlvbkZvck1lbnVBdExvY2F0aW9uOl0pOgorICAgICAgICAoLVtXS0RhdGVU aW1lUGlja2VyIGNvbnRleHRNZW51SW50ZXJhY3Rpb246d2lsbERpc3BsYXlNZW51Rm9yQ29uZmln dXJhdGlvbjphbmltYXRvcjpdKToKKyAgICAgICAgKC1bV0tEYXRlVGltZVBpY2tlciBjb250ZXh0 TWVudUludGVyYWN0aW9uOndpbGxFbmRGb3JDb25maWd1cmF0aW9uOmFuaW1hdG9yOl0pOgorICAg ICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIG9rOl0pOgorCiAyMDIwLTA3LTE3ICBMYXVybyBNb3Vy YSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIGZhc3QvZXZlbnRzL2NvbnRl eHQtYWN0aXZhdGVkLWJ5LWtleS1ldmVudC5odG1sIGlzIGNyYXNoaW5nCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzIGIvU291cmNlL1dlYkNv cmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncwppbmRleCA3NzNkODRmNGYwN2Q2ZTM3ZmEy NDY5YTAxNTNiMTk2Y2Q3YzEwYTZiLi41ODYwMjkwYTk1ZWJlMTY5MDIzZmNhZjJiZmY4Y2RkMDk3 Y2QwNjE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5z dHJpbmdzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MK QEAgLTU0NCw2ICs1NDQsOSBAQAogLyogT0sgYnV0dG9uIGxhYmVsIGluIGRvY3VtZW50IHBhc3N3 b3JkIGZhaWx1cmUgYWxlcnQgKi8KICJPSyAoZG9jdW1lbnQgcGFzc3dvcmQgZmFpbHVyZSBhbGVy dCkiID0gIk9LIjsKIAorLyogVGl0bGUgb2YgdGhlIE9LIGJ1dHRvbiBpbiBkYXRlL3RpbWUgZm9y bSBjb250cm9scy4gKi8KKyJPSyAoT0sgYnV0dG9uIHRpdGxlIGluIGRhdGUvdGltZSBwaWNrZXIp IiA9ICJPSyI7CisKIC8qIE1lbnUgaXRlbSBsYWJlbCBmb3IgdGhlIHRyYWNrIHRoYXQgcmVwcmVz ZW50cyBkaXNhYmxpbmcgY2xvc2VkIGNhcHRpb25zICovCiAiT2ZmIiA9ICJPZmYiOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaCBiL1NvdXJj ZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCmluZGV4IDU4YzhjZjBiNzYyZDNj NjYxZjdhNmRmOWE1NTA4MDY3N2E4ZGE3Y2MuLjE3Njc1MGNmZTYxM2Y4NGFkNDI0NTExOWRjY2Vj ODYxNGI0N2FhMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9V SUtpdFNQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5o CkBAIC0xMTc3LDYgKzExNzcsNyBAQCB0eXBlZGVmIE5TX0VOVU0oTlNVSW50ZWdlciwgX1VJQ29u dGV4dE1lbnVMYXlvdXQpIHsKIEBpbnRlcmZhY2UgVUlDb250ZXh0TWVudUludGVyYWN0aW9uICgp CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIFVJR2VzdHVyZVJlY29nbml6ZXIgKmdl c3R1cmVSZWNvZ25pemVyRm9yRmFpbHVyZVJlbGF0aW9uc2hpcHM7CiAtICh2b2lkKV9wcmVzZW50 TWVudUF0TG9jYXRpb246KENHUG9pbnQpbG9jYXRpb247CistICh2b2lkKWRpc21pc3NNZW51Owog QGVuZAogCiAjZW5kaWYgLy8gVVNFKFVJQ09OVEVYVE1FTlUpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1t CmluZGV4IDJjM2NlNzdhOTUxY2NhZGMyYTNjZWRhZTc1ZWQxYmJlY2MyNGU1ODYuLmQzOWYyMWQx Mzc2NGQxM2E0ZjMxNGFlYTU2MTEyMzI1ZWEzZGI0OGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1t CkBAIC0zNiw2ICszNiw3IEBACiAjaW1wb3J0IDxVSUtpdC9VSUJhckJ1dHRvbkl0ZW0uaD4KICNp bXBvcnQgPFVJS2l0L1VJRGF0ZVBpY2tlci5oPgogI2ltcG9ydCA8V2ViQ29yZS9Mb2NhbGl6ZWRT dHJpbmdzLmg+CisjaW1wb3J0IDxhbGdvcml0aG0+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+ CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CkBAIC03NiwxNSArNzcsMTcgQEAgQGltcGxlbWVu dGF0aW9uIFdLRGF0ZVRpbWVDb250ZXh0TWVudVZpZXdDb250cm9sbGVyCiAtIChDR1NpemUpcHJl ZmVycmVkQ29udGVudFNpemUKIHsKICAgICAvLyBGSVhNRTogV29ya2Fyb3VuZCwgc2hvdWxkIGJl IGFibGUgdG8gYmUgcmVhZGRyZXNzZWQgYWZ0ZXIgPHJkYXI6Ly9wcm9ibGVtLzY0MTQzNTM0Pgot ICAgIFVJVmlldyAqdmlldyA9IHNlbGYudmlldzsKKyAgICBVSVZpZXcgKnZpZXcgPSBzZWxmLnZp ZXcuc3Vidmlld3NbMF07CiAgICAgaWYgKFVJRWRnZUluc2V0c0VxdWFsVG9FZGdlSW5zZXRzKHZp ZXcubGF5b3V0TWFyZ2lucywgVUlFZGdlSW5zZXRzWmVybykpIHsKICAgICAgICAgdmlldy50cmFu c2xhdGVzQXV0b3Jlc2l6aW5nTWFza0ludG9Db25zdHJhaW50cyA9IE5POwogICAgICAgICBbdmll dyBsYXlvdXRJZk5lZWRlZF07CiAgICAgICAgIHZpZXcudHJhbnNsYXRlc0F1dG9yZXNpemluZ01h c2tJbnRvQ29uc3RyYWludHMgPSBZRVM7CiAgICAgICAgIHZpZXcubGF5b3V0TWFyZ2lucyA9IFVJ RWRnZUluc2V0c01ha2UoMTYsIDE2LCAxNiwgMTYpOwogICAgIH0KLQotICAgIHJldHVybiBbdmll dyBzeXN0ZW1MYXlvdXRTaXplRml0dGluZ1NpemU6VUlMYXlvdXRGaXR0aW5nQ29tcHJlc3NlZFNp emVdOworICAgIGF1dG8gc2l6ZSA9IFt2aWV3IHN5c3RlbUxheW91dFNpemVGaXR0aW5nU2l6ZTpV SUxheW91dEZpdHRpbmdDb21wcmVzc2VkU2l6ZV07CisgICAgCisgICAgc2l6ZS53aWR0aCA9IHN0 ZDo6bWF4KHNpemUud2lkdGgsIDI1MC4wKTsKKyAgICByZXR1cm4gc2l6ZTsKIH0KIAogQGVuZApA QCAtMTY4LDE1ICsxNzEsMzAgQEAgLSAoVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb250 ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24KICAgICAgICAgW192 aWV3Q29udHJvbGxlciBzZXRWaWV3Om5pbF07CiAgICAgICAgIF92aWV3Q29udHJvbGxlciA9IGFk b3B0TlMoW1tXS0RhdGVUaW1lQ29udGV4dE1lbnVWaWV3Q29udHJvbGxlciBhbGxvY10gaW5pdF0p OwogICAgICAgICBSZXRhaW5QdHI8VUlOYXZpZ2F0aW9uQ29udHJvbGxlcj4gbmF2aWdhdGlvbkNv bnRyb2xsZXIgPSBhZG9wdE5TKFtbVUlOYXZpZ2F0aW9uQ29udHJvbGxlciBhbGxvY10gaW5pdFdp dGhSb290Vmlld0NvbnRyb2xsZXI6X3ZpZXdDb250cm9sbGVyLmdldCgpXSk7CisgICAgICAgIAog ICAgICAgICBOU1N0cmluZyAqcmVzZXRTdHJpbmcgPSBXRUJfVUlfU1RSSU5HX0tFWSgiUmVzZXQi LCAiUmVzZXQgQnV0dG9uIERhdGUvVGltZSBDb250ZXh0IE1lbnUiLCAiUmVzZXQgYnV0dG9uIGlu IGRhdGUgaW5wdXQgY29udGV4dCBtZW51Iik7CisgICAgICAgIE5TU3RyaW5nICpva1N0cmluZyA9 IFdFQl9VSV9TVFJJTkdfS0VZKCJPSyIsICJPSyAoT0sgYnV0dG9uIHRpdGxlIGluIGRhdGUvdGlt ZSBwaWNrZXIpIiwgIlRpdGxlIG9mIHRoZSBPSyBidXR0b24gaW4gZGF0ZS90aW1lIGZvcm0gY29u dHJvbHMuIik7CiAKKyAgICAgICAgUmV0YWluUHRyPFVJQmFyQnV0dG9uSXRlbT4gb2tCYXJCdXR0 b24gPSBhZG9wdE5TKFtbVUlCYXJCdXR0b25JdGVtIGFsbG9jXSBpbml0V2l0aFRpdGxlOm9rU3Ry aW5nIHN0eWxlOlVJQmFyQnV0dG9uSXRlbVN0eWxlRG9uZSB0YXJnZXQ6c2VsZiBhY3Rpb246QHNl bGVjdG9yKG9rOildKTsKICAgICAgICAgUmV0YWluUHRyPFVJQmFyQnV0dG9uSXRlbT4gYmxhbmtC YXJCdXR0b24gPSBhZG9wdE5TKFtbVUlCYXJCdXR0b25JdGVtIGFsbG9jXSBpbml0V2l0aEJhckJ1 dHRvblN5c3RlbUl0ZW06VUlCYXJCdXR0b25TeXN0ZW1JdGVtRmxleGlibGVTcGFjZSB0YXJnZXQ6 bmlsIGFjdGlvbjpuaWxdKTsKICAgICAgICAgUmV0YWluUHRyPFVJQmFyQnV0dG9uSXRlbT4gcmVz ZXRCYXJCdXR0b24gPSBhZG9wdE5TKFtbVUlCYXJCdXR0b25JdGVtIGFsbG9jXSBpbml0V2l0aFRp dGxlOnJlc2V0U3RyaW5nIHN0eWxlOlVJQmFyQnV0dG9uSXRlbVN0eWxlUGxhaW4gdGFyZ2V0OnNl bGYgYWN0aW9uOkBzZWxlY3RvcihyZXNldDopXSk7CiAgICAgICAgIAotICAgICAgICBbX3ZpZXdD b250cm9sbGVyIHNldFRvb2xiYXJJdGVtczpAW2JsYW5rQmFyQnV0dG9uLmdldCgpLCByZXNldEJh ckJ1dHRvbi5nZXQoKV1dOworICAgICAgICBbX3ZpZXdDb250cm9sbGVyIHNldFRvb2xiYXJJdGVt czpAW3Jlc2V0QmFyQnV0dG9uLmdldCgpLCBibGFua0JhckJ1dHRvbi5nZXQoKSwgb2tCYXJCdXR0 b24uZ2V0KCldXTsKICAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIHNldFRvb2xiYXJIaWRk ZW46Tk9dOworICAgICAgICAKKyAgICAgICAgYXV0byBjZW50ZXJpbmdWaWV3ID0gYWRvcHROUyhb W1VJVmlldyBhbGxvY10gaW5pdF0pOworICAgICAgICAKKyAgICAgICAgW2NlbnRlcmluZ1ZpZXcg YWRkU3VidmlldzpfZGF0ZVBpY2tlci5nZXQoKV07CisgICAgICAgIAorICAgICAgICBfZGF0ZVBp Y2tlci5nZXQoKS50cmFuc2xhdGVzQXV0b3Jlc2l6aW5nTWFza0ludG9Db25zdHJhaW50cyA9IE5P OworICAgICAgICBhdXRvIHdpZHRoQ29uc3RyYWludCA9IFtbY2VudGVyaW5nVmlldyB3aWR0aEFu Y2hvcl0gY29uc3RyYWludEdyZWF0ZXJUaGFuT3JFcXVhbFRvQW5jaG9yOltfZGF0ZVBpY2tlciB3 aWR0aEFuY2hvcl1dOworICAgICAgICBhdXRvIGhlaWdodENvbnN0cmFpbnQgPSBbW2NlbnRlcmlu Z1ZpZXcgaGVpZ2h0QW5jaG9yXSBjb25zdHJhaW50RXF1YWxUb0FuY2hvcjpbX2RhdGVQaWNrZXIg aGVpZ2h0QW5jaG9yXV07CisgICAgICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnQgPSBbW2Nl bnRlcmluZ1ZpZXcgY2VudGVyWEFuY2hvcl0gY29uc3RyYWludEVxdWFsVG9BbmNob3I6W19kYXRl UGlja2VyIGNlbnRlclhBbmNob3JdXTsKKyAgICAgICAgYXV0byB2ZXJ0aWNhbENvbnN0cmFpbnQg PSBbW2NlbnRlcmluZ1ZpZXcgY2VudGVyWUFuY2hvcl0gY29uc3RyYWludEVxdWFsVG9BbmNob3I6 W19kYXRlUGlja2VyIGNlbnRlcllBbmNob3JdXTsKIAotICAgICAgICBbX3ZpZXdDb250cm9sbGVy IHNldFZpZXc6X2RhdGVQaWNrZXIuZ2V0KCldOworICAgICAgICBbTlNMYXlvdXRDb25zdHJhaW50 IGFjdGl2YXRlQ29uc3RyYWludHM6QFt2ZXJ0aWNhbENvbnN0cmFpbnQsIGhvcml6b250YWxDb25z dHJhaW50LCB3aWR0aENvbnN0cmFpbnQsIGhlaWdodENvbnN0cmFpbnRdXTsKKworICAgICAgICBb X3ZpZXdDb250cm9sbGVyIHNldFZpZXc6Y2VudGVyaW5nVmlldy5nZXQoKV07CiAKICAgICAgICAg TlNTdHJpbmcgKnRpdGxlVGV4dCA9IF92aWV3LmlucHV0TGFiZWxUZXh0OwogICAgICAgICBpZiAo IVt0aXRsZVRleHQgaXNFcXVhbDpAIiJdKSB7CkBAIC0xOTAsMTAgKzIwOCwxMCBAQCAtIChVSUNv bnRleHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4 dE1lbnVJbnRlcmFjdGlvbgogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIFtuYXZpZ2F0aW9u Q29udHJvbGxlciBzZXROYXZpZ2F0aW9uQmFySGlkZGVuOllFUyBhbmltYXRlZDpOT107CiAgICAg ICAgIAotICAgICAgICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIgbmF2aWdhdGlvbkJhcl0uYmFja2dy b3VuZENvbG9yID0gVUlDb2xvci5jbGVhckNvbG9yOwogICAgICAgICBbbmF2aWdhdGlvbkNvbnRy b2xsZXIgbmF2aWdhdGlvbkJhcl0udHJhbnNsdWNlbnQgPSBOTzsKLSAgICAgICAgW25hdmlnYXRp b25Db250cm9sbGVyIHRvb2xiYXJdLmJhY2tncm91bmRDb2xvciA9IFVJQ29sb3IuY2xlYXJDb2xv cjsKKyAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIG5hdmlnYXRpb25CYXJdLmJhclRpbnRD b2xvciA9IFtVSUNvbG9yIHN5c3RlbUJhY2tncm91bmRDb2xvcl07CiAgICAgICAgIFtuYXZpZ2F0 aW9uQ29udHJvbGxlciB0b29sYmFyXS50cmFuc2x1Y2VudCA9IE5POworICAgICAgICBbbmF2aWdh dGlvbkNvbnRyb2xsZXIgdG9vbGJhcl0uYmFyVGludENvbG9yID0gW1VJQ29sb3Igc3lzdGVtQmFj a2dyb3VuZENvbG9yXTsKICAgICAgICAgcmV0dXJuIG5hdmlnYXRpb25Db250cm9sbGVyLmdldCgp OwogICAgIH0gYWN0aW9uUHJvdmlkZXI6bmlsXTsKIH0KQEAgLTIwMiw3ICsyMjAsOCBAQCAtICh2 b2lkKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWlu dGVyYWN0aW9uIHdpbGxEaXNwbAogewogICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOlt3ZWFr U2VsZiA9IFdlYWtPYmpDUHRyPFdLRGF0ZVRpbWVQaWNrZXI+KHNlbGYpXSB7CiAgICAgICAgIGF1 dG8gc3Ryb25nU2VsZiA9IHdlYWtTZWxmLmdldCgpOwotICAgICAgICBbc3Ryb25nU2VsZi0+X3Zp ZXcud2ViVmlldyBfZGlkU2hvd0NvbnRleHRNZW51XTsKKyAgICAgICAgaWYgKHN0cm9uZ1NlbGYp CisgICAgICAgICAgICBbc3Ryb25nU2VsZi0+X3ZpZXcud2ViVmlldyBfZGlkU2hvd0NvbnRleHRN ZW51XTsKICAgICB9XTsKIH0KIApAQCAtMjEwLDggKzIyOSwxMCBAQCAtICh2b2lkKWNvbnRleHRN ZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHdp bGxFbmRGbwogewogICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOlt3ZWFrU2VsZiA9IFdlYWtP YmpDUHRyPFdLRGF0ZVRpbWVQaWNrZXI+KHNlbGYpXSB7CiAgICAgICAgIGF1dG8gc3Ryb25nU2Vs ZiA9IHdlYWtTZWxmLmdldCgpOwotICAgICAgICBbc3Ryb25nU2VsZi0+X3ZpZXcgYWNjZXNzb3J5 RG9uZV07Ci0gICAgICAgIFtzdHJvbmdTZWxmLT5fdmlldy53ZWJWaWV3IF9kaWREaXNtaXNzQ29u dGV4dE1lbnVdOworICAgICAgICBpZiAoc3Ryb25nU2VsZikgeworICAgICAgICAgICAgW3N0cm9u Z1NlbGYtPl92aWV3IGFjY2Vzc29yeURvbmVdOworICAgICAgICAgICAgW3N0cm9uZ1NlbGYtPl92 aWV3LndlYlZpZXcgX2RpZERpc21pc3NDb250ZXh0TWVudV07CisgICAgICAgIH0KICAgICB9XTsK IH0KIApAQCAtMjQ5LDYgKzI3MCwxMyBAQCAtICh2b2lkKXJlc2V0OihpZClzZW5kZXIKICAgICBb X3ZpZXcgcGFnZV0tPnNldEZvY3VzZWRFbGVtZW50VmFsdWUoU3RyaW5nKCkpOwogfQogCistICh2 b2lkKW9rOihpZClzZW5kZXIKK3sKKyNpZiBVU0UoVUlDT05URVhUTUVOVSkKKyAgICBbX2RhdGVU aW1lQ29udGV4dE1lbnVJbnRlcmFjdGlvbiBkaXNtaXNzTWVudV07CisjZW5kaWYKK30KKwogLSAo TlNTdHJpbmcgKiljYWxlbmRhclR5cGUKIHsKICAgICByZXR1cm4gW19kYXRlUGlja2VyIGNhbGVu ZGFyXS5jYWxlbmRhcklkZW50aWZpZXI7Cg== 404755 2020-07-20 13:49:02 -0700 2020-07-20 15:52:37 -0700 Patch bug-214195-20200720134901.patch text/plain 8983 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDA5NjhmNmJhNjczYmQ3 YTBkZmRhOTU2ZWJhNWJmYWUwNDQwOTUxMi4uMTg0NDMwMjVkNzYwOTRkNWJmZWU5Mzk3MTgwOTg1 YzA0NmRlZDliNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA3LTEwICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIE9LIGJ1 dHRvbiB0byBEYXRlL1RpbWUgZm9ybSBjb250cm9scy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDE5NQorCisgICAgICAgIFJldmlld2VkIGJ5IERh cmluIEFkbGVyLgorCisgICAgICAgICogZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5nczoKKwog MjAyMC0wNy0xNyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAg ICAgICBGb2xsb3d1cCB0byByMjY0NTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlhOTg2MDRmYzE2M2I0OGQ0OGUw MWFjMWIyMGViYjE5MGNhMGU5YzAuLmZiMWEyNzE1NjdlNjc0OWM1Y2VmNjM2NTgxZGYwNjRiOTk4 Yzk4MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDctMTAgIE1lZ2FuIEdhcmRu ZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgT0sgYnV0dG9uIHRv IERhdGUvVGltZSBmb3JtIGNvbnRyb2xzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MTk1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NTAwNjAw MD4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBBZGQgJ09L JyBidXR0b24gdG8gYWRkIGNsYXJpdHkgdG8gVUksIGFuZCBpbmNyZWFzZSB0aGUgZGVmYXVsdCBz aXplIG9mIHRoZSBjb250cm9sIHRvCisgICAgICAgIGVuc3VyZSBzcGFjZSBmb3IgYm90aCBidXR0 b25zLiBBbHNvIGZpeGVkIGEgY3Jhc2ggdGhhdCBoYXBwZW5lZCB3aGVuIGNsb3NpbmcgdGhlIGNv bnRyb2wgYmVmb3JlCisgICAgICAgIHRoZSBhbmltYXRpb24gY29tcGxldGVkLgorCisgICAgICAg ICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tOgorICAgICAg ICAoLVtXS0RhdGVUaW1lQ29udGV4dE1lbnVWaWV3Q29udHJvbGxlciBwcmVmZXJyZWRDb250ZW50 U2l6ZV0pOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIGNvbnRleHRNZW51SW50ZXJhY3Rp b246Y29uZmlndXJhdGlvbkZvck1lbnVBdExvY2F0aW9uOl0pOgorICAgICAgICAoLVtXS0RhdGVU aW1lUGlja2VyIGNvbnRleHRNZW51SW50ZXJhY3Rpb246d2lsbERpc3BsYXlNZW51Rm9yQ29uZmln dXJhdGlvbjphbmltYXRvcjpdKToKKyAgICAgICAgKC1bV0tEYXRlVGltZVBpY2tlciBjb250ZXh0 TWVudUludGVyYWN0aW9uOndpbGxFbmRGb3JDb25maWd1cmF0aW9uOmFuaW1hdG9yOl0pOgorICAg ICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIG9rOl0pOgorCiAyMDIwLTA3LTE3ICBMYXVybyBNb3Vy YSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIGZhc3QvZXZlbnRzL2NvbnRl eHQtYWN0aXZhdGVkLWJ5LWtleS1ldmVudC5odG1sIGlzIGNyYXNoaW5nCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzIGIvU291cmNlL1dlYkNv cmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncwppbmRleCA3NzNkODRmNGYwN2Q2ZTM3ZmEy NDY5YTAxNTNiMTk2Y2Q3YzEwYTZiLi41ODYwMjkwYTk1ZWJlMTY5MDIzZmNhZjJiZmY4Y2RkMDk3 Y2QwNjE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5z dHJpbmdzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MK QEAgLTU0NCw2ICs1NDQsOSBAQAogLyogT0sgYnV0dG9uIGxhYmVsIGluIGRvY3VtZW50IHBhc3N3 b3JkIGZhaWx1cmUgYWxlcnQgKi8KICJPSyAoZG9jdW1lbnQgcGFzc3dvcmQgZmFpbHVyZSBhbGVy dCkiID0gIk9LIjsKIAorLyogVGl0bGUgb2YgdGhlIE9LIGJ1dHRvbiBpbiBkYXRlL3RpbWUgZm9y bSBjb250cm9scy4gKi8KKyJPSyAoT0sgYnV0dG9uIHRpdGxlIGluIGRhdGUvdGltZSBwaWNrZXIp IiA9ICJPSyI7CisKIC8qIE1lbnUgaXRlbSBsYWJlbCBmb3IgdGhlIHRyYWNrIHRoYXQgcmVwcmVz ZW50cyBkaXNhYmxpbmcgY2xvc2VkIGNhcHRpb25zICovCiAiT2ZmIiA9ICJPZmYiOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaCBiL1NvdXJj ZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCmluZGV4IDU4YzhjZjBiNzYyZDNj NjYxZjdhNmRmOWE1NTA4MDY3N2E4ZGE3Y2MuLjE3Njc1MGNmZTYxM2Y4NGFkNDI0NTExOWRjY2Vj ODYxNGI0N2FhMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9V SUtpdFNQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5o CkBAIC0xMTc3LDYgKzExNzcsNyBAQCB0eXBlZGVmIE5TX0VOVU0oTlNVSW50ZWdlciwgX1VJQ29u dGV4dE1lbnVMYXlvdXQpIHsKIEBpbnRlcmZhY2UgVUlDb250ZXh0TWVudUludGVyYWN0aW9uICgp CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIFVJR2VzdHVyZVJlY29nbml6ZXIgKmdl c3R1cmVSZWNvZ25pemVyRm9yRmFpbHVyZVJlbGF0aW9uc2hpcHM7CiAtICh2b2lkKV9wcmVzZW50 TWVudUF0TG9jYXRpb246KENHUG9pbnQpbG9jYXRpb247CistICh2b2lkKWRpc21pc3NNZW51Owog QGVuZAogCiAjZW5kaWYgLy8gVVNFKFVJQ09OVEVYVE1FTlUpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1t CmluZGV4IDJjM2NlNzdhOTUxY2NhZGMyYTNjZWRhZTc1ZWQxYmJlY2MyNGU1ODYuLmRlNjYzZmRm NjJmMmI3OTdlMTQ1M2E2ZGM4ZGFmNWI4MmI0Njc1NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1t CkBAIC0zNiw2ICszNiw3IEBACiAjaW1wb3J0IDxVSUtpdC9VSUJhckJ1dHRvbkl0ZW0uaD4KICNp bXBvcnQgPFVJS2l0L1VJRGF0ZVBpY2tlci5oPgogI2ltcG9ydCA8V2ViQ29yZS9Mb2NhbGl6ZWRT dHJpbmdzLmg+CisjaW1wb3J0IDxhbGdvcml0aG0+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+ CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CkBAIC03NiwxNSArNzcsMTcgQEAgQGltcGxlbWVu dGF0aW9uIFdLRGF0ZVRpbWVDb250ZXh0TWVudVZpZXdDb250cm9sbGVyCiAtIChDR1NpemUpcHJl ZmVycmVkQ29udGVudFNpemUKIHsKICAgICAvLyBGSVhNRTogV29ya2Fyb3VuZCwgc2hvdWxkIGJl IGFibGUgdG8gYmUgcmVhZGRyZXNzZWQgYWZ0ZXIgPHJkYXI6Ly9wcm9ibGVtLzY0MTQzNTM0Pgot ICAgIFVJVmlldyAqdmlldyA9IHNlbGYudmlldzsKKyAgICBVSVZpZXcgKnZpZXcgPSBzZWxmLnZp ZXcuc3Vidmlld3NbMF07CiAgICAgaWYgKFVJRWRnZUluc2V0c0VxdWFsVG9FZGdlSW5zZXRzKHZp ZXcubGF5b3V0TWFyZ2lucywgVUlFZGdlSW5zZXRzWmVybykpIHsKICAgICAgICAgdmlldy50cmFu c2xhdGVzQXV0b3Jlc2l6aW5nTWFza0ludG9Db25zdHJhaW50cyA9IE5POwogICAgICAgICBbdmll dyBsYXlvdXRJZk5lZWRlZF07CiAgICAgICAgIHZpZXcudHJhbnNsYXRlc0F1dG9yZXNpemluZ01h c2tJbnRvQ29uc3RyYWludHMgPSBZRVM7CiAgICAgICAgIHZpZXcubGF5b3V0TWFyZ2lucyA9IFVJ RWRnZUluc2V0c01ha2UoMTYsIDE2LCAxNiwgMTYpOwogICAgIH0KLQotICAgIHJldHVybiBbdmll dyBzeXN0ZW1MYXlvdXRTaXplRml0dGluZ1NpemU6VUlMYXlvdXRGaXR0aW5nQ29tcHJlc3NlZFNp emVdOworICAgIGF1dG8gc2l6ZSA9IFt2aWV3IHN5c3RlbUxheW91dFNpemVGaXR0aW5nU2l6ZTpV SUxheW91dEZpdHRpbmdDb21wcmVzc2VkU2l6ZV07CisgICAgCisgICAgc2l6ZS53aWR0aCA9IHN0 ZDo6bWF4PENHRmxvYXQ+KHNpemUud2lkdGgsIDI1MC4wKTsKKyAgICByZXR1cm4gc2l6ZTsKIH0K IAogQGVuZApAQCAtMTY4LDE1ICsxNzEsMzAgQEAgLSAoVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRp b24gKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24KICAg ICAgICAgW192aWV3Q29udHJvbGxlciBzZXRWaWV3Om5pbF07CiAgICAgICAgIF92aWV3Q29udHJv bGxlciA9IGFkb3B0TlMoW1tXS0RhdGVUaW1lQ29udGV4dE1lbnVWaWV3Q29udHJvbGxlciBhbGxv Y10gaW5pdF0pOwogICAgICAgICBSZXRhaW5QdHI8VUlOYXZpZ2F0aW9uQ29udHJvbGxlcj4gbmF2 aWdhdGlvbkNvbnRyb2xsZXIgPSBhZG9wdE5TKFtbVUlOYXZpZ2F0aW9uQ29udHJvbGxlciBhbGxv Y10gaW5pdFdpdGhSb290Vmlld0NvbnRyb2xsZXI6X3ZpZXdDb250cm9sbGVyLmdldCgpXSk7Cisg ICAgICAgIAogICAgICAgICBOU1N0cmluZyAqcmVzZXRTdHJpbmcgPSBXRUJfVUlfU1RSSU5HX0tF WSgiUmVzZXQiLCAiUmVzZXQgQnV0dG9uIERhdGUvVGltZSBDb250ZXh0IE1lbnUiLCAiUmVzZXQg YnV0dG9uIGluIGRhdGUgaW5wdXQgY29udGV4dCBtZW51Iik7CisgICAgICAgIE5TU3RyaW5nICpv a1N0cmluZyA9IFdFQl9VSV9TVFJJTkdfS0VZKCJPSyIsICJPSyAoT0sgYnV0dG9uIHRpdGxlIGlu IGRhdGUvdGltZSBwaWNrZXIpIiwgIlRpdGxlIG9mIHRoZSBPSyBidXR0b24gaW4gZGF0ZS90aW1l IGZvcm0gY29udHJvbHMuIik7CiAKKyAgICAgICAgUmV0YWluUHRyPFVJQmFyQnV0dG9uSXRlbT4g b2tCYXJCdXR0b24gPSBhZG9wdE5TKFtbVUlCYXJCdXR0b25JdGVtIGFsbG9jXSBpbml0V2l0aFRp dGxlOm9rU3RyaW5nIHN0eWxlOlVJQmFyQnV0dG9uSXRlbVN0eWxlRG9uZSB0YXJnZXQ6c2VsZiBh Y3Rpb246QHNlbGVjdG9yKG9rOildKTsKICAgICAgICAgUmV0YWluUHRyPFVJQmFyQnV0dG9uSXRl bT4gYmxhbmtCYXJCdXR0b24gPSBhZG9wdE5TKFtbVUlCYXJCdXR0b25JdGVtIGFsbG9jXSBpbml0 V2l0aEJhckJ1dHRvblN5c3RlbUl0ZW06VUlCYXJCdXR0b25TeXN0ZW1JdGVtRmxleGlibGVTcGFj ZSB0YXJnZXQ6bmlsIGFjdGlvbjpuaWxdKTsKICAgICAgICAgUmV0YWluUHRyPFVJQmFyQnV0dG9u SXRlbT4gcmVzZXRCYXJCdXR0b24gPSBhZG9wdE5TKFtbVUlCYXJCdXR0b25JdGVtIGFsbG9jXSBp bml0V2l0aFRpdGxlOnJlc2V0U3RyaW5nIHN0eWxlOlVJQmFyQnV0dG9uSXRlbVN0eWxlUGxhaW4g dGFyZ2V0OnNlbGYgYWN0aW9uOkBzZWxlY3RvcihyZXNldDopXSk7CiAgICAgICAgIAotICAgICAg ICBbX3ZpZXdDb250cm9sbGVyIHNldFRvb2xiYXJJdGVtczpAW2JsYW5rQmFyQnV0dG9uLmdldCgp LCByZXNldEJhckJ1dHRvbi5nZXQoKV1dOworICAgICAgICBbX3ZpZXdDb250cm9sbGVyIHNldFRv b2xiYXJJdGVtczpAW3Jlc2V0QmFyQnV0dG9uLmdldCgpLCBibGFua0JhckJ1dHRvbi5nZXQoKSwg b2tCYXJCdXR0b24uZ2V0KCldXTsKICAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIHNldFRv b2xiYXJIaWRkZW46Tk9dOworICAgICAgICAKKyAgICAgICAgYXV0byBjZW50ZXJpbmdWaWV3ID0g YWRvcHROUyhbW1VJVmlldyBhbGxvY10gaW5pdF0pOworICAgICAgICAKKyAgICAgICAgW2NlbnRl cmluZ1ZpZXcgYWRkU3VidmlldzpfZGF0ZVBpY2tlci5nZXQoKV07CisgICAgICAgIAorICAgICAg ICBfZGF0ZVBpY2tlci5nZXQoKS50cmFuc2xhdGVzQXV0b3Jlc2l6aW5nTWFza0ludG9Db25zdHJh aW50cyA9IE5POworICAgICAgICBhdXRvIHdpZHRoQ29uc3RyYWludCA9IFtbY2VudGVyaW5nVmll dyB3aWR0aEFuY2hvcl0gY29uc3RyYWludEdyZWF0ZXJUaGFuT3JFcXVhbFRvQW5jaG9yOltfZGF0 ZVBpY2tlciB3aWR0aEFuY2hvcl1dOworICAgICAgICBhdXRvIGhlaWdodENvbnN0cmFpbnQgPSBb W2NlbnRlcmluZ1ZpZXcgaGVpZ2h0QW5jaG9yXSBjb25zdHJhaW50RXF1YWxUb0FuY2hvcjpbX2Rh dGVQaWNrZXIgaGVpZ2h0QW5jaG9yXV07CisgICAgICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFp bnQgPSBbW2NlbnRlcmluZ1ZpZXcgY2VudGVyWEFuY2hvcl0gY29uc3RyYWludEVxdWFsVG9BbmNo b3I6W19kYXRlUGlja2VyIGNlbnRlclhBbmNob3JdXTsKKyAgICAgICAgYXV0byB2ZXJ0aWNhbENv bnN0cmFpbnQgPSBbW2NlbnRlcmluZ1ZpZXcgY2VudGVyWUFuY2hvcl0gY29uc3RyYWludEVxdWFs VG9BbmNob3I6W19kYXRlUGlja2VyIGNlbnRlcllBbmNob3JdXTsKIAotICAgICAgICBbX3ZpZXdD b250cm9sbGVyIHNldFZpZXc6X2RhdGVQaWNrZXIuZ2V0KCldOworICAgICAgICBbTlNMYXlvdXRD b25zdHJhaW50IGFjdGl2YXRlQ29uc3RyYWludHM6QFt2ZXJ0aWNhbENvbnN0cmFpbnQsIGhvcml6 b250YWxDb25zdHJhaW50LCB3aWR0aENvbnN0cmFpbnQsIGhlaWdodENvbnN0cmFpbnRdXTsKKwor ICAgICAgICBbX3ZpZXdDb250cm9sbGVyIHNldFZpZXc6Y2VudGVyaW5nVmlldy5nZXQoKV07CiAK ICAgICAgICAgTlNTdHJpbmcgKnRpdGxlVGV4dCA9IF92aWV3LmlucHV0TGFiZWxUZXh0OwogICAg ICAgICBpZiAoIVt0aXRsZVRleHQgaXNFcXVhbDpAIiJdKSB7CkBAIC0xOTAsMTAgKzIwOCwxMCBA QCAtIChVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbnRleHRNZW51SW50ZXJhY3Rpb246 KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbgogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIFtu YXZpZ2F0aW9uQ29udHJvbGxlciBzZXROYXZpZ2F0aW9uQmFySGlkZGVuOllFUyBhbmltYXRlZDpO T107CiAgICAgICAgIAotICAgICAgICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIgbmF2aWdhdGlvbkJh cl0uYmFja2dyb3VuZENvbG9yID0gVUlDb2xvci5jbGVhckNvbG9yOwogICAgICAgICBbbmF2aWdh dGlvbkNvbnRyb2xsZXIgbmF2aWdhdGlvbkJhcl0udHJhbnNsdWNlbnQgPSBOTzsKLSAgICAgICAg W25hdmlnYXRpb25Db250cm9sbGVyIHRvb2xiYXJdLmJhY2tncm91bmRDb2xvciA9IFVJQ29sb3Iu Y2xlYXJDb2xvcjsKKyAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIG5hdmlnYXRpb25CYXJd LmJhclRpbnRDb2xvciA9IFtVSUNvbG9yIHN5c3RlbUJhY2tncm91bmRDb2xvcl07CiAgICAgICAg IFtuYXZpZ2F0aW9uQ29udHJvbGxlciB0b29sYmFyXS50cmFuc2x1Y2VudCA9IE5POworICAgICAg ICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIgdG9vbGJhcl0uYmFyVGludENvbG9yID0gW1VJQ29sb3Ig c3lzdGVtQmFja2dyb3VuZENvbG9yXTsKICAgICAgICAgcmV0dXJuIG5hdmlnYXRpb25Db250cm9s bGVyLmdldCgpOwogICAgIH0gYWN0aW9uUHJvdmlkZXI6bmlsXTsKIH0KQEAgLTIwMiw3ICsyMjAs OCBAQCAtICh2b2lkKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFj dGlvbiAqKWludGVyYWN0aW9uIHdpbGxEaXNwbAogewogICAgIFthbmltYXRvciBhZGRDb21wbGV0 aW9uOlt3ZWFrU2VsZiA9IFdlYWtPYmpDUHRyPFdLRGF0ZVRpbWVQaWNrZXI+KHNlbGYpXSB7CiAg ICAgICAgIGF1dG8gc3Ryb25nU2VsZiA9IHdlYWtTZWxmLmdldCgpOwotICAgICAgICBbc3Ryb25n U2VsZi0+X3ZpZXcud2ViVmlldyBfZGlkU2hvd0NvbnRleHRNZW51XTsKKyAgICAgICAgaWYgKHN0 cm9uZ1NlbGYpCisgICAgICAgICAgICBbc3Ryb25nU2VsZi0+X3ZpZXcud2ViVmlldyBfZGlkU2hv d0NvbnRleHRNZW51XTsKICAgICB9XTsKIH0KIApAQCAtMjEwLDggKzIyOSwxMCBAQCAtICh2b2lk KWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVy YWN0aW9uIHdpbGxFbmRGbwogewogICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOlt3ZWFrU2Vs ZiA9IFdlYWtPYmpDUHRyPFdLRGF0ZVRpbWVQaWNrZXI+KHNlbGYpXSB7CiAgICAgICAgIGF1dG8g c3Ryb25nU2VsZiA9IHdlYWtTZWxmLmdldCgpOwotICAgICAgICBbc3Ryb25nU2VsZi0+X3ZpZXcg YWNjZXNzb3J5RG9uZV07Ci0gICAgICAgIFtzdHJvbmdTZWxmLT5fdmlldy53ZWJWaWV3IF9kaWRE aXNtaXNzQ29udGV4dE1lbnVdOworICAgICAgICBpZiAoc3Ryb25nU2VsZikgeworICAgICAgICAg ICAgW3N0cm9uZ1NlbGYtPl92aWV3IGFjY2Vzc29yeURvbmVdOworICAgICAgICAgICAgW3N0cm9u Z1NlbGYtPl92aWV3LndlYlZpZXcgX2RpZERpc21pc3NDb250ZXh0TWVudV07CisgICAgICAgIH0K ICAgICB9XTsKIH0KIApAQCAtMjQ5LDYgKzI3MCwxMyBAQCAtICh2b2lkKXJlc2V0OihpZClzZW5k ZXIKICAgICBbX3ZpZXcgcGFnZV0tPnNldEZvY3VzZWRFbGVtZW50VmFsdWUoU3RyaW5nKCkpOwog fQogCistICh2b2lkKW9rOihpZClzZW5kZXIKK3sKKyNpZiBVU0UoVUlDT05URVhUTUVOVSkKKyAg ICBbX2RhdGVUaW1lQ29udGV4dE1lbnVJbnRlcmFjdGlvbiBkaXNtaXNzTWVudV07CisjZW5kaWYK K30KKwogLSAoTlNTdHJpbmcgKiljYWxlbmRhclR5cGUKIHsKICAgICByZXR1cm4gW19kYXRlUGlj a2VyIGNhbGVuZGFyXS5jYWxlbmRhcklkZW50aWZpZXI7Cg== 404772 2020-07-20 15:52:40 -0700 2020-07-20 16:48:45 -0700 Patch for landing bug-214195-20200720155239.patch text/plain 8983 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDA5NjhmNmJhNjczYmQ3 YTBkZmRhOTU2ZWJhNWJmYWUwNDQwOTUxMi4uMTg0NDMwMjVkNzYwOTRkNWJmZWU5Mzk3MTgwOTg1 YzA0NmRlZDliNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA3LTEwICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIE9LIGJ1 dHRvbiB0byBEYXRlL1RpbWUgZm9ybSBjb250cm9scy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDE5NQorCisgICAgICAgIFJldmlld2VkIGJ5IERh cmluIEFkbGVyLgorCisgICAgICAgICogZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5nczoKKwog MjAyMC0wNy0xNyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAg ICAgICBGb2xsb3d1cCB0byByMjY0NTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlhOTg2MDRmYzE2M2I0OGQ0OGUw MWFjMWIyMGViYjE5MGNhMGU5YzAuLmZiMWEyNzE1NjdlNjc0OWM1Y2VmNjM2NTgxZGYwNjRiOTk4 Yzk4MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDctMTAgIE1lZ2FuIEdhcmRu ZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgT0sgYnV0dG9uIHRv IERhdGUvVGltZSBmb3JtIGNvbnRyb2xzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE0MTk1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NTAwNjAw MD4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBBZGQgJ09L JyBidXR0b24gdG8gYWRkIGNsYXJpdHkgdG8gVUksIGFuZCBpbmNyZWFzZSB0aGUgZGVmYXVsdCBz aXplIG9mIHRoZSBjb250cm9sIHRvCisgICAgICAgIGVuc3VyZSBzcGFjZSBmb3IgYm90aCBidXR0 b25zLiBBbHNvIGZpeGVkIGEgY3Jhc2ggdGhhdCBoYXBwZW5lZCB3aGVuIGNsb3NpbmcgdGhlIGNv bnRyb2wgYmVmb3JlCisgICAgICAgIHRoZSBhbmltYXRpb24gY29tcGxldGVkLgorCisgICAgICAg ICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tOgorICAgICAg ICAoLVtXS0RhdGVUaW1lQ29udGV4dE1lbnVWaWV3Q29udHJvbGxlciBwcmVmZXJyZWRDb250ZW50 U2l6ZV0pOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIGNvbnRleHRNZW51SW50ZXJhY3Rp b246Y29uZmlndXJhdGlvbkZvck1lbnVBdExvY2F0aW9uOl0pOgorICAgICAgICAoLVtXS0RhdGVU aW1lUGlja2VyIGNvbnRleHRNZW51SW50ZXJhY3Rpb246d2lsbERpc3BsYXlNZW51Rm9yQ29uZmln dXJhdGlvbjphbmltYXRvcjpdKToKKyAgICAgICAgKC1bV0tEYXRlVGltZVBpY2tlciBjb250ZXh0 TWVudUludGVyYWN0aW9uOndpbGxFbmRGb3JDb25maWd1cmF0aW9uOmFuaW1hdG9yOl0pOgorICAg ICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIG9rOl0pOgorCiAyMDIwLTA3LTE3ICBMYXVybyBNb3Vy YSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIGZhc3QvZXZlbnRzL2NvbnRl eHQtYWN0aXZhdGVkLWJ5LWtleS1ldmVudC5odG1sIGlzIGNyYXNoaW5nCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzIGIvU291cmNlL1dlYkNv cmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncwppbmRleCA3NzNkODRmNGYwN2Q2ZTM3ZmEy NDY5YTAxNTNiMTk2Y2Q3YzEwYTZiLi41ODYwMjkwYTk1ZWJlMTY5MDIzZmNhZjJiZmY4Y2RkMDk3 Y2QwNjE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5z dHJpbmdzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MK QEAgLTU0NCw2ICs1NDQsOSBAQAogLyogT0sgYnV0dG9uIGxhYmVsIGluIGRvY3VtZW50IHBhc3N3 b3JkIGZhaWx1cmUgYWxlcnQgKi8KICJPSyAoZG9jdW1lbnQgcGFzc3dvcmQgZmFpbHVyZSBhbGVy dCkiID0gIk9LIjsKIAorLyogVGl0bGUgb2YgdGhlIE9LIGJ1dHRvbiBpbiBkYXRlL3RpbWUgZm9y bSBjb250cm9scy4gKi8KKyJPSyAoT0sgYnV0dG9uIHRpdGxlIGluIGRhdGUvdGltZSBwaWNrZXIp IiA9ICJPSyI7CisKIC8qIE1lbnUgaXRlbSBsYWJlbCBmb3IgdGhlIHRyYWNrIHRoYXQgcmVwcmVz ZW50cyBkaXNhYmxpbmcgY2xvc2VkIGNhcHRpb25zICovCiAiT2ZmIiA9ICJPZmYiOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaCBiL1NvdXJj ZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCmluZGV4IDU4YzhjZjBiNzYyZDNj NjYxZjdhNmRmOWE1NTA4MDY3N2E4ZGE3Y2MuLjE3Njc1MGNmZTYxM2Y4NGFkNDI0NTExOWRjY2Vj ODYxNGI0N2FhMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9V SUtpdFNQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5o CkBAIC0xMTc3LDYgKzExNzcsNyBAQCB0eXBlZGVmIE5TX0VOVU0oTlNVSW50ZWdlciwgX1VJQ29u dGV4dE1lbnVMYXlvdXQpIHsKIEBpbnRlcmZhY2UgVUlDb250ZXh0TWVudUludGVyYWN0aW9uICgp CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIFVJR2VzdHVyZVJlY29nbml6ZXIgKmdl c3R1cmVSZWNvZ25pemVyRm9yRmFpbHVyZVJlbGF0aW9uc2hpcHM7CiAtICh2b2lkKV9wcmVzZW50 TWVudUF0TG9jYXRpb246KENHUG9pbnQpbG9jYXRpb247CistICh2b2lkKWRpc21pc3NNZW51Owog QGVuZAogCiAjZW5kaWYgLy8gVVNFKFVJQ09OVEVYVE1FTlUpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1t CmluZGV4IDJjM2NlNzdhOTUxY2NhZGMyYTNjZWRhZTc1ZWQxYmJlY2MyNGU1ODYuLmRlNjYzZmRm NjJmMmI3OTdlMTQ1M2E2ZGM4ZGFmNWI4MmI0Njc1NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1t CkBAIC0zNiw2ICszNiw3IEBACiAjaW1wb3J0IDxVSUtpdC9VSUJhckJ1dHRvbkl0ZW0uaD4KICNp bXBvcnQgPFVJS2l0L1VJRGF0ZVBpY2tlci5oPgogI2ltcG9ydCA8V2ViQ29yZS9Mb2NhbGl6ZWRT dHJpbmdzLmg+CisjaW1wb3J0IDxhbGdvcml0aG0+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+ CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CkBAIC03NiwxNSArNzcsMTcgQEAgQGltcGxlbWVu dGF0aW9uIFdLRGF0ZVRpbWVDb250ZXh0TWVudVZpZXdDb250cm9sbGVyCiAtIChDR1NpemUpcHJl ZmVycmVkQ29udGVudFNpemUKIHsKICAgICAvLyBGSVhNRTogV29ya2Fyb3VuZCwgc2hvdWxkIGJl IGFibGUgdG8gYmUgcmVhZGRyZXNzZWQgYWZ0ZXIgPHJkYXI6Ly9wcm9ibGVtLzY0MTQzNTM0Pgot ICAgIFVJVmlldyAqdmlldyA9IHNlbGYudmlldzsKKyAgICBVSVZpZXcgKnZpZXcgPSBzZWxmLnZp ZXcuc3Vidmlld3NbMF07CiAgICAgaWYgKFVJRWRnZUluc2V0c0VxdWFsVG9FZGdlSW5zZXRzKHZp ZXcubGF5b3V0TWFyZ2lucywgVUlFZGdlSW5zZXRzWmVybykpIHsKICAgICAgICAgdmlldy50cmFu c2xhdGVzQXV0b3Jlc2l6aW5nTWFza0ludG9Db25zdHJhaW50cyA9IE5POwogICAgICAgICBbdmll dyBsYXlvdXRJZk5lZWRlZF07CiAgICAgICAgIHZpZXcudHJhbnNsYXRlc0F1dG9yZXNpemluZ01h c2tJbnRvQ29uc3RyYWludHMgPSBZRVM7CiAgICAgICAgIHZpZXcubGF5b3V0TWFyZ2lucyA9IFVJ RWRnZUluc2V0c01ha2UoMTYsIDE2LCAxNiwgMTYpOwogICAgIH0KLQotICAgIHJldHVybiBbdmll dyBzeXN0ZW1MYXlvdXRTaXplRml0dGluZ1NpemU6VUlMYXlvdXRGaXR0aW5nQ29tcHJlc3NlZFNp emVdOworICAgIGF1dG8gc2l6ZSA9IFt2aWV3IHN5c3RlbUxheW91dFNpemVGaXR0aW5nU2l6ZTpV SUxheW91dEZpdHRpbmdDb21wcmVzc2VkU2l6ZV07CisgICAgCisgICAgc2l6ZS53aWR0aCA9IHN0 ZDo6bWF4PENHRmxvYXQ+KHNpemUud2lkdGgsIDI1MC4wKTsKKyAgICByZXR1cm4gc2l6ZTsKIH0K IAogQGVuZApAQCAtMTY4LDE1ICsxNzEsMzAgQEAgLSAoVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRp b24gKiljb250ZXh0TWVudUludGVyYWN0aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24KICAg ICAgICAgW192aWV3Q29udHJvbGxlciBzZXRWaWV3Om5pbF07CiAgICAgICAgIF92aWV3Q29udHJv bGxlciA9IGFkb3B0TlMoW1tXS0RhdGVUaW1lQ29udGV4dE1lbnVWaWV3Q29udHJvbGxlciBhbGxv Y10gaW5pdF0pOwogICAgICAgICBSZXRhaW5QdHI8VUlOYXZpZ2F0aW9uQ29udHJvbGxlcj4gbmF2 aWdhdGlvbkNvbnRyb2xsZXIgPSBhZG9wdE5TKFtbVUlOYXZpZ2F0aW9uQ29udHJvbGxlciBhbGxv Y10gaW5pdFdpdGhSb290Vmlld0NvbnRyb2xsZXI6X3ZpZXdDb250cm9sbGVyLmdldCgpXSk7Cisg ICAgICAgIAogICAgICAgICBOU1N0cmluZyAqcmVzZXRTdHJpbmcgPSBXRUJfVUlfU1RSSU5HX0tF WSgiUmVzZXQiLCAiUmVzZXQgQnV0dG9uIERhdGUvVGltZSBDb250ZXh0IE1lbnUiLCAiUmVzZXQg YnV0dG9uIGluIGRhdGUgaW5wdXQgY29udGV4dCBtZW51Iik7CisgICAgICAgIE5TU3RyaW5nICpv a1N0cmluZyA9IFdFQl9VSV9TVFJJTkdfS0VZKCJPSyIsICJPSyAoT0sgYnV0dG9uIHRpdGxlIGlu IGRhdGUvdGltZSBwaWNrZXIpIiwgIlRpdGxlIG9mIHRoZSBPSyBidXR0b24gaW4gZGF0ZS90aW1l IGZvcm0gY29udHJvbHMuIik7CiAKKyAgICAgICAgUmV0YWluUHRyPFVJQmFyQnV0dG9uSXRlbT4g b2tCYXJCdXR0b24gPSBhZG9wdE5TKFtbVUlCYXJCdXR0b25JdGVtIGFsbG9jXSBpbml0V2l0aFRp dGxlOm9rU3RyaW5nIHN0eWxlOlVJQmFyQnV0dG9uSXRlbVN0eWxlRG9uZSB0YXJnZXQ6c2VsZiBh Y3Rpb246QHNlbGVjdG9yKG9rOildKTsKICAgICAgICAgUmV0YWluUHRyPFVJQmFyQnV0dG9uSXRl bT4gYmxhbmtCYXJCdXR0b24gPSBhZG9wdE5TKFtbVUlCYXJCdXR0b25JdGVtIGFsbG9jXSBpbml0 V2l0aEJhckJ1dHRvblN5c3RlbUl0ZW06VUlCYXJCdXR0b25TeXN0ZW1JdGVtRmxleGlibGVTcGFj ZSB0YXJnZXQ6bmlsIGFjdGlvbjpuaWxdKTsKICAgICAgICAgUmV0YWluUHRyPFVJQmFyQnV0dG9u SXRlbT4gcmVzZXRCYXJCdXR0b24gPSBhZG9wdE5TKFtbVUlCYXJCdXR0b25JdGVtIGFsbG9jXSBp bml0V2l0aFRpdGxlOnJlc2V0U3RyaW5nIHN0eWxlOlVJQmFyQnV0dG9uSXRlbVN0eWxlUGxhaW4g dGFyZ2V0OnNlbGYgYWN0aW9uOkBzZWxlY3RvcihyZXNldDopXSk7CiAgICAgICAgIAotICAgICAg ICBbX3ZpZXdDb250cm9sbGVyIHNldFRvb2xiYXJJdGVtczpAW2JsYW5rQmFyQnV0dG9uLmdldCgp LCByZXNldEJhckJ1dHRvbi5nZXQoKV1dOworICAgICAgICBbX3ZpZXdDb250cm9sbGVyIHNldFRv b2xiYXJJdGVtczpAW3Jlc2V0QmFyQnV0dG9uLmdldCgpLCBibGFua0JhckJ1dHRvbi5nZXQoKSwg b2tCYXJCdXR0b24uZ2V0KCldXTsKICAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIHNldFRv b2xiYXJIaWRkZW46Tk9dOworICAgICAgICAKKyAgICAgICAgYXV0byBjZW50ZXJpbmdWaWV3ID0g YWRvcHROUyhbW1VJVmlldyBhbGxvY10gaW5pdF0pOworICAgICAgICAKKyAgICAgICAgW2NlbnRl cmluZ1ZpZXcgYWRkU3VidmlldzpfZGF0ZVBpY2tlci5nZXQoKV07CisgICAgICAgIAorICAgICAg ICBfZGF0ZVBpY2tlci5nZXQoKS50cmFuc2xhdGVzQXV0b3Jlc2l6aW5nTWFza0ludG9Db25zdHJh aW50cyA9IE5POworICAgICAgICBhdXRvIHdpZHRoQ29uc3RyYWludCA9IFtbY2VudGVyaW5nVmll dyB3aWR0aEFuY2hvcl0gY29uc3RyYWludEdyZWF0ZXJUaGFuT3JFcXVhbFRvQW5jaG9yOltfZGF0 ZVBpY2tlciB3aWR0aEFuY2hvcl1dOworICAgICAgICBhdXRvIGhlaWdodENvbnN0cmFpbnQgPSBb W2NlbnRlcmluZ1ZpZXcgaGVpZ2h0QW5jaG9yXSBjb25zdHJhaW50RXF1YWxUb0FuY2hvcjpbX2Rh dGVQaWNrZXIgaGVpZ2h0QW5jaG9yXV07CisgICAgICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFp bnQgPSBbW2NlbnRlcmluZ1ZpZXcgY2VudGVyWEFuY2hvcl0gY29uc3RyYWludEVxdWFsVG9BbmNo b3I6W19kYXRlUGlja2VyIGNlbnRlclhBbmNob3JdXTsKKyAgICAgICAgYXV0byB2ZXJ0aWNhbENv bnN0cmFpbnQgPSBbW2NlbnRlcmluZ1ZpZXcgY2VudGVyWUFuY2hvcl0gY29uc3RyYWludEVxdWFs VG9BbmNob3I6W19kYXRlUGlja2VyIGNlbnRlcllBbmNob3JdXTsKIAotICAgICAgICBbX3ZpZXdD b250cm9sbGVyIHNldFZpZXc6X2RhdGVQaWNrZXIuZ2V0KCldOworICAgICAgICBbTlNMYXlvdXRD b25zdHJhaW50IGFjdGl2YXRlQ29uc3RyYWludHM6QFt2ZXJ0aWNhbENvbnN0cmFpbnQsIGhvcml6 b250YWxDb25zdHJhaW50LCB3aWR0aENvbnN0cmFpbnQsIGhlaWdodENvbnN0cmFpbnRdXTsKKwor ICAgICAgICBbX3ZpZXdDb250cm9sbGVyIHNldFZpZXc6Y2VudGVyaW5nVmlldy5nZXQoKV07CiAK ICAgICAgICAgTlNTdHJpbmcgKnRpdGxlVGV4dCA9IF92aWV3LmlucHV0TGFiZWxUZXh0OwogICAg ICAgICBpZiAoIVt0aXRsZVRleHQgaXNFcXVhbDpAIiJdKSB7CkBAIC0xOTAsMTAgKzIwOCwxMCBA QCAtIChVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqKWNvbnRleHRNZW51SW50ZXJhY3Rpb246 KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbgogICAgICAgICB9IGVsc2UKICAgICAgICAgICAgIFtu YXZpZ2F0aW9uQ29udHJvbGxlciBzZXROYXZpZ2F0aW9uQmFySGlkZGVuOllFUyBhbmltYXRlZDpO T107CiAgICAgICAgIAotICAgICAgICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIgbmF2aWdhdGlvbkJh cl0uYmFja2dyb3VuZENvbG9yID0gVUlDb2xvci5jbGVhckNvbG9yOwogICAgICAgICBbbmF2aWdh dGlvbkNvbnRyb2xsZXIgbmF2aWdhdGlvbkJhcl0udHJhbnNsdWNlbnQgPSBOTzsKLSAgICAgICAg W25hdmlnYXRpb25Db250cm9sbGVyIHRvb2xiYXJdLmJhY2tncm91bmRDb2xvciA9IFVJQ29sb3Iu Y2xlYXJDb2xvcjsKKyAgICAgICAgW25hdmlnYXRpb25Db250cm9sbGVyIG5hdmlnYXRpb25CYXJd LmJhclRpbnRDb2xvciA9IFtVSUNvbG9yIHN5c3RlbUJhY2tncm91bmRDb2xvcl07CiAgICAgICAg IFtuYXZpZ2F0aW9uQ29udHJvbGxlciB0b29sYmFyXS50cmFuc2x1Y2VudCA9IE5POworICAgICAg ICBbbmF2aWdhdGlvbkNvbnRyb2xsZXIgdG9vbGJhcl0uYmFyVGludENvbG9yID0gW1VJQ29sb3Ig c3lzdGVtQmFja2dyb3VuZENvbG9yXTsKICAgICAgICAgcmV0dXJuIG5hdmlnYXRpb25Db250cm9s bGVyLmdldCgpOwogICAgIH0gYWN0aW9uUHJvdmlkZXI6bmlsXTsKIH0KQEAgLTIwMiw3ICsyMjAs OCBAQCAtICh2b2lkKWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFj dGlvbiAqKWludGVyYWN0aW9uIHdpbGxEaXNwbAogewogICAgIFthbmltYXRvciBhZGRDb21wbGV0 aW9uOlt3ZWFrU2VsZiA9IFdlYWtPYmpDUHRyPFdLRGF0ZVRpbWVQaWNrZXI+KHNlbGYpXSB7CiAg ICAgICAgIGF1dG8gc3Ryb25nU2VsZiA9IHdlYWtTZWxmLmdldCgpOwotICAgICAgICBbc3Ryb25n U2VsZi0+X3ZpZXcud2ViVmlldyBfZGlkU2hvd0NvbnRleHRNZW51XTsKKyAgICAgICAgaWYgKHN0 cm9uZ1NlbGYpCisgICAgICAgICAgICBbc3Ryb25nU2VsZi0+X3ZpZXcud2ViVmlldyBfZGlkU2hv d0NvbnRleHRNZW51XTsKICAgICB9XTsKIH0KIApAQCAtMjEwLDggKzIyOSwxMCBAQCAtICh2b2lk KWNvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVy YWN0aW9uIHdpbGxFbmRGbwogewogICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOlt3ZWFrU2Vs ZiA9IFdlYWtPYmpDUHRyPFdLRGF0ZVRpbWVQaWNrZXI+KHNlbGYpXSB7CiAgICAgICAgIGF1dG8g c3Ryb25nU2VsZiA9IHdlYWtTZWxmLmdldCgpOwotICAgICAgICBbc3Ryb25nU2VsZi0+X3ZpZXcg YWNjZXNzb3J5RG9uZV07Ci0gICAgICAgIFtzdHJvbmdTZWxmLT5fdmlldy53ZWJWaWV3IF9kaWRE aXNtaXNzQ29udGV4dE1lbnVdOworICAgICAgICBpZiAoc3Ryb25nU2VsZikgeworICAgICAgICAg ICAgW3N0cm9uZ1NlbGYtPl92aWV3IGFjY2Vzc29yeURvbmVdOworICAgICAgICAgICAgW3N0cm9u Z1NlbGYtPl92aWV3LndlYlZpZXcgX2RpZERpc21pc3NDb250ZXh0TWVudV07CisgICAgICAgIH0K ICAgICB9XTsKIH0KIApAQCAtMjQ5LDYgKzI3MCwxMyBAQCAtICh2b2lkKXJlc2V0OihpZClzZW5k ZXIKICAgICBbX3ZpZXcgcGFnZV0tPnNldEZvY3VzZWRFbGVtZW50VmFsdWUoU3RyaW5nKCkpOwog fQogCistICh2b2lkKW9rOihpZClzZW5kZXIKK3sKKyNpZiBVU0UoVUlDT05URVhUTUVOVSkKKyAg ICBbX2RhdGVUaW1lQ29udGV4dE1lbnVJbnRlcmFjdGlvbiBkaXNtaXNzTWVudV07CisjZW5kaWYK K30KKwogLSAoTlNTdHJpbmcgKiljYWxlbmRhclR5cGUKIHsKICAgICByZXR1cm4gW19kYXRlUGlj a2VyIGNhbGVuZGFyXS5jYWxlbmRhcklkZW50aWZpZXI7Cg==