225202 2021-04-29 12:12:17 -0700 REGRESSION: [iOS] 6 media/modern-media-controls/tracks-support/ tests timing out 2021-04-29 16:44:38 -0700 1 1 1 Unclassified WebKit Media Other iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 akeerthi akeerthi eric.carlson ews-watchlist glenn hi jer.noble philipj sergio thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1755487 0 akeerthi 2021-04-29 12:12:17 -0700 ... 1755488 1 akeerthi 2021-04-29 12:12:30 -0700 <rdar://problem/77041631> 1755489 2 427367 akeerthi 2021-04-29 12:14:05 -0700 Created attachment 427367 Patch 1755492 3 427367 hi 2021-04-29 12:24:18 -0700 Comment on attachment 427367 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427367&action=review r=me > LayoutTests/ChangeLog:14 > + of the <video> element was increased. However, on iOS, this led to the > + tracks button being positioned outside the viewport. Consequently, any LOL!!! I did not think of this at all! Great catch! > LayoutTests/ChangeLog:30 > + which lead to getTracksContextMenu() getting called before the tap > + actually completed. UIScriptController clears all callbacks after one Oh wow that is a *subtle* detail of UIScriptController :( Why was it made like this? I would think that one kind of callback wouldn't affect any other kind of callback? Personally I prefer the approach of establishing listeners/callbacks for actions before the action occurs so that there's no chance of it being missed (I also think it reads nicer). > LayoutTests/media/modern-media-controls/resources/media-controls-utils.js:49 > +function pressOnElementAsync(element) NIT: I feel like "Async" isn't the right name for this since `pressOnElement` also takes a `continuation` callback. Maybe `promisifiedPressOnElement`, or even just having `pressOnElement` return a `Promise` if it's not provided a `continuation`? ``` let promise = null; if (typeof continuation !== "function") { promise = new Promise((resolve, reject) => { continuation = resolve; }); } ... return promise || true; ``` 1755501 4 427370 akeerthi 2021-04-29 12:53:47 -0700 Created attachment 427370 Patch for landing 1755505 5 akeerthi 2021-04-29 12:56:14 -0700 (In reply to Devin Rousso from comment #3) > Comment on attachment 427367 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=427367&action=review > > r=me > > > LayoutTests/ChangeLog:14 > > + of the <video> element was increased. However, on iOS, this led to the > > + tracks button being positioned outside the viewport. Consequently, any > > LOL!!! I did not think of this at all! Great catch! > > > LayoutTests/ChangeLog:30 > > + which lead to getTracksContextMenu() getting called before the tap > > + actually completed. UIScriptController clears all callbacks after one > > Oh wow that is a *subtle* detail of UIScriptController :( > > Why was it made like this? I would think that one kind of callback wouldn't > affect any other kind of callback? Personally I prefer the approach of > establishing listeners/callbacks for actions before the action occurs so > that there's no chance of it being missed (I also think it reads nicer). The logic to clear callbacks on `uiScriptComplete` was added in https://trac.webkit.org/changeset/192039/webkit, to prevent callbacks from sticking around in later tests. > > LayoutTests/media/modern-media-controls/resources/media-controls-utils.js:49 > > +function pressOnElementAsync(element) > > NIT: I feel like "Async" isn't the right name for this since > `pressOnElement` also takes a `continuation` callback. Maybe > `promisifiedPressOnElement`, or even just having `pressOnElement` return a > `Promise` if it's not provided a `continuation`? > ``` > let promise = null; > if (typeof continuation !== "function") { > promise = new Promise((resolve, reject) => { > continuation = resolve; > }); > } > ... > return promise || true; > ``` Thanks for code snippet! I've made `pressOnElement` return a `Promise` if it's not provided a `continuation`. 1755577 6 ews-feeder 2021-04-29 16:44:37 -0700 Committed r276822 (237177@main): <https://commits.webkit.org/237177@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427370. 427367 2021-04-29 12:14:05 -0700 2021-04-29 12:53:44 -0700 Patch bug-225202-20210429151404.patch text/plain 15184 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NzA3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMmQ3YjViNmQzYjhkMTNhMTRmZmM3 NDg3ODZmMmMxOTQyZWQ2NTYwMS4uOGRkNDJjOTVjNTMyODBkN2Y5NmNkMmRjODVkMWVkZWI4Nzlh YzBhZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDIxLTA0LTI5ICBBZGl0eWEgS2VlcnRoaSAg PGFrZWVydGhpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OOiBbaU9TXSA2IG1lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC8gdGVzdHMgdGltaW5nIG91dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MjAyCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NzA0MTYzMT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgc2l4IHRlc3RzIG1vZGlmaWVkIGluIHRoaXMg cGF0Y2ggd2VyZSBmYWlsaW5nIGZvciB0d28gcmVhc29uczoKKworICAgICAgICAxLiBUaGUgbWVk aWEgY29udHJvbHMgbG9naWMgd2FzIG1vZGlmaWVkIHRvIGhpZGUgY2VydGFpbiBjb250cm9scyBh dAorICAgICAgICBzbWFsbGVyIHdpZHRocy4gVG8gZW5zdXJlIHRoZSB0cmFja3MgYnV0dG9uIHdh cyB2aXNpYmxlLCB0aGUgd2lkdGgKKyAgICAgICAgb2YgdGhlIDx2aWRlbz4gZWxlbWVudCB3YXMg aW5jcmVhc2VkLiBIb3dldmVyLCBvbiBpT1MsIHRoaXMgbGVkIHRvIHRoZQorICAgICAgICB0cmFj a3MgYnV0dG9uIGJlaW5nIHBvc2l0aW9uZWQgb3V0c2lkZSB0aGUgdmlld3BvcnQuIENvbnNlcXVl bnRseSwgYW55CisgICAgICAgIGF0dGVtcHRzIHRvIHRhcCB0aGUgYnV0dG9uIGFuZCB3YWl0IGZv ciBhIGNvbnRleHQgbWVudSB0byBzaG93IHVwCisgICAgICAgIHdvdWxkIGZhaWwsIGNhdXNpbmcg dGhlIHRlc3RzIHRvIHRpbWVvdXQgd2FpdGluZyBmb3IgYSBjb250ZXh0IG1lbnUuCisKKyAgICAg ICAgVG8gZml4ICgxKSwgY2FsbCBFbGVtZW50LnNjcm9sbEludG9WaWV3SWZOZWVkZWQgYmVmb3Jl IGF0dGVtcHRpbmcgdG8KKyAgICAgICAgdGFwIG9uIHRoZSB0cmFja3MgYnV0dG9uLCBlbnN1cmlu ZyBpdCBpcyB2aXNpYmxlIGluIHRoZSB2aWV3cG9ydC4gVGhlbiwKKyAgICAgICAgdXNlIHdpbmRv dyBjb29yZGluYXRlcyB0byB0YXAgYXQgdGhlIHJpZ2h0IHBvc2l0aW9uLiBUbyBlbnN1cmUgdGhl CisgICAgICAgIHZpZXdwb3J0IGlzIGFjdHVhbGx5IHNjcm9sbGFibGUgb24gaU9TLCAidXNlRmxl eGlibGVWaWV3cG9ydCIgYW5kIHRoZQorICAgICAgICB2aWV3cG9ydCBtZXRhIHRhZyB3ZXJlIGFk ZGVkIHRvIGZhaWxpbmcgdGVzdHMuCisKKyAgICAgICAgMi4gRXZlbiBhZnRlciBmaXhpbmcgKDEp LCB0aGUgdGVzdHMgY29udGludWVkIHRvIHRpbWVvdXQuIE5vdGUgdGhhdAorICAgICAgICBib3Ro IHRoZSBwcmVzc09uRWxlbWVudCgpIGFuZCBnZXRUcmFja3NDb250ZXh0TWVudSgpIGhlbHBlciBt ZXRob2RzCisgICAgICAgIGluICJtZWRpYS1jb250cm9scy11dGlscy5qcyIgY2FsbCBpbnRvIFVJ U2NyaXB0Q29udHJvbGxlciwgYW5kIGFyZQorICAgICAgICBjYWxsZWQgaW4gc3VjY2Vzc2lvbiBp biB0aGUgZmFpbGluZyB0ZXN0cy4gQm90aCBtZXRob2RzIGFkZCBjYWxsYmFja3MKKyAgICAgICAg dG8gdGhlIHRlc3QgcnVubmVyLiBIb3dldmVyLCBwcmVzc09uRWxlbWVudCgpIGlzIG5vdCBhbiBh c3luYyBtZXRob2QsCisgICAgICAgIHdoaWNoIGxlYWQgdG8gZ2V0VHJhY2tzQ29udGV4dE1lbnUo KSBnZXR0aW5nIGNhbGxlZCBiZWZvcmUgdGhlIHRhcAorICAgICAgICBhY3R1YWxseSBjb21wbGV0 ZWQuIFVJU2NyaXB0Q29udHJvbGxlciBjbGVhcnMgYWxsIGNhbGxiYWNrcyBhZnRlciBvbmUKKyAg ICAgICAgY2FsbGJhY2sgY29tcGxldGVzLCBzbyB3aGVuIHRoZSB0YXAgY2FsbGJhY2sgd2FzIGNv bXBsZXRlZCwgdGhlIGNvbnRleHQKKyAgICAgICAgbWVudSBjYWxsYmFjayB3YXMgcmVtb3ZlZC4g VGhlbiwgdGhlIHRlc3RzIGdldCBzdHVjayB3YWl0aW5nIG9uIHRoZQorICAgICAgICBjb250ZXh0 IG1lbnUgY2FsbGJhY2sgdG8gZ2V0IGludm9rZWQuCisKKyAgICAgICAgVG8gZml4ICgyKSwgYWRk IGFuIGFzeW5jIHZlcnNpb24gb2YgcHJlc3NPbkVsZW1lbnQoKSwgc28gdGhhdAorICAgICAgICBn ZXRUcmFja3NDb250ZXh0TWVudSgpIGlzIG9ubHkgY2FsbGVkIG9uY2UgdGhlIHRhcCBoYXMgY29t cGxldGVkLgorCisgICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3Jlc291cmNl cy9tZWRpYS1jb250cm9scy11dGlscy5qczoKKyAgICAgICAgKHByZXNzT25FbGVtZW50QXN5bmMp OgorICAgICAgICAocHJlc3NPbkVsZW1lbnQpOgorICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRp YS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9hdXRvLXRleHQtdHJhY2suaHRtbDoKKyAgICAgICAg KiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvY2xpY2stdHJhY2st aW4tY29udGV4dG1lbnUuaHRtbDoKKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJv bHMvdHJhY2tzLXN1cHBvcnQvaGlkZGVuLXRyYWNrcy5odG1sOgorICAgICAgICAqIG1lZGlhL21v ZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9vZmYtdGV4dC10cmFjay5odG1sOgor ICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9zaG93 LWNvbnRleHRtZW51LXRoZW4tZG91YmxlLWNsaWNrLW9uLXRyYWNrcy1idXR0b24uaHRtbDoKKyAg ICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdGV4dC10 cmFjay1zZWxlY3RlZC12aWEtbWVkaWEtYXBpLmh0bWw6CisKIDIwMjEtMDQtMjggIEFkaXR5YSBL ZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IG1lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS1jb250cm9sbGVyL2lvcy9tZWRpYS1jb250cm9s bGVyLWlvcy1kby1ub3QtaGlkZS1jb250cm9scy13aGVuLXRhcHBpbmctYnV0dG9uLmh0bWwgaXMg dGltaW5nIG91dApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL3Jlc291cmNlcy9tZWRpYS1jb250cm9scy11dGlscy5qcyBiL0xheW91dFRlc3RzL21l ZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9yZXNvdXJjZXMvbWVkaWEtY29udHJvbHMtdXRpbHMu anMKaW5kZXggZjZlODVhMTdkMDBkZTQwMzMxZmQxODBjYzkxZmM0OWYzNjJlNzUxMC4uNDNkNWQ0 NWZmOTc5NWM5NmEyZGUzYjhiOTdhMzBiMDNkN2I1YThkOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3Jlc291cmNlcy9tZWRpYS1jb250cm9scy11 dGlscy5qcworKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvcmVz b3VyY2VzL21lZGlhLWNvbnRyb2xzLXV0aWxzLmpzCkBAIC00NiwxOSArNDYsMjYgQEAgZnVuY3Rp b24gc2hvdWxkQmVFcXVhbFRvUkdCQUNvbG9yKGV4cHIsIGV4cGVjdGVkQ29sb3IpCiAgICAgc2hv dWxkQmVDbG9zZVRvKGByZ2JhKCR7ZXhwcn0pLmFgLCBleHBlY3RlZFJHQkEuYSwgMC4wMDEpOwog fQogCitmdW5jdGlvbiBwcmVzc09uRWxlbWVudEFzeW5jKGVsZW1lbnQpCit7CisgICAgcmV0dXJu IG5ldyBQcm9taXNlKChyZXNvbHZlKSA9PiB7CisgICAgICAgIHByZXNzT25FbGVtZW50KGVsZW1l bnQsIHJlc29sdmUpOworICAgIH0pOworfQorCiBmdW5jdGlvbiBwcmVzc09uRWxlbWVudChlbGVt ZW50LCBjb250aW51YXRpb24pCiB7CiAgICAgaWYgKHR5cGVvZiBjb250aW51YXRpb24gIT09ICJm dW5jdGlvbiIpCiAgICAgICAgIGNvbnRpbnVhdGlvbiA9IG5ldyBGdW5jdGlvbjsKIAorICAgIGVs ZW1lbnQuc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZChmYWxzZSk7CisKICAgICBjb25zdCBib3VuZHMg PSBlbGVtZW50LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOwogICAgIGlmIChib3VuZHMud2lkdGgg PT09IDAgfHwgYm91bmRzLmhlaWdodCA9PT0gMCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgY29uc3QgY2VudGVyWCA9IGJvdW5kcy5sZWZ0ICsgYm91bmRzLndpZHRoIC8gMjsKLSAgICBj b25zdCBjZW50ZXJZID0gYm91bmRzLnRvcCArIGJvdW5kcy5oZWlnaHQgLyAyOwotCi0gICAgLy8g ZGVidWcoYFRyeWluZyB0byBwcmVzcyBvbiAmbHQ7JHtlbGVtZW50LmxvY2FsTmFtZX0gY2xhc3M9 IiR7ZWxlbWVudC5jbGFzc05hbWV9Ij4gYXQgJHtjZW50ZXJYfXgke2NlbnRlcll9LmApOworICAg IGNvbnN0IGNlbnRlclggPSB3aW5kb3cuc2Nyb2xsWCArIGJvdW5kcy5sZWZ0ICsgYm91bmRzLndp ZHRoIC8gMjsKKyAgICBjb25zdCBjZW50ZXJZID0gd2luZG93LnNjcm9sbFkgKyBib3VuZHMudG9w ICsgYm91bmRzLmhlaWdodCAvIDI7CiAKICAgICBwcmVzc0F0UG9pbnQoY2VudGVyWCwgY2VudGVy WSwgY29udGludWF0aW9uKTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJu LW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2F1dG8tdGV4dC10cmFjay5odG1sIGIvTGF5 b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2F1dG8t dGV4dC10cmFjay5odG1sCmluZGV4IGFkODViNjgzN2U5NTM0MmY0YzlkOTk4NmMyYWQ3MjIzYjU2 MGM3YjAuLmU2MDkyZTU2ZjJmNTEzNWYwYTQwYWViNWYwNDljMWVmYTU0YjcyNjcgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9y dC9hdXRvLXRleHQtdHJhY2suaHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVk aWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvYXV0by10ZXh0LXRyYWNrLmh0bWwKQEAgLTEsNCAr MSw1IEBACi08IURPQ1RZUEUgaHRtbD4KKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0 LXJ1bm5lciBbIHVzZUZsZXhpYmxlVmlld3BvcnQ9dHJ1ZSBdIC0tPgorPG1ldGEgbmFtZT0idmll d3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCI+CiA8c2NyaXB0IHNyYz0iLi4vcmVz b3VyY2VzL21lZGlhLWNvbnRyb2xzLXV0aWxzLmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSIu Li8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSIu Li8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgpAQCAtMjYsMTAgKzI3 LDkgQEAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigicGxheSIsICgpID0+IHsKICAgICAgICAgICAg IHdpbmRvdy5pbnRlcm5hbHMuc2V0Q2FwdGlvbkRpc3BsYXlNb2RlKCJhdXRvbWF0aWMiKTsKIAog ICAgICAgICAgICAgZGVidWcoIlRhcHBpbmcgdHJhY2tzIGJ1dHRvbi4uLiIpOwotICAgICAgICAg ICAgbGV0IFtjb250ZXh0bWVudV0gPSBhd2FpdCBQcm9taXNlLmFsbChbCi0gICAgICAgICAgICAg ICAgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKSwKLSAgICAgICAgICAgICAgICBwcmVzc09uRWxlbWVu dChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSksCi0gICAgICAgICAg ICBdKTsKKyAgICAgICAgICAgIGF3YWl0IHByZXNzT25FbGVtZW50QXN5bmMoc2hhZG93Um9vdC5x dWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpOworICAgICAgICAgICAgY29udGV4dG1lbnUg PSBhd2FpdCBnZXRUcmFja3NDb250ZXh0TWVudSgpOworCiAgICAgICAgICAgICBsZXQgc3VidGl0 bGVzTWVudSA9IGNvbnRleHRtZW51WzBdLmNoaWxkcmVuLmZpbmQoKHN1Ym1lbnUpID0+IHN1Ym1l bnUudGl0bGUgPT09ICJTdWJ0aXRsZXMiKTsKICAgICAgICAgICAgIGlmIChzdWJ0aXRsZXNNZW51 Py5jaGlsZHJlbj8ubGVuZ3RoKSB7CiAgICAgICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuY2hv b3NlTWVudUFjdGlvbihzdWJ0aXRsZXNNZW51LnRpdGxlKTsKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9jbGljay10cmFj ay1pbi1jb250ZXh0bWVudS5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL3RyYWNrcy1zdXBwb3J0L2NsaWNrLXRyYWNrLWluLWNvbnRleHRtZW51Lmh0bWwKaW5k ZXggZWE3MTdhOGJhZWY1YmViOGQwNjViMWY1MDc5NmFjM2MxYjAyYjAyNC4uNTJmNWYxZjM2ZTQ2 ZDM0MjViOTI0Y2IwNWE2NWQ1YWI4MjA3YzkyNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVk aWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2NsaWNrLXRyYWNrLWluLWNv bnRleHRtZW51Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL3RyYWNrcy1zdXBwb3J0L2NsaWNrLXRyYWNrLWluLWNvbnRleHRtZW51Lmh0bWwKQEAgLTEs NCArMSw1IEBACi08IURPQ1RZUEUgaHRtbD4KKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10 ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxlVmlld3BvcnQ9dHJ1ZSBdIC0tPgorPG1ldGEgbmFtZT0i dmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCI+CiA8c2NyaXB0IHNyYz0iLi4v cmVzb3VyY2VzL21lZGlhLWNvbnRyb2xzLXV0aWxzLmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3Jj PSIuLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3Jj PSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0 L2hpZGRlbi10cmFja3MuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250 cm9scy90cmFja3Mtc3VwcG9ydC9oaWRkZW4tdHJhY2tzLmh0bWwKaW5kZXggN2I1ZDgyM2E3Nzk0 MTMxZDU4ZGY3MmFiNDJjNGQzYWRiYjMwZjIzYS4uOTg1NWJiNzg1YzE3MmZlNmIzYzY3YWRlMWFh NmRmMjI1NjQxMGNlOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2hpZGRlbi10cmFja3MuaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvaGlkZGVuLXRy YWNrcy5odG1sCkBAIC0xLDQgKzEsNSBAQAotPCFET0NUWVBFIGh0bWw+Cis8IURPQ1RZUEUgaHRt bD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyB1c2VGbGV4aWJsZVZpZXdwb3J0PXRydWUgXSAt LT4KKzxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgiPgog PHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9tZWRpYS1jb250cm9scy11dGlscy5qcyI+PC9zY3Jp cHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3Jp cHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3Nj cmlwdD4KQEAgLTI3LDEwICsyOCw5IEBAIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIoInBsYXkiLCAo KSA9PiB7CiAgICAgICAgICAgICAgICAgdGV4dFRyYWNrLm1vZGUgPSAiaGlkZGVuIjsKIAogICAg ICAgICAgICAgZGVidWcoIlRhcHBpbmcgdHJhY2tzIGJ1dHRvbi4uLiIpOwotICAgICAgICAgICAg bGV0IFtjb250ZXh0bWVudV0gPSBhd2FpdCBQcm9taXNlLmFsbChbCi0gICAgICAgICAgICAgICAg Z2V0VHJhY2tzQ29udGV4dE1lbnUoKSwKLSAgICAgICAgICAgICAgICBwcmVzc09uRWxlbWVudChz aGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSksCi0gICAgICAgICAgICBd KTsKKyAgICAgICAgICAgIGF3YWl0IHByZXNzT25FbGVtZW50QXN5bmMoc2hhZG93Um9vdC5xdWVy eVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpOworICAgICAgICAgICAgY29udGV4dG1lbnUgPSBh d2FpdCBnZXRUcmFja3NDb250ZXh0TWVudSgpOworCiAgICAgICAgICAgICBsZXQgc3VidGl0bGVz TWVudSA9IGNvbnRleHRtZW51WzBdLmNoaWxkcmVuLmZpbmQoKHN1Ym1lbnUpID0+IHN1Ym1lbnUu dGl0bGUgPT09ICJTdWJ0aXRsZXMiKTsKICAgICAgICAgICAgIGlmIChzdWJ0aXRsZXNNZW51Py5j aGlsZHJlbj8ubGVuZ3RoKSB7CiAgICAgICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuY2hvb3Nl TWVudUFjdGlvbihzdWJ0aXRsZXNNZW51LnRpdGxlKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9vZmYtdGV4dC10cmFj ay5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1z dXBwb3J0L29mZi10ZXh0LXRyYWNrLmh0bWwKaW5kZXggYWY3ZGUwNjc5ZjI0NTQwOWU1NTNiNGRl YWI4Y2E0MTg4MTRiNzg1My4uYmNhZDVjYTZjNzBlNTUxZDg2MzI3MmRhMDdlZTE5NWI5ODAxYTc5 MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3Ry YWNrcy1zdXBwb3J0L29mZi10ZXh0LXRyYWNrLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEv bW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L29mZi10ZXh0LXRyYWNrLmh0bWwK QEAgLTEsNCArMSw1IEBACi08IURPQ1RZUEUgaHRtbD4KKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdl YmtpdC10ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxlVmlld3BvcnQ9dHJ1ZSBdIC0tPgorPG1ldGEg bmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCI+CiA8c2NyaXB0IHNy Yz0iLi4vcmVzb3VyY2VzL21lZGlhLWNvbnRyb2xzLXV0aWxzLmpzIj48L3NjcmlwdD4KIDxzY3Jp cHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3NjcmlwdD4KIDxzY3Jp cHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgpAQCAt MjMsMTAgKzI0LDkgQEAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigicGxheSIsICgpID0+IHsKICAg ICBzaG91bGRCZWNvbWVEaWZmZXJlbnQoInNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcignYnV0dG9u LnRyYWNrcycpIiwgIm51bGwiLCAoKSA9PiB7CiAgICAgICAgIHNob3VsZEJlY29tZURpZmZlcmVu dCgic2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCdidXR0b24udHJhY2tzJykuZ2V0Qm91bmRpbmdD bGllbnRSZWN0KCkud2lkdGgiLCAiMCIsIGFzeW5jICgpID0+IHsKICAgICAgICAgICAgIGRlYnVn KCJUYXBwaW5nIHRyYWNrcyBidXR0b24uLi4iKTsKLSAgICAgICAgICAgIGxldCBbY29udGV4dG1l bnVdID0gYXdhaXQgUHJvbWlzZS5hbGwoWwotICAgICAgICAgICAgICAgIGdldFRyYWNrc0NvbnRl eHRNZW51KCksCi0gICAgICAgICAgICAgICAgcHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVy eVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpLAotICAgICAgICAgICAgXSk7CisgICAgICAgICAg ICBhd2FpdCBwcmVzc09uRWxlbWVudEFzeW5jKHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcigiYnV0 dG9uLnRyYWNrcyIpKTsKKyAgICAgICAgICAgIGNvbnRleHRtZW51ID0gYXdhaXQgZ2V0VHJhY2tz Q29udGV4dE1lbnUoKTsKKwogICAgICAgICAgICAgbGV0IHN1YnRpdGxlc01lbnUgPSBjb250ZXh0 bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBzdWJtZW51LnRpdGxlID09PSAiU3Vi dGl0bGVzIik7CiAgICAgICAgICAgICBpZiAoc3VidGl0bGVzTWVudT8uY2hpbGRyZW4/Lmxlbmd0 aCkgewogICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1lbnVBY3Rpb24oc3Vi dGl0bGVzTWVudS50aXRsZSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4t bWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvc2hvdy1jb250ZXh0bWVudS10aGVuLWRvdWJs ZS1jbGljay1vbi10cmFja3MtYnV0dG9uLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4t bWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvc2hvdy1jb250ZXh0bWVudS10aGVuLWRvdWJs ZS1jbGljay1vbi10cmFja3MtYnV0dG9uLmh0bWwKaW5kZXggOTk2NTdjMmQxMmFhMzI0MmZmNzFi YmZlNWUzNzIxYmM5ZjM1MzU4OS4uZjhmMmU4MjhmOGUwNDhiZjFjYzYzMmVlYzhlMDkwYmQxMWVl MmNhMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L3RyYWNrcy1zdXBwb3J0L3Nob3ctY29udGV4dG1lbnUtdGhlbi1kb3VibGUtY2xpY2stb24tdHJh Y2tzLWJ1dHRvbi5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250 cm9scy90cmFja3Mtc3VwcG9ydC9zaG93LWNvbnRleHRtZW51LXRoZW4tZG91YmxlLWNsaWNrLW9u LXRyYWNrcy1idXR0b24uaHRtbApAQCAtMSw0ICsxLDUgQEAKLTwhRE9DVFlQRSBodG1sPgorPCFE T0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgdXNlRmxleGlibGVWaWV3cG9y dD10cnVlIF0gLS0+Cis8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNl LXdpZHRoIj4KIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvbWVkaWEtY29udHJvbHMtdXRpbHMu anMiPjwvc2NyaXB0PgogPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy91aS1oZWxwZXIu anMiPjwvc2NyaXB0PgogPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBy ZS5qcyI+PC9zY3JpcHQ+CkBAIC0yMSwzMSArMjIsMjMgQEAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5l cigicGxheSIsICgpID0+IHsKICAgICBzaG91bGRCZWNvbWVEaWZmZXJlbnQoInNoYWRvd1Jvb3Qu cXVlcnlTZWxlY3RvcignYnV0dG9uLnRyYWNrcycpIiwgIm51bGwiLCAoKSA9PiB7CiAgICAgICAg IHNob3VsZEJlY29tZURpZmZlcmVudCgic2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCdidXR0b24u dHJhY2tzJykuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCkud2lkdGgiLCAiMCIsIGFzeW5jICgpID0+ IHsKICAgICAgICAgICAgIGRlYnVnKCJUYXBwaW5nIHRyYWNrcyBidXR0b24uLi4iKTsKLSAgICAg ICAgICAgIGF3YWl0IFByb21pc2UuYWxsKFsKLSAgICAgICAgICAgICAgICBVSUhlbHBlci53YWl0 Rm9yQ29udGV4dE1lbnVUb1Nob3coKSwKLSAgICAgICAgICAgICAgICBwcmVzc09uRWxlbWVudChz aGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSksCi0gICAgICAgICAgICBd KTsKKyAgICAgICAgICAgIGF3YWl0IHByZXNzT25FbGVtZW50QXN5bmMoc2hhZG93Um9vdC5xdWVy eVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpOworICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIu d2FpdEZvckNvbnRleHRNZW51VG9TaG93KCk7CiAgICAgICAgICAgICBkZWJ1ZygiQ29udGV4dCBt ZW51IHNob3duLiIpOwogCiAgICAgICAgICAgICBkZWJ1ZygiVGFwcGluZyB0cmFja3MgYnV0dG9u Li4uIik7Ci0gICAgICAgICAgICBhd2FpdCBQcm9taXNlLmFsbChbCi0gICAgICAgICAgICAgICAg VUlIZWxwZXIud2FpdEZvckNvbnRleHRNZW51VG9IaWRlKCksCi0gICAgICAgICAgICAgICAgcHJl c3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpLAot ICAgICAgICAgICAgXSk7CisgICAgICAgICAgICBhd2FpdCBwcmVzc09uRWxlbWVudEFzeW5jKHNo YWRvd1Jvb3QucXVlcnlTZWxlY3RvcigiYnV0dG9uLnRyYWNrcyIpKTsKKyAgICAgICAgICAgIGF3 YWl0IFVJSGVscGVyLndhaXRGb3JDb250ZXh0TWVudVRvSGlkZSgpOwogICAgICAgICAgICAgZGVi dWcoIkNvbnRleHQgbWVudSBoaWRkZW4uIik7CiAKICAgICAgICAgICAgIGRlYnVnKCJUYXBwaW5n IHRyYWNrcyBidXR0b24uLi4iKTsKLSAgICAgICAgICAgIGF3YWl0IFByb21pc2UuYWxsKFsKLSAg ICAgICAgICAgICAgICBVSUhlbHBlci53YWl0Rm9yQ29udGV4dE1lbnVUb1Nob3coKSwKLSAgICAg ICAgICAgICAgICBwcmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRv bi50cmFja3MiKSksCi0gICAgICAgICAgICBdKTsKKyAgICAgICAgICAgIGF3YWl0IHByZXNzT25F bGVtZW50QXN5bmMoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpOwor ICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIud2FpdEZvckNvbnRleHRNZW51VG9TaG93KCk7CiAg ICAgICAgICAgICBkZWJ1ZygiQ29udGV4dCBtZW51IHNob3duLiIpOwogCiAgICAgICAgICAgICBk ZWJ1ZygiVGFwcGluZyB0cmFja3MgYnV0dG9uLi4uIik7Ci0gICAgICAgICAgICBhd2FpdCBQcm9t aXNlLmFsbChbCi0gICAgICAgICAgICAgICAgVUlIZWxwZXIud2FpdEZvckNvbnRleHRNZW51VG9I aWRlKCksCi0gICAgICAgICAgICAgICAgcHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNl bGVjdG9yKCJidXR0b24udHJhY2tzIikpLAotICAgICAgICAgICAgXSk7CisgICAgICAgICAgICBh d2FpdCBwcmVzc09uRWxlbWVudEFzeW5jKHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcigiYnV0dG9u LnRyYWNrcyIpKTsKKyAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JDb250ZXh0TWVu dVRvSGlkZSgpOwogICAgICAgICAgICAgZGVidWcoIkNvbnRleHQgbWVudSBoaWRkZW4uIik7CiAK ICAgICAgICAgICAgIG1lZGlhLnJlbW92ZSgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVk aWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RleHQtdHJhY2stc2VsZWN0 ZWQtdmlhLW1lZGlhLWFwaS5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RleHQtdHJhY2stc2VsZWN0ZWQtdmlhLW1lZGlhLWFwaS5o dG1sCmluZGV4IDNlNjI5MGJkYjY1NTI0ZTgzOTllOTIwNWUyYjgyZWVmNjhhOGQ4ZmMuLmEwM2M5 MWE0NzJlM2JiZDM0MWFjM2I0YTFiYzJkOGM5MjA1NmJiM2YgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90ZXh0LXRyYWNr LXNlbGVjdGVkLXZpYS1tZWRpYS1hcGkuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rl cm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdGV4dC10cmFjay1zZWxlY3RlZC12aWEt bWVkaWEtYXBpLmh0bWwKQEAgLTEsNCArMSw1IEBACi08IURPQ1RZUEUgaHRtbD4KKzwhRE9DVFlQ RSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxlVmlld3BvcnQ9dHJ1 ZSBdIC0tPgorPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0 aCI+CiA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL21lZGlhLWNvbnRyb2xzLXV0aWxzLmpzIj48 L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48 L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMi Pjwvc2NyaXB0PgpAQCAtMzYsMTAgKzM3LDkgQEAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigicGxh eSIsICgpID0+IHsKIAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIGRlYnVnKCJUYXBw aW5nIHRyYWNrcyBidXR0b24uLi4iKTsKLSAgICAgICAgICAgICAgICBbY29udGV4dG1lbnVdID0g YXdhaXQgUHJvbWlzZS5hbGwoWwotICAgICAgICAgICAgICAgICAgICBnZXRUcmFja3NDb250ZXh0 TWVudSgpLAotICAgICAgICAgICAgICAgICAgICBwcmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1 ZXJ5U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSksCi0gICAgICAgICAgICAgICAgXSk7CisgICAg ICAgICAgICAgICAgYXdhaXQgcHJlc3NPbkVsZW1lbnRBc3luYyhzaGFkb3dSb290LnF1ZXJ5U2Vs ZWN0b3IoImJ1dHRvbi50cmFja3MiKSk7CisgICAgICAgICAgICAgICAgY29udGV4dG1lbnUgPSBh d2FpdCBnZXRUcmFja3NDb250ZXh0TWVudSgpOworCiAgICAgICAgICAgICAgICAgbGV0IHN1YnRp dGxlc01lbnUgPSBjb250ZXh0bWVudVswXS5jaGlsZHJlbi5maW5kKChzdWJtZW51KSA9PiBzdWJt ZW51LnRpdGxlID09PSAiU3VidGl0bGVzIik7CiAgICAgICAgICAgICAgICAgaWYgKHN1YnRpdGxl c01lbnU/LmNoaWxkcmVuPy5sZW5ndGgpIHsKICAgICAgICAgICAgICAgICAgICAgYXdhaXQgVUlI ZWxwZXIuY2hvb3NlTWVudUFjdGlvbihzdWJ0aXRsZXNNZW51LnRpdGxlKTsKQEAgLTU5LDEwICs1 OSw5IEBAIG1lZGlhLmFkZEV2ZW50TGlzdGVuZXIoInBsYXkiLCAoKSA9PiB7CiAKICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICBkZWJ1ZygiVGFwcGluZyB0cmFja3MgYnV0dG9uLi4uIik7 Ci0gICAgICAgICAgICAgICAgW2NvbnRleHRtZW51XSA9IGF3YWl0IFByb21pc2UuYWxsKFsKLSAg ICAgICAgICAgICAgICAgICAgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKSwKLSAgICAgICAgICAgICAg ICAgICAgcHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24udHJh Y2tzIikpLAotICAgICAgICAgICAgICAgIF0pOworICAgICAgICAgICAgICAgIGF3YWl0IHByZXNz T25FbGVtZW50QXN5bmMoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikp OworICAgICAgICAgICAgICAgIGNvbnRleHRtZW51ID0gYXdhaXQgZ2V0VHJhY2tzQ29udGV4dE1l bnUoKTsKKwogICAgICAgICAgICAgICAgIGxldCBzdWJ0aXRsZXNNZW51ID0gY29udGV4dG1lbnVb MF0uY2hpbGRyZW4uZmluZCgoc3VibWVudSkgPT4gc3VibWVudS50aXRsZSA9PT0gIlN1YnRpdGxl cyIpOwogICAgICAgICAgICAgICAgIGlmIChzdWJ0aXRsZXNNZW51Py5jaGlsZHJlbj8ubGVuZ3Ro KSB7CiAgICAgICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmNob29zZU1lbnVBY3Rpb24o c3VidGl0bGVzTWVudS50aXRsZSk7Cg== 427370 2021-04-29 12:53:47 -0700 2021-04-29 16:44:38 -0700 Patch for landing bug-225202-20210429155345.patch text/plain 15228 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NzA3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMmQ3YjViNmQzYjhkMTNhMTRmZmM3 NDg3ODZmMmMxOTQyZWQ2NTYwMS4uNjU5ZTMwZGE1NWQ4NWY4YTQ2MzczN2I4NWMxMGM4NzZjNjE1 Y2JjNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDUwIEBACisyMDIxLTA0LTI5ICBBZGl0eWEgS2VlcnRoaSAg PGFrZWVydGhpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OOiBbaU9TXSA2IG1lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC8gdGVzdHMgdGltaW5nIG91dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1MjAyCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NzA0MTYzMT4KKworICAgICAgICBSZXZpZXdlZCBieSBE ZXZpbiBSb3Vzc28uCisKKyAgICAgICAgVGhlIHNpeCB0ZXN0cyBtb2RpZmllZCBpbiB0aGlzIHBh dGNoIHdlcmUgZmFpbGluZyBmb3IgdHdvIHJlYXNvbnM6CisKKyAgICAgICAgMS4gVGhlIG1lZGlh IGNvbnRyb2xzIGxvZ2ljIHdhcyBtb2RpZmllZCB0byBoaWRlIGNlcnRhaW4gY29udHJvbHMgYXQK KyAgICAgICAgc21hbGxlciB3aWR0aHMuIFRvIGVuc3VyZSB0aGUgdHJhY2tzIGJ1dHRvbiB3YXMg dmlzaWJsZSwgdGhlIHdpZHRoCisgICAgICAgIG9mIHRoZSA8dmlkZW8+IGVsZW1lbnQgd2FzIGlu Y3JlYXNlZC4gSG93ZXZlciwgb24gaU9TLCB0aGlzIGxlZCB0byB0aGUKKyAgICAgICAgdHJhY2tz IGJ1dHRvbiBiZWluZyBwb3NpdGlvbmVkIG91dHNpZGUgdGhlIHZpZXdwb3J0LiBDb25zZXF1ZW50 bHksIGFueQorICAgICAgICBhdHRlbXB0cyB0byB0YXAgdGhlIGJ1dHRvbiBhbmQgd2FpdCBmb3Ig YSBjb250ZXh0IG1lbnUgdG8gc2hvdyB1cAorICAgICAgICB3b3VsZCBmYWlsLCBjYXVzaW5nIHRo ZSB0ZXN0cyB0byB0aW1lb3V0IHdhaXRpbmcgZm9yIGEgY29udGV4dCBtZW51LgorCisgICAgICAg IFRvIGZpeCAoMSksIGNhbGwgRWxlbWVudC5zY3JvbGxJbnRvVmlld0lmTmVlZGVkIGJlZm9yZSBh dHRlbXB0aW5nIHRvCisgICAgICAgIHRhcCBvbiB0aGUgdHJhY2tzIGJ1dHRvbiwgZW5zdXJpbmcg aXQgaXMgdmlzaWJsZSBpbiB0aGUgdmlld3BvcnQuIFRoZW4sCisgICAgICAgIHVzZSB3aW5kb3cg Y29vcmRpbmF0ZXMgdG8gdGFwIGF0IHRoZSByaWdodCBwb3NpdGlvbi4gVG8gZW5zdXJlIHRoZQor ICAgICAgICB2aWV3cG9ydCBpcyBhY3R1YWxseSBzY3JvbGxhYmxlIG9uIGlPUywgInVzZUZsZXhp YmxlVmlld3BvcnQiIGFuZCB0aGUKKyAgICAgICAgdmlld3BvcnQgbWV0YSB0YWcgd2VyZSBhZGRl ZCB0byBmYWlsaW5nIHRlc3RzLgorCisgICAgICAgIDIuIEV2ZW4gYWZ0ZXIgZml4aW5nICgxKSwg dGhlIHRlc3RzIGNvbnRpbnVlZCB0byB0aW1lb3V0LiBOb3RlIHRoYXQKKyAgICAgICAgYm90aCB0 aGUgcHJlc3NPbkVsZW1lbnQoKSBhbmQgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKSBoZWxwZXIgbWV0 aG9kcworICAgICAgICBpbiAibWVkaWEtY29udHJvbHMtdXRpbHMuanMiIGNhbGwgaW50byBVSVNj cmlwdENvbnRyb2xsZXIsIGFuZCBhcmUKKyAgICAgICAgY2FsbGVkIGluIHN1Y2Nlc3Npb24gaW4g dGhlIGZhaWxpbmcgdGVzdHMuIEJvdGggbWV0aG9kcyBhZGQgY2FsbGJhY2tzCisgICAgICAgIHRv IHRoZSB0ZXN0IHJ1bm5lci4gSG93ZXZlciwgcHJlc3NPbkVsZW1lbnQoKSBpcyBub3QgYW4gYXN5 bmMgbWV0aG9kLAorICAgICAgICB3aGljaCBsZWFkIHRvIGdldFRyYWNrc0NvbnRleHRNZW51KCkg Z2V0dGluZyBjYWxsZWQgYmVmb3JlIHRoZSB0YXAKKyAgICAgICAgYWN0dWFsbHkgY29tcGxldGVk LiBVSVNjcmlwdENvbnRyb2xsZXIgY2xlYXJzIGFsbCBjYWxsYmFja3MgYWZ0ZXIgb25lCisgICAg ICAgIGNhbGxiYWNrIGNvbXBsZXRlcywgc28gd2hlbiB0aGUgdGFwIGNhbGxiYWNrIHdhcyBjb21w bGV0ZWQsIHRoZSBjb250ZXh0CisgICAgICAgIG1lbnUgY2FsbGJhY2sgd2FzIHJlbW92ZWQuIFRo ZW4sIHRoZSB0ZXN0cyBnZXQgc3R1Y2sgd2FpdGluZyBvbiB0aGUKKyAgICAgICAgY29udGV4dCBt ZW51IGNhbGxiYWNrIHRvIGdldCBpbnZva2VkLgorCisgICAgICAgIFRvIGZpeCAoMiksIG1ha2Ug cHJlc3NPbkVsZW1lbnQoKSByZXR1cm4gYSBwcm9taXNlIGlmIGEgY29udGludWF0aW9uCisgICAg ICAgIGZ1bmN0aW9uIGlzIG5vdCBwcm92aWRlZC4gVGhlbiwgZ2V0VHJhY2tzQ29udGV4dE1lbnUo KSBjYW4gYmUgY2FsbGVkCisgICAgICAgIGFmdGVyIHRoZSBwcm9taXNlIGlzIHJlc29sdmVkLgor CisgICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3Jlc291cmNlcy9tZWRpYS1j b250cm9scy11dGlscy5qczoKKyAgICAgICAgKHByZXNzT25FbGVtZW50KToKKyAgICAgICAgKiBt ZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvYXV0by10ZXh0LXRyYWNr Lmh0bWw6CisgICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBw b3J0L2NsaWNrLXRyYWNrLWluLWNvbnRleHRtZW51Lmh0bWw6CisgICAgICAgICogbWVkaWEvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2hpZGRlbi10cmFja3MuaHRtbDoKKyAg ICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvb2ZmLXRl eHQtdHJhY2suaHRtbDoKKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJh Y2tzLXN1cHBvcnQvc2hvdy1jb250ZXh0bWVudS10aGVuLWRvdWJsZS1jbGljay1vbi10cmFja3Mt YnV0dG9uLmh0bWw6CisgICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNr cy1zdXBwb3J0L3RleHQtdHJhY2stc2VsZWN0ZWQtdmlhLW1lZGlhLWFwaS5odG1sOgorCiAyMDIx LTA0LTI4ICBBZGl0eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OOiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEtY29udHJvbGxlci9p b3MvbWVkaWEtY29udHJvbGxlci1pb3MtZG8tbm90LWhpZGUtY29udHJvbHMtd2hlbi10YXBwaW5n LWJ1dHRvbi5odG1sIGlzIHRpbWluZyBvdXQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy9yZXNvdXJjZXMvbWVkaWEtY29udHJvbHMtdXRpbHMuanMg Yi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvcmVzb3VyY2VzL21lZGlh LWNvbnRyb2xzLXV0aWxzLmpzCmluZGV4IGY2ZTg1YTE3ZDAwZGU0MDMzMWZkMTgwY2M5MWZjNDlm MzYyZTc1MTAuLmVhMWMzZmE2YjM5YmI2MGIzY2Q3YWFjZTA4ZGYxY2I3YmI2ZWMyM2IgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9yZXNvdXJjZXMv bWVkaWEtY29udHJvbHMtdXRpbHMuanMKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL3Jlc291cmNlcy9tZWRpYS1jb250cm9scy11dGlscy5qcwpAQCAtNDgsMjEg KzQ4LDI1IEBAIGZ1bmN0aW9uIHNob3VsZEJlRXF1YWxUb1JHQkFDb2xvcihleHByLCBleHBlY3Rl ZENvbG9yKQogCiBmdW5jdGlvbiBwcmVzc09uRWxlbWVudChlbGVtZW50LCBjb250aW51YXRpb24p CiB7Ci0gICAgaWYgKHR5cGVvZiBjb250aW51YXRpb24gIT09ICJmdW5jdGlvbiIpCi0gICAgICAg IGNvbnRpbnVhdGlvbiA9IG5ldyBGdW5jdGlvbjsKKyAgICBsZXQgcHJvbWlzZSA9IG51bGw7Cisg ICAgaWYgKHR5cGVvZiBjb250aW51YXRpb24gIT09ICJmdW5jdGlvbiIpIHsKKyAgICAgICAgcHJv bWlzZSA9IG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHsKKyAgICAgICAgICAgIGNv bnRpbnVhdGlvbiA9IHJlc29sdmU7CisgICAgICAgIH0pOworICAgIH0KKworICAgIGVsZW1lbnQu c2Nyb2xsSW50b1ZpZXdJZk5lZWRlZChmYWxzZSk7CiAKICAgICBjb25zdCBib3VuZHMgPSBlbGVt ZW50LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOwogICAgIGlmIChib3VuZHMud2lkdGggPT09IDAg fHwgYm91bmRzLmhlaWdodCA9PT0gMCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgY29u c3QgY2VudGVyWCA9IGJvdW5kcy5sZWZ0ICsgYm91bmRzLndpZHRoIC8gMjsKLSAgICBjb25zdCBj ZW50ZXJZID0gYm91bmRzLnRvcCArIGJvdW5kcy5oZWlnaHQgLyAyOwotCi0gICAgLy8gZGVidWco YFRyeWluZyB0byBwcmVzcyBvbiAmbHQ7JHtlbGVtZW50LmxvY2FsTmFtZX0gY2xhc3M9IiR7ZWxl bWVudC5jbGFzc05hbWV9Ij4gYXQgJHtjZW50ZXJYfXgke2NlbnRlcll9LmApOworICAgIGNvbnN0 IGNlbnRlclggPSB3aW5kb3cuc2Nyb2xsWCArIGJvdW5kcy5sZWZ0ICsgYm91bmRzLndpZHRoIC8g MjsKKyAgICBjb25zdCBjZW50ZXJZID0gd2luZG93LnNjcm9sbFkgKyBib3VuZHMudG9wICsgYm91 bmRzLmhlaWdodCAvIDI7CiAKICAgICBwcmVzc0F0UG9pbnQoY2VudGVyWCwgY2VudGVyWSwgY29u dGludWF0aW9uKTsKIAotICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBwcm9taXNlIHx8IHRy dWU7CiB9CiAKIGZ1bmN0aW9uIHByZXNzQXRQb2ludCh4LCB5LCBjb250aW51YXRpb24pCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1 cHBvcnQvYXV0by10ZXh0LXRyYWNrLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVk aWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvYXV0by10ZXh0LXRyYWNrLmh0bWwKaW5kZXggYWQ4 NWI2ODM3ZTk1MzQyZjRjOWQ5OTg2YzJhZDcyMjNiNTYwYzdiMC4uOGIyZjdjODEwNmM2ZDQ2YmM4 NGE2NWJlYjQ5YjdmMDZjZjNjMWRlNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2F1dG8tdGV4dC10cmFjay5odG1sCisr KyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9y dC9hdXRvLXRleHQtdHJhY2suaHRtbApAQCAtMSw0ICsxLDUgQEAKLTwhRE9DVFlQRSBodG1sPgor PCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsgdXNlRmxleGlibGVWaWV3 cG9ydD10cnVlIF0gLS0+Cis8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2 aWNlLXdpZHRoIj4KIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvbWVkaWEtY29udHJvbHMtdXRp bHMuanMiPjwvc2NyaXB0PgogPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy91aS1oZWxw ZXIuanMiPjwvc2NyaXB0PgogPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0 LXByZS5qcyI+PC9zY3JpcHQ+CkBAIC0yNiwxMCArMjcsOSBAQCBtZWRpYS5hZGRFdmVudExpc3Rl bmVyKCJwbGF5IiwgKCkgPT4gewogICAgICAgICAgICAgd2luZG93LmludGVybmFscy5zZXRDYXB0 aW9uRGlzcGxheU1vZGUoImF1dG9tYXRpYyIpOwogCiAgICAgICAgICAgICBkZWJ1ZygiVGFwcGlu ZyB0cmFja3MgYnV0dG9uLi4uIik7Ci0gICAgICAgICAgICBsZXQgW2NvbnRleHRtZW51XSA9IGF3 YWl0IFByb21pc2UuYWxsKFsKLSAgICAgICAgICAgICAgICBnZXRUcmFja3NDb250ZXh0TWVudSgp LAotICAgICAgICAgICAgICAgIHByZXNzT25FbGVtZW50KHNoYWRvd1Jvb3QucXVlcnlTZWxlY3Rv cigiYnV0dG9uLnRyYWNrcyIpKSwKLSAgICAgICAgICAgIF0pOworICAgICAgICAgICAgYXdhaXQg cHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikp OworICAgICAgICAgICAgY29udGV4dG1lbnUgPSBhd2FpdCBnZXRUcmFja3NDb250ZXh0TWVudSgp OworCiAgICAgICAgICAgICBsZXQgc3VidGl0bGVzTWVudSA9IGNvbnRleHRtZW51WzBdLmNoaWxk cmVuLmZpbmQoKHN1Ym1lbnUpID0+IHN1Ym1lbnUudGl0bGUgPT09ICJTdWJ0aXRsZXMiKTsKICAg ICAgICAgICAgIGlmIChzdWJ0aXRsZXNNZW51Py5jaGlsZHJlbj8ubGVuZ3RoKSB7CiAgICAgICAg ICAgICAgICAgYXdhaXQgVUlIZWxwZXIuY2hvb3NlTWVudUFjdGlvbihzdWJ0aXRsZXNNZW51LnRp dGxlKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy90cmFja3Mtc3VwcG9ydC9jbGljay10cmFjay1pbi1jb250ZXh0bWVudS5odG1sIGIvTGF5b3V0 VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2NsaWNrLXRy YWNrLWluLWNvbnRleHRtZW51Lmh0bWwKaW5kZXggZWE3MTdhOGJhZWY1YmViOGQwNjViMWY1MDc5 NmFjM2MxYjAyYjAyNC4uNTJmNWYxZjM2ZTQ2ZDM0MjViOTI0Y2IwNWE2NWQ1YWI4MjA3YzkyNyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNr cy1zdXBwb3J0L2NsaWNrLXRyYWNrLWluLWNvbnRleHRtZW51Lmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2NsaWNrLXRyYWNr LWluLWNvbnRleHRtZW51Lmh0bWwKQEAgLTEsNCArMSw1IEBACi08IURPQ1RZUEUgaHRtbD4KKzwh RE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxlVmlld3Bv cnQ9dHJ1ZSBdIC0tPgorPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmlj ZS13aWR0aCI+CiA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL21lZGlhLWNvbnRyb2xzLXV0aWxz LmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVy LmpzIj48L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1w cmUuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2hpZGRlbi10cmFja3MuaHRtbCBiL0xheW91dFRl c3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9oaWRkZW4tdHJh Y2tzLmh0bWwKaW5kZXggN2I1ZDgyM2E3Nzk0MTMxZDU4ZGY3MmFiNDJjNGQzYWRiYjMwZjIzYS4u ZGE0NWI4ZDQzZWM2OGJiOTNhNjNmN2E2ZGQ1YjNiYjhlYTcyMDZlMiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L2hpZGRl bi10cmFja3MuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJv bHMvdHJhY2tzLXN1cHBvcnQvaGlkZGVuLXRyYWNrcy5odG1sCkBAIC0xLDQgKzEsNSBAQAotPCFE T0NUWVBFIGh0bWw+Cis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyB1 c2VGbGV4aWJsZVZpZXdwb3J0PXRydWUgXSAtLT4KKzxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250 ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgiPgogPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9tZWRp YS1jb250cm9scy11dGlscy5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVz b3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVz b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KQEAgLTI3LDEwICsyOCw5IEBAIG1lZGlh LmFkZEV2ZW50TGlzdGVuZXIoInBsYXkiLCAoKSA9PiB7CiAgICAgICAgICAgICAgICAgdGV4dFRy YWNrLm1vZGUgPSAiaGlkZGVuIjsKIAogICAgICAgICAgICAgZGVidWcoIlRhcHBpbmcgdHJhY2tz IGJ1dHRvbi4uLiIpOwotICAgICAgICAgICAgbGV0IFtjb250ZXh0bWVudV0gPSBhd2FpdCBQcm9t aXNlLmFsbChbCi0gICAgICAgICAgICAgICAgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKSwKLSAgICAg ICAgICAgICAgICBwcmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRv bi50cmFja3MiKSksCi0gICAgICAgICAgICBdKTsKKyAgICAgICAgICAgIGF3YWl0IHByZXNzT25F bGVtZW50KHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcigiYnV0dG9uLnRyYWNrcyIpKTsKKyAgICAg ICAgICAgIGNvbnRleHRtZW51ID0gYXdhaXQgZ2V0VHJhY2tzQ29udGV4dE1lbnUoKTsKKwogICAg ICAgICAgICAgbGV0IHN1YnRpdGxlc01lbnUgPSBjb250ZXh0bWVudVswXS5jaGlsZHJlbi5maW5k KChzdWJtZW51KSA9PiBzdWJtZW51LnRpdGxlID09PSAiU3VidGl0bGVzIik7CiAgICAgICAgICAg ICBpZiAoc3VidGl0bGVzTWVudT8uY2hpbGRyZW4/Lmxlbmd0aCkgewogICAgICAgICAgICAgICAg IGF3YWl0IFVJSGVscGVyLmNob29zZU1lbnVBY3Rpb24oc3VidGl0bGVzTWVudS50aXRsZSk7CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tz LXN1cHBvcnQvb2ZmLXRleHQtdHJhY2suaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1t ZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9vZmYtdGV4dC10cmFjay5odG1sCmluZGV4IGFm N2RlMDY3OWYyNDU0MDllNTUzYjRkZWFiOGNhNDE4ODE0Yjc4NTMuLjU5ZDM1NTcxMmQyMGFiOWE3 MWY3NDNiNDBjNDRlNTJhNDkxMWQ1MDcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL21v ZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9vZmYtdGV4dC10cmFjay5odG1sCisr KyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9y dC9vZmYtdGV4dC10cmFjay5odG1sCkBAIC0xLDQgKzEsNSBAQAotPCFET0NUWVBFIGh0bWw+Cis8 IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyB1c2VGbGV4aWJsZVZpZXdw b3J0PXRydWUgXSAtLT4KKzxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250ZW50PSJ3aWR0aD1kZXZp Y2Utd2lkdGgiPgogPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9tZWRpYS1jb250cm9scy11dGls cy5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBl ci5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3Qt cHJlLmpzIj48L3NjcmlwdD4KQEAgLTIzLDEwICsyNCw5IEBAIG1lZGlhLmFkZEV2ZW50TGlzdGVu ZXIoInBsYXkiLCAoKSA9PiB7CiAgICAgc2hvdWxkQmVjb21lRGlmZmVyZW50KCJzaGFkb3dSb290 LnF1ZXJ5U2VsZWN0b3IoJ2J1dHRvbi50cmFja3MnKSIsICJudWxsIiwgKCkgPT4gewogICAgICAg ICBzaG91bGRCZWNvbWVEaWZmZXJlbnQoInNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcignYnV0dG9u LnRyYWNrcycpLmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpLndpZHRoIiwgIjAiLCBhc3luYyAoKSA9 PiB7CiAgICAgICAgICAgICBkZWJ1ZygiVGFwcGluZyB0cmFja3MgYnV0dG9uLi4uIik7Ci0gICAg ICAgICAgICBsZXQgW2NvbnRleHRtZW51XSA9IGF3YWl0IFByb21pc2UuYWxsKFsKLSAgICAgICAg ICAgICAgICBnZXRUcmFja3NDb250ZXh0TWVudSgpLAotICAgICAgICAgICAgICAgIHByZXNzT25F bGVtZW50KHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcigiYnV0dG9uLnRyYWNrcyIpKSwKLSAgICAg ICAgICAgIF0pOworICAgICAgICAgICAgYXdhaXQgcHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5x dWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpOworICAgICAgICAgICAgY29udGV4dG1lbnUg PSBhd2FpdCBnZXRUcmFja3NDb250ZXh0TWVudSgpOworCiAgICAgICAgICAgICBsZXQgc3VidGl0 bGVzTWVudSA9IGNvbnRleHRtZW51WzBdLmNoaWxkcmVuLmZpbmQoKHN1Ym1lbnUpID0+IHN1Ym1l bnUudGl0bGUgPT09ICJTdWJ0aXRsZXMiKTsKICAgICAgICAgICAgIGlmIChzdWJ0aXRsZXNNZW51 Py5jaGlsZHJlbj8ubGVuZ3RoKSB7CiAgICAgICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuY2hv b3NlTWVudUFjdGlvbihzdWJ0aXRsZXNNZW51LnRpdGxlKTsKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9zaG93LWNvbnRl eHRtZW51LXRoZW4tZG91YmxlLWNsaWNrLW9uLXRyYWNrcy1idXR0b24uaHRtbCBiL0xheW91dFRl c3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC9zaG93LWNvbnRl eHRtZW51LXRoZW4tZG91YmxlLWNsaWNrLW9uLXRyYWNrcy1idXR0b24uaHRtbAppbmRleCA5OTY1 N2MyZDEyYWEzMjQyZmY3MWJiZmU1ZTM3MjFiYzlmMzUzNTg5Li45YTIxZjNjYzIxMTgxYTU2ZTRk MjZjY2I0ZDgxMTY0ZjVhMjZlM2FiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rl cm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvc2hvdy1jb250ZXh0bWVudS10aGVuLWRv dWJsZS1jbGljay1vbi10cmFja3MtYnV0dG9uLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEv bW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3Nob3ctY29udGV4dG1lbnUtdGhl bi1kb3VibGUtY2xpY2stb24tdHJhY2tzLWJ1dHRvbi5odG1sCkBAIC0xLDQgKzEsNSBAQAotPCFE T0NUWVBFIGh0bWw+Cis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyB1 c2VGbGV4aWJsZVZpZXdwb3J0PXRydWUgXSAtLT4KKzxtZXRhIG5hbWU9InZpZXdwb3J0IiBjb250 ZW50PSJ3aWR0aD1kZXZpY2Utd2lkdGgiPgogPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9tZWRp YS1jb250cm9scy11dGlscy5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVz b3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVz b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KQEAgLTIxLDMxICsyMiwyMyBAQCBtZWRp YS5hZGRFdmVudExpc3RlbmVyKCJwbGF5IiwgKCkgPT4gewogICAgIHNob3VsZEJlY29tZURpZmZl cmVudCgic2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCdidXR0b24udHJhY2tzJykiLCAibnVsbCIs ICgpID0+IHsKICAgICAgICAgc2hvdWxkQmVjb21lRGlmZmVyZW50KCJzaGFkb3dSb290LnF1ZXJ5 U2VsZWN0b3IoJ2J1dHRvbi50cmFja3MnKS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKS53aWR0aCIs ICIwIiwgYXN5bmMgKCkgPT4gewogICAgICAgICAgICAgZGVidWcoIlRhcHBpbmcgdHJhY2tzIGJ1 dHRvbi4uLiIpOwotICAgICAgICAgICAgYXdhaXQgUHJvbWlzZS5hbGwoWwotICAgICAgICAgICAg ICAgIFVJSGVscGVyLndhaXRGb3JDb250ZXh0TWVudVRvU2hvdygpLAotICAgICAgICAgICAgICAg IHByZXNzT25FbGVtZW50KHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcigiYnV0dG9uLnRyYWNrcyIp KSwKLSAgICAgICAgICAgIF0pOworICAgICAgICAgICAgYXdhaXQgcHJlc3NPbkVsZW1lbnQoc2hh ZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24udHJhY2tzIikpOworICAgICAgICAgICAgYXdh aXQgVUlIZWxwZXIud2FpdEZvckNvbnRleHRNZW51VG9TaG93KCk7CiAgICAgICAgICAgICBkZWJ1 ZygiQ29udGV4dCBtZW51IHNob3duLiIpOwogCiAgICAgICAgICAgICBkZWJ1ZygiVGFwcGluZyB0 cmFja3MgYnV0dG9uLi4uIik7Ci0gICAgICAgICAgICBhd2FpdCBQcm9taXNlLmFsbChbCi0gICAg ICAgICAgICAgICAgVUlIZWxwZXIud2FpdEZvckNvbnRleHRNZW51VG9IaWRlKCksCi0gICAgICAg ICAgICAgICAgcHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJidXR0b24u dHJhY2tzIikpLAotICAgICAgICAgICAgXSk7CisgICAgICAgICAgICBhd2FpdCBwcmVzc09uRWxl bWVudChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSk7CisgICAgICAg ICAgICBhd2FpdCBVSUhlbHBlci53YWl0Rm9yQ29udGV4dE1lbnVUb0hpZGUoKTsKICAgICAgICAg ICAgIGRlYnVnKCJDb250ZXh0IG1lbnUgaGlkZGVuLiIpOwogCiAgICAgICAgICAgICBkZWJ1Zygi VGFwcGluZyB0cmFja3MgYnV0dG9uLi4uIik7Ci0gICAgICAgICAgICBhd2FpdCBQcm9taXNlLmFs bChbCi0gICAgICAgICAgICAgICAgVUlIZWxwZXIud2FpdEZvckNvbnRleHRNZW51VG9TaG93KCks Ci0gICAgICAgICAgICAgICAgcHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9y KCJidXR0b24udHJhY2tzIikpLAotICAgICAgICAgICAgXSk7CisgICAgICAgICAgICBhd2FpdCBw cmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSk7 CisgICAgICAgICAgICBhd2FpdCBVSUhlbHBlci53YWl0Rm9yQ29udGV4dE1lbnVUb1Nob3coKTsK ICAgICAgICAgICAgIGRlYnVnKCJDb250ZXh0IG1lbnUgc2hvd24uIik7CiAKICAgICAgICAgICAg IGRlYnVnKCJUYXBwaW5nIHRyYWNrcyBidXR0b24uLi4iKTsKLSAgICAgICAgICAgIGF3YWl0IFBy b21pc2UuYWxsKFsKLSAgICAgICAgICAgICAgICBVSUhlbHBlci53YWl0Rm9yQ29udGV4dE1lbnVU b0hpZGUoKSwKLSAgICAgICAgICAgICAgICBwcmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5 U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSksCi0gICAgICAgICAgICBdKTsKKyAgICAgICAgICAg IGF3YWl0IHByZXNzT25FbGVtZW50KHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcigiYnV0dG9uLnRy YWNrcyIpKTsKKyAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLndhaXRGb3JDb250ZXh0TWVudVRv SGlkZSgpOwogICAgICAgICAgICAgZGVidWcoIkNvbnRleHQgbWVudSBoaWRkZW4uIik7CiAKICAg ICAgICAgICAgIG1lZGlhLnJlbW92ZSgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEv bW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1zdXBwb3J0L3RleHQtdHJhY2stc2VsZWN0ZWQt dmlhLW1lZGlhLWFwaS5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL3RyYWNrcy1zdXBwb3J0L3RleHQtdHJhY2stc2VsZWN0ZWQtdmlhLW1lZGlhLWFwaS5odG1s CmluZGV4IDNlNjI5MGJkYjY1NTI0ZTgzOTllOTIwNWUyYjgyZWVmNjhhOGQ4ZmMuLjYzY2IwOGQ5 M2U3NWVhMjZjMDlmMjJmNWIwMmI4YWU0ZDMzYmE4MDIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90ZXh0LXRyYWNrLXNl bGVjdGVkLXZpYS1tZWRpYS1hcGkuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4t bWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdGV4dC10cmFjay1zZWxlY3RlZC12aWEtbWVk aWEtYXBpLmh0bWwKQEAgLTEsNCArMSw1IEBACi08IURPQ1RZUEUgaHRtbD4KKzwhRE9DVFlQRSBo dG1sPiA8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIHVzZUZsZXhpYmxlVmlld3BvcnQ9dHJ1ZSBd IC0tPgorPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCI+ CiA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL21lZGlhLWNvbnRyb2xzLXV0aWxzLmpzIj48L3Nj cmlwdD4KIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvdWktaGVscGVyLmpzIj48L3Nj cmlwdD4KIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwv c2NyaXB0PgpAQCAtMzYsMTAgKzM3LDkgQEAgbWVkaWEuYWRkRXZlbnRMaXN0ZW5lcigicGxheSIs ICgpID0+IHsKIAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIGRlYnVnKCJUYXBwaW5n IHRyYWNrcyBidXR0b24uLi4iKTsKLSAgICAgICAgICAgICAgICBbY29udGV4dG1lbnVdID0gYXdh aXQgUHJvbWlzZS5hbGwoWwotICAgICAgICAgICAgICAgICAgICBnZXRUcmFja3NDb250ZXh0TWVu dSgpLAotICAgICAgICAgICAgICAgICAgICBwcmVzc09uRWxlbWVudChzaGFkb3dSb290LnF1ZXJ5 U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSksCi0gICAgICAgICAgICAgICAgXSk7CisgICAgICAg ICAgICAgICAgYXdhaXQgcHJlc3NPbkVsZW1lbnQoc2hhZG93Um9vdC5xdWVyeVNlbGVjdG9yKCJi dXR0b24udHJhY2tzIikpOworICAgICAgICAgICAgICAgIGNvbnRleHRtZW51ID0gYXdhaXQgZ2V0 VHJhY2tzQ29udGV4dE1lbnUoKTsKKwogICAgICAgICAgICAgICAgIGxldCBzdWJ0aXRsZXNNZW51 ID0gY29udGV4dG1lbnVbMF0uY2hpbGRyZW4uZmluZCgoc3VibWVudSkgPT4gc3VibWVudS50aXRs ZSA9PT0gIlN1YnRpdGxlcyIpOwogICAgICAgICAgICAgICAgIGlmIChzdWJ0aXRsZXNNZW51Py5j aGlsZHJlbj8ubGVuZ3RoKSB7CiAgICAgICAgICAgICAgICAgICAgIGF3YWl0IFVJSGVscGVyLmNo b29zZU1lbnVBY3Rpb24oc3VidGl0bGVzTWVudS50aXRsZSk7CkBAIC01OSwxMCArNTksOSBAQCBt ZWRpYS5hZGRFdmVudExpc3RlbmVyKCJwbGF5IiwgKCkgPT4gewogCiAgICAgICAgICAgICB7CiAg ICAgICAgICAgICAgICAgZGVidWcoIlRhcHBpbmcgdHJhY2tzIGJ1dHRvbi4uLiIpOwotICAgICAg ICAgICAgICAgIFtjb250ZXh0bWVudV0gPSBhd2FpdCBQcm9taXNlLmFsbChbCi0gICAgICAgICAg ICAgICAgICAgIGdldFRyYWNrc0NvbnRleHRNZW51KCksCi0gICAgICAgICAgICAgICAgICAgIHBy ZXNzT25FbGVtZW50KHNoYWRvd1Jvb3QucXVlcnlTZWxlY3RvcigiYnV0dG9uLnRyYWNrcyIpKSwK LSAgICAgICAgICAgICAgICBdKTsKKyAgICAgICAgICAgICAgICBhd2FpdCBwcmVzc09uRWxlbWVu dChzaGFkb3dSb290LnF1ZXJ5U2VsZWN0b3IoImJ1dHRvbi50cmFja3MiKSk7CisgICAgICAgICAg ICAgICAgY29udGV4dG1lbnUgPSBhd2FpdCBnZXRUcmFja3NDb250ZXh0TWVudSgpOworCiAgICAg ICAgICAgICAgICAgbGV0IHN1YnRpdGxlc01lbnUgPSBjb250ZXh0bWVudVswXS5jaGlsZHJlbi5m aW5kKChzdWJtZW51KSA9PiBzdWJtZW51LnRpdGxlID09PSAiU3VidGl0bGVzIik7CiAgICAgICAg ICAgICAgICAgaWYgKHN1YnRpdGxlc01lbnU/LmNoaWxkcmVuPy5sZW5ndGgpIHsKICAgICAgICAg ICAgICAgICAgICAgYXdhaXQgVUlIZWxwZXIuY2hvb3NlTWVudUFjdGlvbihzdWJ0aXRsZXNNZW51 LnRpdGxlKTsK