224082 2021-04-01 15:38:17 -0700 Web Inspector: add setting to allow inspecting Web Inspector 2021-04-14 17:18:42 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg ews-watchlist hi inspector-bugzilla-changes joepeck pangle webkit-bug-importer oldest_to_newest 1746298 0 bburg 2021-04-01 15:38:17 -0700 This broke in Catalina releases due to changes in Safari's storage model. Let's put it in the settings UI in case it's needed. We could additionally restrict this to STP, but what's the point? 1746299 1 bburg 2021-04-01 15:38:54 -0700 <rdar://75695002> 1746311 2 424957 bburg 2021-04-01 16:00:08 -0700 Created attachment 424957 Patch v1.0 1749448 3 424957 hi 2021-04-12 16:40:44 -0700 Comment on attachment 424957 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=424957&action=review > Source/WebCore/en.lproj/Localizable.strings:152 > +/* Message for geolocation prompt */ > +"Allow “%@” to use your current location?" = "Allow “%@” to use your current location?"; While I do appreciate this, is it strictly speaking necessary in this patch? Could you just do an unreviewed cleanup fix followup instead? > Source/WebCore/inspector/InspectorFrontendHost.cpp:583 > + return m_frontendPage ? m_frontendPage->settings().developerExtrasEnabled() : false; ``` return m_frontendPage && m_frontendPage->settings().developerExtrasEnabled(); ``` > Source/WebCore/inspector/InspectorFrontendHost.idl:96 > + boolean allowsInspectingInspector(); > + undefined setAllowsInspectingInspector(boolean allow); Why not just have `attribute boolean allowsInspectingInspector`? Also, is it ever actually read anywhere in the frontend? > Source/WebInspectorUI/UserInterface/Base/Main.js:166 > +// InspectorFrontendHost.setAllowsInspectingInspector(WI.settings.experimentalAllowInspectingInspector.value); oops > Source/WebInspectorUI/UserInterface/Base/Setting.js:232 > + experimentalAllowInspectingInspector: new WI.Setting("experimental-allow-inspecting-inspector", false), Is it really necessary to have a `WI.ExperimentalSetting` for this when `DeveloperExtrasEnabled` is already a setting saved on disk? > Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js:411 > + let diagnosticsGroup = experimentalSettingsView.addGroup(WI.UIString("Diagnostics:", "Diagnostics: @ Experimental Settings", "Category label for experimental settings related to Web Inspector diagnostics."), WI.settings.experimentalCollapseBlackboxedCallFrames, WI.UIString("Collapse blackboxed call frames", "Collapse blackboxed call frames @ Experimental Settings", "Setting to collapse blackboxed call frames in the debugger.")); Why is `WI.settings.experimentalCollapseBlackboxedCallFrames` related to this? Or was this a copypasta mistake? :P 1749449 4 424957 pangle 2021-04-12 16:42:17 -0700 Comment on attachment 424957 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=424957&action=review > Source/WebCore/ChangeLog:12 > + * en.lproj/Localizable.strings: Should probably add a comment here that this is a drive-by change and not related to this patch. I was confused how location permission was related to Inspector^2 at first. > Source/WebInspectorUI/UserInterface/Base/Main.js:166 > +// InspectorFrontendHost.setAllowsInspectingInspector(WI.settings.experimentalAllowInspectingInspector.value); Oops? > Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js:412 > + diagnosticsGroup.addSetting(WI.settings.experimentalAllowInspectingInspector, WI.UIString("Allow Inspecting Web Inspector", "Label for setting that allows the user to inspect the Web Inspector user interface.")); I think the use of the two-argument version of this has fallen out of favor (bug 215400) and that we prefer to explicitly provide a key each string. 1749899 5 424957 bburg 2021-04-13 15:34:14 -0700 Comment on attachment 424957 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=424957&action=review Apologies for the sloppiness in this patch. New one coming up. >> Source/WebCore/ChangeLog:12 >> + * en.lproj/Localizable.strings: > > Should probably add a comment here that this is a drive-by change and not related to this patch. I was confused how location permission was related to Inspector^2 at first. This was included by accident, I ran the localized strings extractor over the whole codebase apparently. >> Source/WebInspectorUI/UserInterface/Base/Setting.js:232 >> + experimentalAllowInspectingInspector: new WI.Setting("experimental-allow-inspecting-inspector", false), > > Is it really necessary to have a `WI.ExperimentalSetting` for this when `DeveloperExtrasEnabled` is already a setting saved on disk? DeveloperExtrasEnabled can't be set for containerized apps, and having it set the global domain does not necessarily mean WebCore will be able to read it. 1749982 6 425945 bburg 2021-04-13 20:46:01 -0700 Created attachment 425945 Patch v1.1 1750308 7 425945 hi 2021-04-14 13:11:17 -0700 Comment on attachment 425945 Patch v1.1 r=me 1750401 8 ews-feeder 2021-04-14 16:25:53 -0700 commit-queue failed to commit attachment 425945 to WebKit repository. To retry, please set cq+ flag again. 1750423 9 bburg 2021-04-14 17:18:42 -0700 Committed r275982 (236534@main): <https://commits.webkit.org/236534@main> 424957 2021-04-01 16:00:08 -0700 2021-04-13 20:45:59 -0700 Patch v1.0 bug-224082-20210401160007.patch text/plain 14072 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1MzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI2YTNiM2EyZWEzNzc2 ODhlYTRmOTgwZTliYzJjZjkzNTZjOTBkZS4uMTYxY2NmZDAzNjYzOTIxMmUxM2ExYTViMWQ4OWNl MzlmYmFjNjg0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA0LTAxICBCSiBC dXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBzZXR0 aW5nIHRvIGFsbG93IGluc3BlY3RpbmcgV2ViIEluc3BlY3RvcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0MDgyCisgICAgICAgIDxyZGFyOi8vNzU2 OTUwMDI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIGEgcHJvcGVydHkgdG8gY2hlY2sgaWYgaW5zcGVjdGluZyBpbnNwZWN0b3IgaXMgYWxsb3dl ZCwKKyAgICAgICAgYW5kIHRvIGVuYWJsZS9kaXNhYmxlIHVwb24gbG9hZGluZyB0aGUgZnJvbnRl bmQgb3IgdG9nZ2xpbmcgdGhlIHNldHRpbmcuCisKKyAgICAgICAgKiBlbi5scHJvai9Mb2NhbGl6 YWJsZS5zdHJpbmdzOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmRIb3N0OjppbnNwZWN0SW5z cGVjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZyb250ZW5kSG9zdDo6YWxsb3dz SW5zcGVjdGluZ0luc3BlY3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVu ZEhvc3Q6OnNldEFsbG93c0luc3BlY3RpbmdJbnNwZWN0b3IpOgorICAgICAgICAqIGluc3BlY3Rv ci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmRIb3N0LmlkbDoKKwogMjAyMS0wMy0zMSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFw cGxlLmNvbT4KIAogICAgICAgICBBZGQgbG9nZ2luZyBpbiBJbmRleGVkREIgdG8gaGVscCBkZWJ1 ZyBmbGFreSBxdW90YSB0ZXN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXggZGFiZGIyZDhl ZTlhMWYxMDUzMjFjZWRmYmMzNjU5M2FmNmQ5OTQ5ZS4uNDFjNzc4NmE5YjhkYWRhYTY3YTdlMWE0 YWMwYjEwNzE1NDc1YmVmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMjEtMDQtMDEgIEJKIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogYWRkIHNldHRpbmcgdG8gYWxsb3cgaW5zcGVjdGluZyBXZWIgSW5zcGVjdG9y CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQwODIK KyAgICAgICAgPHJkYXI6Ly83NTY5NTAwMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHRlbGxpbmcgY3VyaW91cyB1c2VycyB0byBz ZXQgV2ViS2l0RGV2ZWxvcGVyRXh0cmFzIGRlZmF1bHQsCisgICAgICAgIGV4cG9zZSBhbiBleHBl cmltZW50YWwgc2V0dGluZyB0aGF0IGRvZXMgdGhlIHNhbWUgdGhpbmcuCisKKyAgICAgICAgKiBM b2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisgICAgICAgICogVXNl ckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChXSS5sb2FkZWQpOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv RGVidWcvQm9vdHN0cmFwLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGlu Z3NUYWJDb250ZW50Vmlldy5qczoKKwogMjAyMS0wMy0yOCAgU2FtIFdlaW5pZyAgPHdlaW5pZ0Bh cHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIEVOQUJMRV9JTkRFWEVEX0RBVEFCQVNFICYgRU5B QkxFX0lOREVYRURfREFUQUJBU0VfSU5fV09SS0VSUywgaXQgc2VlbXMgbGlrZSBpdCBpcyBvbiBm b3IgYWxsIHBvcnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6 YWJsZS5zdHJpbmdzIGIvU291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5n cwppbmRleCA2MDQ1MjBkMjYwNWQ0NzBjNmE1Y2U0YTE0ODUzOGQ2YmJjMTI4NzlhLi5kMTFkOTAz MDY3ZmMwOWYyYjEzMjczOTJkOTZhN2U3MTAwODNhMjk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Vu Lmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MKQEAgLTEzNiw5ICsxMzYsNiBAQAogLyogTWVzc2Fn ZSBmb3IgcmVxdWVzdGluZyBjcm9zcy1zaXRlIGNvb2tpZSBhbmQgd2Vic2l0ZSBkYXRhIGFjY2Vz cy4gKi8KICJBbGxvdyDigJwlQOKAnSBhbmQg4oCcJUDigJ0gdG8gdXNlIGNvb2tpZXMgYW5kIHdl YnNpdGUgZGF0YSB3aGlsZSBicm93c2luZyDigJwlQOKAnT8iID0gIkFsbG93IOKAnCVA4oCdIGFu ZCDigJwlQOKAnSB0byB1c2UgY29va2llcyBhbmQgd2Vic2l0ZSBkYXRhIHdoaWxlIGJyb3dzaW5n IOKAnCVA4oCdPyI7CiAKLS8qIE1lc3NhZ2UgZm9yIGdlb2xvY2F0aW9uIHByb21wdCAqLwotIkFs bG93IOKAnCVA4oCdIHRvIHVzZSB5b3VyIGN1cnJlbnQgbG9jYXRpb24/IiA9ICJBbGxvdyDigJwl QOKAnSB0byB1c2UgeW91ciBjdXJyZW50IGxvY2F0aW9uPyI7Ci0KIC8qIE1lc3NhZ2UgZm9yIHNw ZWNocmVjb2duaXRpb24gcHJvbXB0ICovCiAiQWxsb3cg4oCcJUDigJ0gdG8gY2FwdHVyZSB5b3Vy IGF1ZGlvIGFuZCB1c2UgaXQgZm9yIHNwZWVjaCByZWNvZ25pdGlvbj8iID0gIkFsbG93IOKAnCVA 4oCdIHRvIGNhcHR1cmUgeW91ciBhdWRpbyBhbmQgdXNlIGl0IGZvciBzcGVlY2ggcmVjb2duaXRp b24/IjsKIApAQCAtMTUxLDYgKzE0OCw5IEBACiAvKiBNZXNzYWdlIGZvciB1c2VyIGNhbWVyYSBh Y2Nlc3MgcHJvbXB0ICovCiAiQWxsb3cg4oCcJUDigJ0gdG8gdXNlIHlvdXIgY2FtZXJhPyIgPSAi QWxsb3cg4oCcJUDigJ0gdG8gdXNlIHlvdXIgY2FtZXJhPyI7CiAKKy8qIE1lc3NhZ2UgZm9yIGdl b2xvY2F0aW9uIHByb21wdCAqLworIkFsbG93IOKAnCVA4oCdIHRvIHVzZSB5b3VyIGN1cnJlbnQg bG9jYXRpb24/IiA9ICJBbGxvdyDigJwlQOKAnSB0byB1c2UgeW91ciBjdXJyZW50IGxvY2F0aW9u PyI7CisKIC8qIE1lc3NhZ2UgZm9yIHVzZXIgbWljcm9waG9uZSBhY2Nlc3MgcHJvbXB0ICovCiAi QWxsb3cg4oCcJUDigJ0gdG8gdXNlIHlvdXIgbWljcm9waG9uZT8iID0gIkFsbG93IOKAnCVA4oCd IHRvIHVzZSB5b3VyIG1pY3JvcGhvbmU/IjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNwcAppbmRleCA2NTc3NDIzY2MwYzY0YTlkNjU2 MTFhNmRmODc1NzhjZjY2ZTZjMjE2Li4xMWI2Zjc2NjQ2Y2MxYzcyMjk4NTlkMjkxMTczNzQ3ODkx ZDAzYTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJv bnRlbmRIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJv bnRlbmRIb3N0LmNwcApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDct MjAyMCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIw MDctMjAyMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMp IDIwMDggTWF0dCBMaWxlayA8d2Via2l0QG1hdHRsaWxlay5jb20+CiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CkBAIC01NjMsMTAgKzU2MywxMCBAQCB2b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6YmVlcCgp CiAKIHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRIb3N0OjppbnNwZWN0SW5zcGVjdG9yKCkKIHsKLSAg ICBpZiAobV9mcm9udGVuZFBhZ2UpIHsKLSAgICAgICAgbV9mcm9udGVuZFBhZ2UtPnNldHRpbmdz KCkuc2V0RGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCh0cnVlKTsKKyAgICBzZXRBbGxvd3NJbnNwZWN0 aW5nSW5zcGVjdG9yKHRydWUpOworCisgICAgaWYgKG1fZnJvbnRlbmRQYWdlKQogICAgICAgICBt X2Zyb250ZW5kUGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLnNob3coKTsKLSAgICB9CiB9CiAK IGJvb2wgSW5zcGVjdG9yRnJvbnRlbmRIb3N0Ojppc0JlaW5nSW5zcGVjdGVkKCkKQEAgLTU3OCw2 ICs1NzgsMTcgQEAgYm9vbCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OmlzQmVpbmdJbnNwZWN0ZWQo KQogICAgIHJldHVybiBpbnNwZWN0b3JDb250cm9sbGVyLmhhc0xvY2FsRnJvbnRlbmQoKSB8fCBp bnNwZWN0b3JDb250cm9sbGVyLmhhc1JlbW90ZUZyb250ZW5kKCk7CiB9CiAKK2Jvb2wgSW5zcGVj dG9yRnJvbnRlbmRIb3N0OjphbGxvd3NJbnNwZWN0aW5nSW5zcGVjdG9yKCkKK3sKKyAgICByZXR1 cm4gbV9mcm9udGVuZFBhZ2UgPyBtX2Zyb250ZW5kUGFnZS0+c2V0dGluZ3MoKS5kZXZlbG9wZXJF eHRyYXNFbmFibGVkKCkgOiBmYWxzZTsKK30KKwordm9pZCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6 OnNldEFsbG93c0luc3BlY3RpbmdJbnNwZWN0b3IoYm9vbCBhbGxvdykKK3sKKyAgICBpZiAobV9m cm9udGVuZFBhZ2UpCisgICAgICAgIG1fZnJvbnRlbmRQYWdlLT5zZXR0aW5ncygpLnNldERldmVs b3BlckV4dHJhc0VuYWJsZWQoYWxsb3cpOworfQorCiBib29sIEluc3BlY3RvckZyb250ZW5kSG9z dDo6c3VwcG9ydHNTaG93Q2VydGlmaWNhdGUoKSBjb25zdAogewogI2lmIFBMQVRGT1JNKENPQ09B KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5k SG9zdC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5o CmluZGV4IDQ1MDY2YjlhODFhYzMzY2Q3YmI4NzdhYjg5MTkyZjJiMDM1ZGNmZTkuLmQ5ZDU1ZDRl NmVlMmE4NTg3NGFjMGRkMTIwMzQ4ZDgxYzBmMTA4YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmgKQEAgLTEyOSw2ICsxMjksOCBAQCBw dWJsaWM6CiAgICAgdm9pZCBiZWVwKCk7CiAgICAgdm9pZCBpbnNwZWN0SW5zcGVjdG9yKCk7CiAg ICAgYm9vbCBpc0JlaW5nSW5zcGVjdGVkKCk7CisgICAgYm9vbCBhbGxvd3NJbnNwZWN0aW5nSW5z cGVjdG9yKCk7CisgICAgdm9pZCBzZXRBbGxvd3NJbnNwZWN0aW5nSW5zcGVjdG9yKGJvb2wpOwog CiAgICAgYm9vbCBzdXBwb3J0c0RpYWdub3N0aWNMb2dnaW5nKCk7CiAjaWYgRU5BQkxFKElOU1BF Q1RPUl9URUxFTUVUUlkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRnJvbnRlbmRIb3N0LmlkbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JGcm9udGVuZEhvc3QuaWRsCmluZGV4IDMyYzU3NDNhMGU2M2Q1ODIzOTk4MTNkZGMzMDMwYTgz NDQyNDc5ZjMuLjJkZWUzYzBkNjdmYjYzYjQyMTBiZjUwMzliMzE0MWI5NzU2NjA2NzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaWRs CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaWRs CkBAIC05Miw2ICs5Miw4IEBACiAgICAgdW5kZWZpbmVkIGJlZXAoKTsKICAgICB1bmRlZmluZWQg aW5zcGVjdEluc3BlY3RvcigpOwogICAgIGJvb2xlYW4gaXNCZWluZ0luc3BlY3RlZCgpOworICAg IGJvb2xlYW4gYWxsb3dzSW5zcGVjdGluZ0luc3BlY3RvcigpOworICAgIHVuZGVmaW5lZCBzZXRB bGxvd3NJbnNwZWN0aW5nSW5zcGVjdG9yKGJvb2xlYW4gYWxsb3cpOwogCiAgICAgcmVhZG9ubHkg YXR0cmlidXRlIGJvb2xlYW4gc3VwcG9ydHNEaWFnbm9zdGljTG9nZ2luZzsKICAgICBbQ29uZGl0 aW9uYWw9SU5TUEVDVE9SX1RFTEVNRVRSWV0gdW5kZWZpbmVkIGxvZ0RpYWdub3N0aWNFdmVudChE T01TdHJpbmcgZXZlbnROYW1lLCBET01TdHJpbmcgY29udGVudCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdz LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxp emVkU3RyaW5ncy5qcwppbmRleCAxZjExYzk3MWZkYjA0ZjdkNGMyZDBkZGViMjRjZGE4MTJhMzAx NWQxLi4wZGJkN2IwNjVmMGM1Zjc5MWMyZDZkNDBjODZkZmE3ZTI4YjdjNjdiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTE1Miw2ICsxNTIsOCBAQCBsb2NhbGl6ZWRTdHJp bmdzWyJBbGwgVGltZW91dHMgQCBFdmVudCBCcmVha3BvaW50Il0gPSAiQWxsIFRpbWVvdXRzIjsK IGxvY2FsaXplZFN0cmluZ3NbIkFsbCBpdGVtcyBpbiBcdTAwMjIlc1x1MDAyMiBtdXN0IGJlIGVy cm9yIG9iamVjdHMiXSA9ICJBbGwgaXRlbXMgaW4gXHUwMDIyJXNcdTAwMjIgbXVzdCBiZSBlcnJv ciBvYmplY3RzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkFsbCBpdGVtcyBpbiBcdTAwMjIlc1x1MDAy MiBtdXN0IGJlIG5vbi1lbXB0eSBzdHJpbmdzIl0gPSAiQWxsIGl0ZW1zIGluIFx1MDAyMiVzXHUw MDIyIG11c3QgYmUgbm9uLWVtcHR5IHN0cmluZ3MiOwogbG9jYWxpemVkU3RyaW5nc1siQWxsIGl0 ZW1zIGluIFx1MDAyMiVzXHUwMDIyIG11c3QgYmUgdmFsaWQgRE9NIG5vZGVzIl0gPSAiQWxsIGl0 ZW1zIGluIFx1MDAyMiVzXHUwMDIyIG11c3QgYmUgdmFsaWQgRE9NIG5vZGVzIjsKKy8qIExhYmVs IGZvciBzZXR0aW5nIHRoYXQgYWxsb3dzIHRoZSB1c2VyIHRvIGluc3BlY3QgdGhlIFdlYiBJbnNw ZWN0b3IgdXNlciBpbnRlcmZhY2UuICovCitsb2NhbGl6ZWRTdHJpbmdzWyJBbGxvdyBJbnNwZWN0 aW5nIFdlYiBJbnNwZWN0b3IiXSA9ICJBbGxvdyBJbnNwZWN0aW5nIFdlYiBJbnNwZWN0b3IiOwog bG9jYWxpemVkU3RyaW5nc1siQWxsb3cgTWVkaWEgQ2FwdHVyZSBvbiBJbnNlY3VyZSBTaXRlcyJd ID0gIkFsbG93IE1lZGlhIENhcHR1cmUgb24gSW5zZWN1cmUgU2l0ZXMiOwogLyogUHJvcGVydHkg dGl0bGUgZm9yIGBmb250LXZhcmlhbnQtYWx0ZXJuYXRlc2AuICovCiBsb2NhbGl6ZWRTdHJpbmdz WyJBbHRlcm5hdGUgR2x5cGhzIEAgRm9udCBEZXRhaWxzIFNpZGViYXIgUHJvcGVydHkiXSA9ICJB bHRlcm5hdGUgR2x5cGhzIjsKQEAgLTQ1Niw2ICs0NTgsOCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJE ZXRhaWxzIFNpZGViYXJzOiBAIFNldHRpbmdzIEVsZW1lbnRzIFBhbmUiXSA9ICJEZXRhaWxzIFNp ZGViYQogbG9jYWxpemVkU3RyaW5nc1siRGV2aWNlICVkIl0gPSAiRGV2aWNlICVkIjsKIGxvY2Fs aXplZFN0cmluZ3NbIkRldmljZSBTZXR0aW5ncyJdID0gIkRldmljZSBTZXR0aW5ncyI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJEaWFnbm9zZXMgY29tbW9uIGFjY2Vzc2liaWxpdHkgcHJvYmxlbXMgYWZm ZWN0aW5nIHNjcmVlbiByZWFkZXJzIGFuZCBvdGhlciBhc3Npc3RpdmUgdGVjaG5vbG9neS4iXSA9 ICJEaWFnbm9zZXMgY29tbW9uIGFjY2Vzc2liaWxpdHkgcHJvYmxlbXMgYWZmZWN0aW5nIHNjcmVl biByZWFkZXJzIGFuZCBvdGhlciBhc3Npc3RpdmUgdGVjaG5vbG9neS4iOworLyogQ2F0ZWdvcnkg bGFiZWwgZm9yIGV4cGVyaW1lbnRhbCBzZXR0aW5ncyByZWxhdGVkIHRvIFdlYiBJbnNwZWN0b3Ig ZGlhZ25vc3RpY3MuICovCitsb2NhbGl6ZWRTdHJpbmdzWyJEaWFnbm9zdGljczogQCBFeHBlcmlt ZW50YWwgU2V0dGluZ3MiXSA9ICJEaWFnbm9zdGljczoiOwogLyogUHJvcGVydHkgdmFsdWUgZm9y IGBmb250LXZhcmlhbnQtbnVtZXJpYzogZGlhZ29uYWwtZnJhY3Rpb25zYC4gKi8KIGxvY2FsaXpl ZFN0cmluZ3NbIkRpYWdvbmFsIEZyYWN0aW9ucyBAIEZvbnQgRGV0YWlscyBTaWRlYmFyIFByb3Bl cnR5IFZhbHVlIl0gPSAiRGlhZ29uYWwgRnJhY3Rpb25zIjsKIGxvY2FsaXplZFN0cmluZ3NbIkRp bWVuc2lvbnMiXSA9ICJEaW1lbnNpb25zIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCA4MTNmZTZkNDFhZWZlZTIwZjU4MjRmZmIx YjQ0Yzk0ZjA0M2FjOTZiLi45OTc4MTVmM2MwYTI3ZjJkZjNlMmVmYjM2YTFkMmE5ODVhNGQ5OTI2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01h aW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWlu LmpzCkBAIC0xNjMsNiArMTYzLDcgQEAgV0kubG9hZGVkID0gZnVuY3Rpb24oKQogICAgIFdJLnBy aW50U3R5bGVzRW5hYmxlZCA9IGZhbHNlOwogICAgIFdJLnNldFpvb21GYWN0b3IoV0kuc2V0dGlu Z3Muem9vbUZhY3Rvci52YWx1ZSk7CiAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnNldEZvcmNl ZEFwcGVhcmFuY2UoV0kuc2V0dGluZ3MuZnJvbnRlbmRBcHBlYXJhbmNlLnZhbHVlKTsKKy8vICAg IEluc3BlY3RvckZyb250ZW5kSG9zdC5zZXRBbGxvd3NJbnNwZWN0aW5nSW5zcGVjdG9yKFdJLnNl dHRpbmdzLmV4cGVyaW1lbnRhbEFsbG93SW5zcGVjdGluZ0luc3BlY3Rvci52YWx1ZSk7CiAgICAg V0kubW91c2VDb29yZHMgPSB7eDogMCwgeTogMH07CiAgICAgV0kubW9kaWZpZXJLZXlzID0ge2Fs dEtleTogZmFsc2UsIG1ldGFLZXk6IGZhbHNlLCBzaGlmdEtleTogZmFsc2V9OwogICAgIFdJLnZp c2libGUgPSBmYWxzZTsKQEAgLTIzNCw2ICsyMzUsNyBAQCBXSS5jb250ZW50TG9hZGVkID0gZnVu Y3Rpb24oKQogICAgIFdJLnNldHRpbmdzLnNob3dKYXZhU2NyaXB0VHlwZUluZm9ybWF0aW9uLmFk ZEV2ZW50TGlzdGVuZXIoV0kuU2V0dGluZy5FdmVudC5DaGFuZ2VkLCBXSS5fc2hvd0phdmFTY3Jp cHRUeXBlSW5mb3JtYXRpb25TZXR0aW5nQ2hhbmdlZCwgV0kpOwogICAgIFdJLnNldHRpbmdzLmVu YWJsZUNvbnRyb2xGbG93UHJvZmlsZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50 LkNoYW5nZWQsIFdJLl9lbmFibGVDb250cm9sRmxvd1Byb2ZpbGVyU2V0dGluZ0NoYW5nZWQsIFdJ KTsKICAgICBXSS5zZXR0aW5ncy5yZXNvdXJjZUNhY2hpbmdEaXNhYmxlZC5hZGRFdmVudExpc3Rl bmVyKFdJLlNldHRpbmcuRXZlbnQuQ2hhbmdlZCwgV0kuX3Jlc291cmNlQ2FjaGluZ0Rpc2FibGVk U2V0dGluZ0NoYW5nZWQsIFdJKTsKKyAgICBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxBbGxvd0lu c3BlY3RpbmdJbnNwZWN0b3IuYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5n ZWQsIFdJLl9hbGxvd0luc3BlY3RpbmdJbnNwZWN0b3JTZXR0aW5nQ2hhbmdlZCwgV0kpOwogCiAg ICAgZnVuY3Rpb24gc2V0VGFiU2l6ZSgpIHsKICAgICAgICAgZG9jdW1lbnQuYm9keS5zdHlsZS50 YWJTaXplID0gV0kuc2V0dGluZ3MudGFiU2l6ZS52YWx1ZTsKQEAgLTI5NTYsNiArMjk1OCwxMSBA QCBXSS5fcmVzb3VyY2VDYWNoaW5nRGlzYWJsZWRTZXR0aW5nQ2hhbmdlZCA9IGZ1bmN0aW9uKGV2 ZW50KQogICAgICAgICB0YXJnZXQuTmV0d29ya0FnZW50LnNldFJlc291cmNlQ2FjaGluZ0Rpc2Fi bGVkKFdJLnNldHRpbmdzLnJlc291cmNlQ2FjaGluZ0Rpc2FibGVkLnZhbHVlKTsKIH07CiAKK1dJ Ll9hbGxvd0luc3BlY3RpbmdJbnNwZWN0b3JTZXR0aW5nQ2hhbmdlZCA9IGZ1bmN0aW9uKGV2ZW50 KQoreworICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5zZXRBbGxvd3NJbnNwZWN0aW5nSW5zcGVj dG9yKFdJLnNldHRpbmdzLmV4cGVyaW1lbnRhbEFsbG93SW5zcGVjdGluZ0luc3BlY3Rvci52YWx1 ZSk7Cit9CisKIFdJLm1lYXN1cmVFbGVtZW50ID0gZnVuY3Rpb24oZWxlbWVudCkKIHsKICAgICBX SS5sYXlvdXRNZWFzdXJlbWVudENvbnRhaW5lci5hcHBlbmRDaGlsZChlbGVtZW50LmNsb25lTm9k ZSh0cnVlKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL1NldHRpbmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL1NldHRpbmcuanMKaW5kZXggMTY0M2I4MWQ2ZThiMjBlNWQ2ODI2MzVkNjdjMWQ5MjA1Y2Yw ZThkMS4uMjgzYTI4Mjg5NzBlOWQxNzNiMjQxZTJhNTYzNmQ3YjZlY2U0MzJhNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcwpA QCAtMjI5LDYgKzIyOSw3IEBAIFdJLnNldHRpbmdzID0gewogICAgIGV4cGVyaW1lbnRhbEVuYWJs ZVN0eWxlc0p1bXBUb0VmZmVjdGl2ZTogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRhbC1zdHls ZXMtanVtcC10by1lZmZlY3RpdmUiLCBmYWxzZSksCiAgICAgZXhwZXJpbWVudGFsRW5hYmxlU3R5 bGVzSnVtcFRvVmFyaWFibGVEZWNsYXJhdGlvbjogbmV3IFdJLlNldHRpbmcoImV4cGVyaW1lbnRh bC1zdHlsZXMtanVtcC10by12YXJpYWJsZS1kZWNsYXJhdGlvbiIsIGZhbHNlKSwKICAgICBleHBl cmltZW50YWxDb2xsYXBzZUJsYWNrYm94ZWRDYWxsRnJhbWVzOiBuZXcgV0kuU2V0dGluZygiZXhw ZXJpbWVudGFsLWNvbGxhcHNlLWJsYWNrYm94ZWQtY2FsbC1mcmFtZXMiLCBmYWxzZSksCisgICAg ZXhwZXJpbWVudGFsQWxsb3dJbnNwZWN0aW5nSW5zcGVjdG9yOiBuZXcgV0kuU2V0dGluZygiZXhw ZXJpbWVudGFsLWFsbG93LWluc3BlY3RpbmctaW5zcGVjdG9yIiwgZmFsc2UpLAogCiAgICAgLy8g UHJvdG9jb2wKICAgICBwcm90b2NvbExvZ0FzVGV4dDogbmV3IFdJLlNldHRpbmcoInByb3RvY29s LWxvZy1hcy10ZXh0IiwgZmFsc2UpLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvRGVidWcvQm9vdHN0cmFwLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvRGVidWcvQm9vdHN0cmFwLmpzCmluZGV4IGM4YjFjNzY4YTg3ZDY1YmZj MTRjNWM3MWM3ODIxNzBmOWUxYmQ4ZWUuLmMxYWViNGE5NmI0ZmJiYjBkNzAxOWFiN2YwYzM2ZTRh Y2M2MWViYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0RlYnVnL0Jvb3RzdHJhcC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9EZWJ1Zy9Cb290c3RyYXAuanMKQEAgLTExNCw2ICsxMTQsNyBAQCBXSS5ydW5Cb290c3Ry YXBPcGVyYXRpb25zID0gZnVuY3Rpb24oKSB7CiAgICAgYXBwbHlEdW1wTWVzc2FnZXNTdGF0ZShk dW1wTWVzc2FnZXNDdXJyZW50U3RhdGUoKSk7CiAKICAgICAvLyBOZXh0IExldmVsIEluc3BlY3Rv ci4KKyAgICBXSS5zZXR0aW5ncy5leHBlcmltZW50YWxBbGxvd0luc3BlY3RpbmdJbnNwZWN0b3Iu dmFsdWUgPSB0cnVlOwogICAgIGxldCBpbnNwZWN0aW9uTGV2ZWwgPSBJbnNwZWN0b3JGcm9udGVu ZEhvc3QuaW5zcGVjdGlvbkxldmVsOwogICAgIGNvbnN0IGluc3BlY3RJbnNwZWN0b3JUb29sVGlw ID0gV0kudW5sb2NhbGl6ZWRTdHJpbmcoIk9wZW4gV2ViIEluc3BlY3RvciBbJWRdIikuZm9ybWF0 KGluc3BlY3Rpb25MZXZlbCArIDEpOwogICAgIGxldCBpbnNwZWN0SW5zcGVjdG9yVGFiQmFyTmF2 aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImluc3BlY3QtaW5zcGVj dG9yIiwgaW5zcGVjdEluc3BlY3RvclRvb2xUaXApOwpAQCAtMTI4LDcgKzEyOSw2IEBAIFdJLnJ1 bkJvb3RzdHJhcE9wZXJhdGlvbnMgPSBmdW5jdGlvbigpIHsKICAgICBdKTsKICAgICBXSS50YWJC YXIuYWRkTmF2aWdhdGlvbkl0ZW1BZnRlcihncm91cE5hdmlnYXRpb25JdGVtKTsKIAotCiAgICAg ZnVuY3Rpb24gc2V0Rm9jdXNEZWJ1Z091dGxpbmUoKSB7CiAgICAgICAgIGRvY3VtZW50LmJvZHku Y2xhc3NMaXN0LnRvZ2dsZSgiZm9jdXMtZGVidWciLCBXSS5zZXR0aW5ncy5kZWJ1Z091dGxpbmVG b2N1c2VkRWxlbWVudC52YWx1ZSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVu dFZpZXcuanMKaW5kZXggYTQ3NjM5MWY0YTJlYWY4ZGQxYmNlZmNlYjAzZWE4MzJkMDllYTU1Ny4u OWYzZjUyZWNhZjc5MzFkZjU2NGU5YmU1MWJlNjNiNGEyZTU0Mjk0YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50 Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T ZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCkBAIC00MDgsNiArNDA4LDEwIEBAIFdJLlNldHRpbmdz VGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0ku VGFiQ29udGVudFZpCiAgICAgICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2Vw YXJhdG9yKCk7CiAgICAgICAgIH0KIAorICAgICAgICBsZXQgZGlhZ25vc3RpY3NHcm91cCA9IGV4 cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRHcm91cChXSS5VSVN0cmluZygiRGlhZ25vc3RpY3M6 IiwgIkRpYWdub3N0aWNzOiBAIEV4cGVyaW1lbnRhbCBTZXR0aW5ncyIsICJDYXRlZ29yeSBsYWJl bCBmb3IgZXhwZXJpbWVudGFsIHNldHRpbmdzIHJlbGF0ZWQgdG8gV2ViIEluc3BlY3RvciBkaWFn bm9zdGljcy4iKSwgV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsQ29sbGFwc2VCbGFja2JveGVkQ2Fs bEZyYW1lcywgV0kuVUlTdHJpbmcoIkNvbGxhcHNlIGJsYWNrYm94ZWQgY2FsbCBmcmFtZXMiLCAi Q29sbGFwc2UgYmxhY2tib3hlZCBjYWxsIGZyYW1lcyBAIEV4cGVyaW1lbnRhbCBTZXR0aW5ncyIs ICJTZXR0aW5nIHRvIGNvbGxhcHNlIGJsYWNrYm94ZWQgY2FsbCBmcmFtZXMgaW4gdGhlIGRlYnVn Z2VyLiIpKTsKKyAgICAgICAgZGlhZ25vc3RpY3NHcm91cC5hZGRTZXR0aW5nKFdJLnNldHRpbmdz LmV4cGVyaW1lbnRhbEFsbG93SW5zcGVjdGluZ0luc3BlY3RvciwgV0kuVUlTdHJpbmcoIkFsbG93 IEluc3BlY3RpbmcgV2ViIEluc3BlY3RvciIsICJMYWJlbCBmb3Igc2V0dGluZyB0aGF0IGFsbG93 cyB0aGUgdXNlciB0byBpbnNwZWN0IHRoZSBXZWIgSW5zcGVjdG9yIHVzZXIgaW50ZXJmYWNlLiIp KTsKKyAgICAgICAgZXhwZXJpbWVudGFsU2V0dGluZ3NWaWV3LmFkZFNlcGFyYXRvcigpOworCiAg ICAgICAgIGxldCByZWxvYWRJbnNwZWN0b3JCdXR0b24gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJidXR0b24iKTsKICAgICAgICAgcmVsb2FkSW5zcGVjdG9yQnV0dG9uLnRleHRDb250ZW50ID0g V0kuVUlTdHJpbmcoIlJlbG9hZCBXZWIgSW5zcGVjdG9yIik7CiAgICAgICAgIHJlbG9hZEluc3Bl Y3RvckJ1dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIChldmVudCkgPT4gewo= 425945 2021-04-13 20:46:01 -0700 2021-04-14 16:42:11 -0700 Patch v1.1 bug-224082-20210413204600.patch text/plain 11740 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1OTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjYzZTFhNTQ1ZTU4N2Jh ZDBhMzM2Yjc2NjQ4YmExNGE4NTFjOTk2Yy4uN2NhODRhNGZmYTY4OTQwMTgzMzkwNTdkOTM1YTQw ODk0MTNmMDdlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA0LTEzICBCSiBC dXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBzZXR0 aW5nIHRvIGFsbG93IGluc3BlY3RpbmcgV2ViIEluc3BlY3RvcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0MDgyCisgICAgICAgIDxyZGFyOi8vNzU2 OTUwMDI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIGEgcHJvcGVydHkgdG8gY2hlY2sgaWYgaW5zcGVjdGluZyBpbnNwZWN0b3IgaXMgYWxsb3dl ZCwKKyAgICAgICAgYW5kIHRvIGVuYWJsZS9kaXNhYmxlIHVwb24gbG9hZGluZyB0aGUgZnJvbnRl bmQgb3IgdG9nZ2xpbmcgdGhlIHNldHRpbmcuCisKKyAgICAgICAgKiBlbi5scHJvai9Mb2NhbGl6 YWJsZS5zdHJpbmdzOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3Qu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmRIb3N0OjppbnNwZWN0SW5z cGVjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZyb250ZW5kSG9zdDo6YWxsb3dz SW5zcGVjdGluZ0luc3BlY3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVu ZEhvc3Q6OnNldEFsbG93c0luc3BlY3RpbmdJbnNwZWN0b3IpOgorICAgICAgICAqIGluc3BlY3Rv ci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmRIb3N0LmlkbDoKKwogMjAyMS0wNC0xMyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJp c3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIERpc2FibGUgWW91VHViZSBGbGFzaCBhbmQg UXVpY2tUaW1lIHBsdWcgaW4gcmVwbGFjZW1lbnRzIG9uIGlPUwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VM b2cKaW5kZXggMDNlMTI4NzY4NmU2MzY1OGI2M2MwYWIwZDViMTljMGIzYmEzNjIxNi4uMDVmMjZm YzFlNTg0ZGJmYWRmNDcxMzM0MDgxNDAwMWFjYmJkNzJlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDQtMTMgIEJKIEJ1cmcgIDxiYnVyZ0BhcHBsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIHNldHRpbmcgdG8gYWxsb3cgaW5zcGVj dGluZyBXZWIgSW5zcGVjdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMjQwODIKKyAgICAgICAgPHJkYXI6Ly83NTY5NTAwMj4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHRlbGxpbmcg Y3VyaW91cyB1c2VycyB0byBzZXQgdGhlIFdlYktpdERldmVsb3BlckV4dHJhcyBkZWZhdWx0LAor ICAgICAgICBleHBvc2UgYW4gZXhwZXJpbWVudGFsIHNldHRpbmcgdGhhdCBkb2VzIHRoZSBzYW1l IHRoaW5nLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAg IChXSS5sb2FkZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9TZXR0aW5nLmpzOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qczoK KwogMjAyMS0wNC0wNiAgQkogQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIg SW5zcGVjdG9yOiByZW1vdmUgZHVwbGljYXRlIEJveCBNb2RlbCBzZWN0aW9uIGZyb20gTGF5b3V0 IHBhbmVsIGluIEVsZW1lbnRzIFRhYgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNwcAppbmRleCA2NTc3NDIzY2MwYzY0YTlkNjU2MTFhNmRm ODc1NzhjZjY2ZTZjMjE2Li5mNjU3YWExZjBlMjBiYWIyYjlhMTA2YmIxMzYzMGYzMDIwZGEzNzNm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRI b3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRI b3N0LmNwcApAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDctMjAyMCBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDctMjAy MSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDgg TWF0dCBMaWxlayA8d2Via2l0QG1hdHRsaWxlay5jb20+CiAgKgogICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC01 NjMsMTAgKzU2MywxMCBAQCB2b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6YmVlcCgpCiAKIHZv aWQgSW5zcGVjdG9yRnJvbnRlbmRIb3N0OjppbnNwZWN0SW5zcGVjdG9yKCkKIHsKLSAgICBpZiAo bV9mcm9udGVuZFBhZ2UpIHsKLSAgICAgICAgbV9mcm9udGVuZFBhZ2UtPnNldHRpbmdzKCkuc2V0 RGV2ZWxvcGVyRXh0cmFzRW5hYmxlZCh0cnVlKTsKKyAgICBzZXRBbGxvd3NJbnNwZWN0aW5nSW5z cGVjdG9yKHRydWUpOworCisgICAgaWYgKG1fZnJvbnRlbmRQYWdlKQogICAgICAgICBtX2Zyb250 ZW5kUGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLnNob3coKTsKLSAgICB9CiB9CiAKIGJvb2wg SW5zcGVjdG9yRnJvbnRlbmRIb3N0Ojppc0JlaW5nSW5zcGVjdGVkKCkKQEAgLTU3OCw2ICs1Nzgs MTIgQEAgYm9vbCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OmlzQmVpbmdJbnNwZWN0ZWQoKQogICAg IHJldHVybiBpbnNwZWN0b3JDb250cm9sbGVyLmhhc0xvY2FsRnJvbnRlbmQoKSB8fCBpbnNwZWN0 b3JDb250cm9sbGVyLmhhc1JlbW90ZUZyb250ZW5kKCk7CiB9CiAKK3ZvaWQgSW5zcGVjdG9yRnJv bnRlbmRIb3N0OjpzZXRBbGxvd3NJbnNwZWN0aW5nSW5zcGVjdG9yKGJvb2wgYWxsb3cpCit7Cisg ICAgaWYgKG1fZnJvbnRlbmRQYWdlKQorICAgICAgICBtX2Zyb250ZW5kUGFnZS0+c2V0dGluZ3Mo KS5zZXREZXZlbG9wZXJFeHRyYXNFbmFibGVkKGFsbG93KTsKK30KKwogYm9vbCBJbnNwZWN0b3JG cm9udGVuZEhvc3Q6OnN1cHBvcnRzU2hvd0NlcnRpZmljYXRlKCkgY29uc3QKIHsKICNpZiBQTEFU Rk9STShDT0NPQSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JGcm9udGVuZEhvc3QuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9u dGVuZEhvc3QuaAppbmRleCA0NTA2NmI5YTgxYWMzM2NkN2JiODc3YWI4OTE5MmYyYjAzNWRjZmU5 Li44YjJkNTgwYjBmMzIyMzljZTllMjA2YTgxYTJkMGNkYzE0MzJlMDg3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5oCkBAIC0xMjksNiAr MTI5LDcgQEAgcHVibGljOgogICAgIHZvaWQgYmVlcCgpOwogICAgIHZvaWQgaW5zcGVjdEluc3Bl Y3RvcigpOwogICAgIGJvb2wgaXNCZWluZ0luc3BlY3RlZCgpOworICAgIHZvaWQgc2V0QWxsb3dz SW5zcGVjdGluZ0luc3BlY3Rvcihib29sKTsKIAogICAgIGJvb2wgc3VwcG9ydHNEaWFnbm9zdGlj TG9nZ2luZygpOwogI2lmIEVOQUJMRShJTlNQRUNUT1JfVEVMRU1FVFJZKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGwgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbAppbmRleCAzMmM1 NzQzYTBlNjNkNTgyMzk5ODEzZGRjMzAzMGE4MzQ0MjQ3OWYzLi45N2Y4MDZmMmFjMGYzMWI4OTZl NTk3MTE5NzliZGZhZmM3ZjhlYTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbApAQCAtOTIsNiArOTIsNyBAQAogICAgIHVuZGVm aW5lZCBiZWVwKCk7CiAgICAgdW5kZWZpbmVkIGluc3BlY3RJbnNwZWN0b3IoKTsKICAgICBib29s ZWFuIGlzQmVpbmdJbnNwZWN0ZWQoKTsKKyAgICB1bmRlZmluZWQgc2V0QWxsb3dzSW5zcGVjdGlu Z0luc3BlY3Rvcihib29sZWFuIGFsbG93KTsKIAogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBib29s ZWFuIHN1cHBvcnRzRGlhZ25vc3RpY0xvZ2dpbmc7CiAgICAgW0NvbmRpdGlvbmFsPUlOU1BFQ1RP Ul9URUxFTUVUUlldIHVuZGVmaW5lZCBsb2dEaWFnbm9zdGljRXZlbnQoRE9NU3RyaW5nIGV2ZW50 TmFtZSwgRE9NU3RyaW5nIGNvbnRlbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMK aW5kZXggMWYxMWM5NzFmZGIwNGY3ZDRjMmQwZGRlYjI0Y2RhODEyYTMwMTVkMS4uZmQyZGZkMzk0 NjViZThlNTBmZTJhZmM3N2U1ZjJmZTllYjNjMjc1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzCkBAIC0xNTIsNiArMTUyLDggQEAgbG9jYWxpemVkU3RyaW5nc1siQWxsIFRpbWVv dXRzIEAgRXZlbnQgQnJlYWtwb2ludCJdID0gIkFsbCBUaW1lb3V0cyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJBbGwgaXRlbXMgaW4gXHUwMDIyJXNcdTAwMjIgbXVzdCBiZSBlcnJvciBvYmplY3RzIl0g PSAiQWxsIGl0ZW1zIGluIFx1MDAyMiVzXHUwMDIyIG11c3QgYmUgZXJyb3Igb2JqZWN0cyI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJBbGwgaXRlbXMgaW4gXHUwMDIyJXNcdTAwMjIgbXVzdCBiZSBub24t ZW1wdHkgc3RyaW5ncyJdID0gIkFsbCBpdGVtcyBpbiBcdTAwMjIlc1x1MDAyMiBtdXN0IGJlIG5v bi1lbXB0eSBzdHJpbmdzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkFsbCBpdGVtcyBpbiBcdTAwMjIl c1x1MDAyMiBtdXN0IGJlIHZhbGlkIERPTSBub2RlcyJdID0gIkFsbCBpdGVtcyBpbiBcdTAwMjIl c1x1MDAyMiBtdXN0IGJlIHZhbGlkIERPTSBub2RlcyI7CisvKiBMYWJlbCBmb3Igc2V0dGluZyB0 aGF0IGFsbG93cyB0aGUgdXNlciB0byBpbnNwZWN0IHRoZSBXZWIgSW5zcGVjdG9yIHVzZXIgaW50 ZXJmYWNlLiAqLworbG9jYWxpemVkU3RyaW5nc1siQWxsb3cgSW5zcGVjdGluZyBXZWIgSW5zcGVj dG9yIEAgRXhwZXJpbWVudGFsIFNldHRpbmdzIl0gPSAiQWxsb3cgSW5zcGVjdGluZyBXZWIgSW5z cGVjdG9yIjsKIGxvY2FsaXplZFN0cmluZ3NbIkFsbG93IE1lZGlhIENhcHR1cmUgb24gSW5zZWN1 cmUgU2l0ZXMiXSA9ICJBbGxvdyBNZWRpYSBDYXB0dXJlIG9uIEluc2VjdXJlIFNpdGVzIjsKIC8q IFByb3BlcnR5IHRpdGxlIGZvciBgZm9udC12YXJpYW50LWFsdGVybmF0ZXNgLiAqLwogbG9jYWxp emVkU3RyaW5nc1siQWx0ZXJuYXRlIEdseXBocyBAIEZvbnQgRGV0YWlscyBTaWRlYmFyIFByb3Bl cnR5Il0gPSAiQWx0ZXJuYXRlIEdseXBocyI7CkBAIC00NTYsNiArNDU4LDggQEAgbG9jYWxpemVk U3RyaW5nc1siRGV0YWlscyBTaWRlYmFyczogQCBTZXR0aW5ncyBFbGVtZW50cyBQYW5lIl0gPSAi RGV0YWlscyBTaWRlYmEKIGxvY2FsaXplZFN0cmluZ3NbIkRldmljZSAlZCJdID0gIkRldmljZSAl ZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJEZXZpY2UgU2V0dGluZ3MiXSA9ICJEZXZpY2UgU2V0dGlu Z3MiOwogbG9jYWxpemVkU3RyaW5nc1siRGlhZ25vc2VzIGNvbW1vbiBhY2Nlc3NpYmlsaXR5IHBy b2JsZW1zIGFmZmVjdGluZyBzY3JlZW4gcmVhZGVycyBhbmQgb3RoZXIgYXNzaXN0aXZlIHRlY2hu b2xvZ3kuIl0gPSAiRGlhZ25vc2VzIGNvbW1vbiBhY2Nlc3NpYmlsaXR5IHByb2JsZW1zIGFmZmVj dGluZyBzY3JlZW4gcmVhZGVycyBhbmQgb3RoZXIgYXNzaXN0aXZlIHRlY2hub2xvZ3kuIjsKKy8q IENhdGVnb3J5IGxhYmVsIGZvciBleHBlcmltZW50YWwgc2V0dGluZ3MgcmVsYXRlZCB0byBXZWIg SW5zcGVjdG9yIGRpYWdub3N0aWNzLiAqLworbG9jYWxpemVkU3RyaW5nc1siRGlhZ25vc3RpY3M6 IEAgRXhwZXJpbWVudGFsIFNldHRpbmdzIl0gPSAiRGlhZ25vc3RpY3M6IjsKIC8qIFByb3BlcnR5 IHZhbHVlIGZvciBgZm9udC12YXJpYW50LW51bWVyaWM6IGRpYWdvbmFsLWZyYWN0aW9uc2AuICov CiBsb2NhbGl6ZWRTdHJpbmdzWyJEaWFnb25hbCBGcmFjdGlvbnMgQCBGb250IERldGFpbHMgU2lk ZWJhciBQcm9wZXJ0eSBWYWx1ZSJdID0gIkRpYWdvbmFsIEZyYWN0aW9ucyI7CiBsb2NhbGl6ZWRT dHJpbmdzWyJEaW1lbnNpb25zIl0gPSAiRGltZW5zaW9ucyI7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggODEzZmU2ZDQxYWVmZWUy MGY1ODI0ZmZiMWI0NGM5NGYwNDNhYzk2Yi4uY2ZkNTczMzJmODhkMTE3YmFmNGY1NTI3MGY3MGY3 ZGJiM2YxOGE5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvTWFpbi5qcwpAQCAtMTYzLDYgKzE2Myw3IEBAIFdJLmxvYWRlZCA9IGZ1bmN0aW9uKCkK ICAgICBXSS5wcmludFN0eWxlc0VuYWJsZWQgPSBmYWxzZTsKICAgICBXSS5zZXRab29tRmFjdG9y KFdJLnNldHRpbmdzLnpvb21GYWN0b3IudmFsdWUpOwogICAgIEluc3BlY3RvckZyb250ZW5kSG9z dC5zZXRGb3JjZWRBcHBlYXJhbmNlKFdJLnNldHRpbmdzLmZyb250ZW5kQXBwZWFyYW5jZS52YWx1 ZSk7CisgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnNldEFsbG93c0luc3BlY3RpbmdJbnNwZWN0 b3IoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsQWxsb3dJbnNwZWN0aW5nSW5zcGVjdG9yLnZhbHVl KTsKICAgICBXSS5tb3VzZUNvb3JkcyA9IHt4OiAwLCB5OiAwfTsKICAgICBXSS5tb2RpZmllcktl eXMgPSB7YWx0S2V5OiBmYWxzZSwgbWV0YUtleTogZmFsc2UsIHNoaWZ0S2V5OiBmYWxzZX07CiAg ICAgV0kudmlzaWJsZSA9IGZhbHNlOwpAQCAtMjM0LDYgKzIzNSw3IEBAIFdJLmNvbnRlbnRMb2Fk ZWQgPSBmdW5jdGlvbigpCiAgICAgV0kuc2V0dGluZ3Muc2hvd0phdmFTY3JpcHRUeXBlSW5mb3Jt YXRpb24uYWRkRXZlbnRMaXN0ZW5lcihXSS5TZXR0aW5nLkV2ZW50LkNoYW5nZWQsIFdJLl9zaG93 SmF2YVNjcmlwdFR5cGVJbmZvcm1hdGlvblNldHRpbmdDaGFuZ2VkLCBXSSk7CiAgICAgV0kuc2V0 dGluZ3MuZW5hYmxlQ29udHJvbEZsb3dQcm9maWxlci5hZGRFdmVudExpc3RlbmVyKFdJLlNldHRp bmcuRXZlbnQuQ2hhbmdlZCwgV0kuX2VuYWJsZUNvbnRyb2xGbG93UHJvZmlsZXJTZXR0aW5nQ2hh bmdlZCwgV0kpOwogICAgIFdJLnNldHRpbmdzLnJlc291cmNlQ2FjaGluZ0Rpc2FibGVkLmFkZEV2 ZW50TGlzdGVuZXIoV0kuU2V0dGluZy5FdmVudC5DaGFuZ2VkLCBXSS5fcmVzb3VyY2VDYWNoaW5n RGlzYWJsZWRTZXR0aW5nQ2hhbmdlZCwgV0kpOworICAgIFdJLnNldHRpbmdzLmV4cGVyaW1lbnRh bEFsbG93SW5zcGVjdGluZ0luc3BlY3Rvci5hZGRFdmVudExpc3RlbmVyKFdJLlNldHRpbmcuRXZl bnQuQ2hhbmdlZCwgV0kuX2FsbG93SW5zcGVjdGluZ0luc3BlY3RvclNldHRpbmdDaGFuZ2VkLCBX SSk7CiAKICAgICBmdW5jdGlvbiBzZXRUYWJTaXplKCkgewogICAgICAgICBkb2N1bWVudC5ib2R5 LnN0eWxlLnRhYlNpemUgPSBXSS5zZXR0aW5ncy50YWJTaXplLnZhbHVlOwpAQCAtMjk1Niw2ICsy OTU4LDExIEBAIFdJLl9yZXNvdXJjZUNhY2hpbmdEaXNhYmxlZFNldHRpbmdDaGFuZ2VkID0gZnVu Y3Rpb24oZXZlbnQpCiAgICAgICAgIHRhcmdldC5OZXR3b3JrQWdlbnQuc2V0UmVzb3VyY2VDYWNo aW5nRGlzYWJsZWQoV0kuc2V0dGluZ3MucmVzb3VyY2VDYWNoaW5nRGlzYWJsZWQudmFsdWUpOwog fTsKIAorV0kuX2FsbG93SW5zcGVjdGluZ0luc3BlY3RvclNldHRpbmdDaGFuZ2VkID0gZnVuY3Rp b24oZXZlbnQpCit7CisgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnNldEFsbG93c0luc3BlY3Rp bmdJbnNwZWN0b3IoV0kuc2V0dGluZ3MuZXhwZXJpbWVudGFsQWxsb3dJbnNwZWN0aW5nSW5zcGVj dG9yLnZhbHVlKTsKK30KKwogV0kubWVhc3VyZUVsZW1lbnQgPSBmdW5jdGlvbihlbGVtZW50KQog ewogICAgIFdJLmxheW91dE1lYXN1cmVtZW50Q29udGFpbmVyLmFwcGVuZENoaWxkKGVsZW1lbnQu Y2xvbmVOb2RlKHRydWUpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvU2V0dGluZy5qcwppbmRleCAxNjQzYjgxZDZlOGIyMGU1ZDY4MjYzNWQ2N2Mx ZDkyMDVjZjBlOGQxLi4yODNhMjgyODk3MGU5ZDE3M2IyNDFlMmE1NjM2ZDdiNmVjZTQzMmE3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1NldHRp bmcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9TZXR0 aW5nLmpzCkBAIC0yMjksNiArMjI5LDcgQEAgV0kuc2V0dGluZ3MgPSB7CiAgICAgZXhwZXJpbWVu dGFsRW5hYmxlU3R5bGVzSnVtcFRvRWZmZWN0aXZlOiBuZXcgV0kuU2V0dGluZygiZXhwZXJpbWVu dGFsLXN0eWxlcy1qdW1wLXRvLWVmZmVjdGl2ZSIsIGZhbHNlKSwKICAgICBleHBlcmltZW50YWxF bmFibGVTdHlsZXNKdW1wVG9WYXJpYWJsZURlY2xhcmF0aW9uOiBuZXcgV0kuU2V0dGluZygiZXhw ZXJpbWVudGFsLXN0eWxlcy1qdW1wLXRvLXZhcmlhYmxlLWRlY2xhcmF0aW9uIiwgZmFsc2UpLAog ICAgIGV4cGVyaW1lbnRhbENvbGxhcHNlQmxhY2tib3hlZENhbGxGcmFtZXM6IG5ldyBXSS5TZXR0 aW5nKCJleHBlcmltZW50YWwtY29sbGFwc2UtYmxhY2tib3hlZC1jYWxsLWZyYW1lcyIsIGZhbHNl KSwKKyAgICBleHBlcmltZW50YWxBbGxvd0luc3BlY3RpbmdJbnNwZWN0b3I6IG5ldyBXSS5TZXR0 aW5nKCJleHBlcmltZW50YWwtYWxsb3ctaW5zcGVjdGluZy1pbnNwZWN0b3IiLCBmYWxzZSksCiAK ICAgICAvLyBQcm90b2NvbAogICAgIHByb3RvY29sTG9nQXNUZXh0OiBuZXcgV0kuU2V0dGluZygi cHJvdG9jb2wtbG9nLWFzLXRleHQiLCBmYWxzZSksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9EZWJ1Zy9Cb290c3RyYXAuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9EZWJ1Zy9Cb290c3RyYXAuanMKaW5kZXggYzhiMWM3Njhh ODdkNjViZmMxNGM1YzcxYzc4MjE3MGY5ZTFiZDhlZS4uM2MwNWFiYjY4NjkzODc2NjI3NTliNWNm YzBmYTQzNzBjZWVkNzU4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvRGVidWcvQm9vdHN0cmFwLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0RlYnVnL0Jvb3RzdHJhcC5qcwpAQCAtMTI4LDcgKzEyOCw2IEBAIFdJLnJ1 bkJvb3RzdHJhcE9wZXJhdGlvbnMgPSBmdW5jdGlvbigpIHsKICAgICBdKTsKICAgICBXSS50YWJC YXIuYWRkTmF2aWdhdGlvbkl0ZW1BZnRlcihncm91cE5hdmlnYXRpb25JdGVtKTsKIAotCiAgICAg ZnVuY3Rpb24gc2V0Rm9jdXNEZWJ1Z091dGxpbmUoKSB7CiAgICAgICAgIGRvY3VtZW50LmJvZHku Y2xhc3NMaXN0LnRvZ2dsZSgiZm9jdXMtZGVidWciLCBXSS5zZXR0aW5ncy5kZWJ1Z091dGxpbmVG b2N1c2VkRWxlbWVudC52YWx1ZSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVu dFZpZXcuanMKaW5kZXggYTQ3NjM5MWY0YTJlYWY4ZGQxYmNlZmNlYjAzZWE4MzJkMDllYTU1Ny4u ZDU5YjZmZTkzOTVhMDFiYjMxMGUzODlhYzE3MTFmNWE3MTkxMWRlNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50 Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T ZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCkBAIC00MDgsNiArNDA4LDEwIEBAIFdJLlNldHRpbmdz VGFiQ29udGVudFZpZXcgPSBjbGFzcyBTZXR0aW5nc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0ku VGFiQ29udGVudFZpCiAgICAgICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2Vw YXJhdG9yKCk7CiAgICAgICAgIH0KIAorICAgICAgICBsZXQgZGlhZ25vc3RpY3NHcm91cCA9IGV4 cGVyaW1lbnRhbFNldHRpbmdzVmlldy5hZGRHcm91cChXSS5VSVN0cmluZygiRGlhZ25vc3RpY3M6 IiwgIkRpYWdub3N0aWNzOiBAIEV4cGVyaW1lbnRhbCBTZXR0aW5ncyIsICJDYXRlZ29yeSBsYWJl bCBmb3IgZXhwZXJpbWVudGFsIHNldHRpbmdzIHJlbGF0ZWQgdG8gV2ViIEluc3BlY3RvciBkaWFn bm9zdGljcy4iKSk7CisgICAgICAgIGRpYWdub3N0aWNzR3JvdXAuYWRkU2V0dGluZyhXSS5zZXR0 aW5ncy5leHBlcmltZW50YWxBbGxvd0luc3BlY3RpbmdJbnNwZWN0b3IsIFdJLlVJU3RyaW5nKCJB bGxvdyBJbnNwZWN0aW5nIFdlYiBJbnNwZWN0b3IiLCAiQWxsb3cgSW5zcGVjdGluZyBXZWIgSW5z cGVjdG9yIEAgRXhwZXJpbWVudGFsIFNldHRpbmdzIiwgIkxhYmVsIGZvciBzZXR0aW5nIHRoYXQg YWxsb3dzIHRoZSB1c2VyIHRvIGluc3BlY3QgdGhlIFdlYiBJbnNwZWN0b3IgdXNlciBpbnRlcmZh Y2UuIikpOworICAgICAgICBleHBlcmltZW50YWxTZXR0aW5nc1ZpZXcuYWRkU2VwYXJhdG9yKCk7 CisKICAgICAgICAgbGV0IHJlbG9hZEluc3BlY3RvckJ1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImJ1dHRvbiIpOwogICAgICAgICByZWxvYWRJbnNwZWN0b3JCdXR0b24udGV4dENvbnRl bnQgPSBXSS5VSVN0cmluZygiUmVsb2FkIFdlYiBJbnNwZWN0b3IiKTsKICAgICAgICAgcmVsb2Fk SW5zcGVjdG9yQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgKGV2ZW50KSA9PiB7Cg==