197688 2019-05-08 01:24:52 -0700 Safari resumes autoplay audio elements after getUserMedia 2019-12-19 01:03:16 -0800 1 1 1 Unclassified WebKit Media Safari Technology Preview Mac macOS 10.14 RESOLVED FIXED InRadar P2 Normal --- 1 szymon.witamborski youennf calvaris cdumez commit-queue eric.carlson esprehn+autocc ews-watchlist glenn gyuyoung.kim jer.noble pauldconlin philipj sergio webkit-bug-importer youennf oldest_to_newest 1534263 0 szymon.witamborski 2019-05-08 01:24:52 -0700 Audio elements that have autoplay attribute start playing after getUserMedia resolves. Steps to reproduce: 1. have an <audio src="..." loop autoplay> element in the document - loop is optional but helps to demonstrate the issue, it could be just a long audio file instead 2. start playback by either: - setting "Allow All Auto-Play" for the site - starting playback manually 3. stop playback by either: - calling pause() method on the play element - removing the audio element from DOM 4. request access to the microphone via getUserMedia({ audio: true }) After getUserMedia resolves successfully, the audio element starts playing again, even emits "play" event, even if the element is not in the DOM any more. I found out that removing the autoplay attribute from the element before calling getUserMedia works around it. Here's a codepen that demonstrates the issue with the "remove from DOM" approach but it's the same when calling pause() method instead: https://codepen.io/brainshave/pen/LoVaRj I'm guessing this is related to Safari lifting up constraints on autoplay after successful getUserMedia request. Resuming explicitly paused elements seems like an undesired side-effect though. Tested on Safari 12.1 and TP 81. Tried to run Nightly but I seem to be getting a case of https://bugs.webkit.org/show_bug.cgi?id=194808 1595957 1 webkit-bug-importer 2019-12-05 13:13:24 -0800 <rdar://problem/57674395> 1595959 2 jer.noble 2019-12-05 13:16:25 -0800 Here's the stack trace of the play() called after getUserMedia() promise returns: 4 468288 WebCore::HTMLMediaElement::play():entry WebCore`WebCore::HTMLMediaElement::play() WebCore`WebCore::HTMLMediaElement::resumeAutoplaying()+0xac WebCore`WebCore::Document::updateIsPlayingMedia(unsigned long long)+0x29d WebCore`WebCore::MediaStreamTrackPrivate::forEachObserver(WTF::Function<void (WebCore::MediaStreamTrackPrivate::Observer&)> const&) const+0x2bc WebCore`WebCore::MediaStreamTrackPrivate::sourceStarted()+0x39 WebCore`WebCore::RealtimeMediaSource::forEachObserver(WTF::Function<void (WebCore::RealtimeMediaSource::Observer&)> const&) const+0x2bc WebCore`WebCore::RealtimeMediaSource::start()+0xad WebCore`WebCore::MediaStreamPrivate::startProducingData()+0xad WebCore`WebCore::MediaStream::startProducingData()+0xc7 1595963 3 pauldconlin 2019-12-05 13:19:28 -0800 We're also experiencing this same bug with Flipgrid. Our case involves a video tag instead of audio tag, but the result is the same. We also have a codepen here to reproduce - https://codepen.io/mg0stisha/pen/OJPVEzm Steps to reproduce: - Play the video - Pause the video - Click the 'click me' button (this will remove the video from the DOM) - Accept the camera permissions Expected: Camera and audio are now in place of the previous video Actual: Camera is shown but audio from previous video is playing Firefox: no repro Chrome: no repro Edge: no repro This is currently a production issue for us. The user impact is they are watching other students videos, and then they go to record their own video. Upon accepting camera permissions, the audio of the previous videos they watched then plays in the background causing a jarring experience. We really want to create a great experience for Safari users, and currently we are recommending users to download Chrome/New Edge. We're also in the process of developing a workaround for this issue, but would love to help get it resolved if possible instead. Thank you in advance for your help! 1595973 4 jer.noble 2019-12-05 13:47:22 -0800 This is in HTMLMediaElement.h: ``` void mediaStreamCaptureStarted() { resumeAutoplaying(); } ``` This doesn't seem right; as it's broadcast to every element in the page when capture is started. 1598811 5 385743 youennf 2019-12-16 01:52:37 -0800 Created attachment 385743 Patch 1599722 6 385948 youennf 2019-12-18 02:23:23 -0800 Created attachment 385948 Patch 1599766 7 385948 youennf 2019-12-18 05:57:25 -0800 Comment on attachment 385948 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385948&action=review > Source/WebCore/ChangeLog:13 > + Previously, we were piggy backing on resuming autoplay, which happens after intteruption. s/tt/t/ 1599767 8 385948 eric.carlson 2019-12-18 06:00:42 -0800 Comment on attachment 385948 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385948&action=review >> Source/WebCore/ChangeLog:13 >> + Previously, we were piggy backing on resuming autoplay, which happens after intteruption. > > s/tt/t/ s/piggy backing/piggybacking/ 1599783 9 385969 youennf 2019-12-18 07:02:08 -0800 Created attachment 385969 Patch for landing 1600190 10 385969 commit-queue 2019-12-19 01:03:14 -0800 Comment on attachment 385969 Patch for landing Clearing flags on attachment: 385969 Committed r253742: <https://trac.webkit.org/changeset/253742> 1600191 11 commit-queue 2019-12-19 01:03:16 -0800 All reviewed patches have been landed. Closing bug. 385743 2019-12-16 01:52:37 -0800 2019-12-18 02:23:17 -0800 Patch bug-197688-20191216105236.patch text/plain 8062 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDkxZmUxZDI0YTY1MTk4 YWVlM2NhMWJiNmQyZDVkOTdhZDBkYjVkYS4uN2YzYjI1MDY2MTA2YzczYjIyNjQ5MDZhYmY1ZDFk NzQ5NDY2NmI1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTEyLTE2ICB5b3Vl bm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTYWZhcmkgcmVzdW1lcyBh dXRvcGxheSBhdWRpbyBlbGVtZW50cyBhZnRlciBnZXRVc2VyTWVkaWEKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzY4OAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNTc2NzQzOTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ292ZXJlZCBieSB1cGRhdGVkIHRlc3QuCisKKyAgICAgICAgKiBodG1sL0hU TUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6 bWVkaWFTdHJlYW1DYXB0dXJlU3RhcnRlZCk6CisgICAgICAgIFByZXZpb3VzbHksIHdlIHdlcmUg cGlnZ3kgYmFja2luZyBvbiByZXN1bWluZyBhdXRvcGxheSwgd2hpY2ggaGFwcGVucyBhZnRlciBp bnR0ZXJ1cHRpb24uCisgICAgICAgIFRoaXMgaXMgaW5jb3JyZWN0IGFzIGl0IHRyaWVzIHRvIHBs YXkgcGF1c2VkIGVsZW1lbnRzLgorICAgICAgICBJbnN0ZWFkIHdlIGp1c3QgdHJ5IHRvIHBsYXkg YSBtZWRpYSBlbGVtZW50IGlmIGl0IGNhbiBhdXRvcGxheSB3aXRob3V0IGNoYW5naW5nIHRoZSBt X2F1dG9wbGF5aW5nIHZhbHVlLgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5oOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bWVkaWFTdHJlYW1DYXB0dXJlU3Rh cnRlZCk6IERlbGV0ZWQuCisKIDIwMTktMTItMTUgIHlvdWVubiBmYWJsZXQgIDx5b3Vlbm5AYXBw bGUuY29tPgogCiAgICAgICAgIEZpbGVMaXN0IHNob3VsZCBiZSBleHBvc2VkIHRvIHdvcmtlcnMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IDczMGI0ZTM4OWU3 ODNmZTU2Njc1NWI4YWMzNjg4MTE5ZjA5NjkxNjQuLmY1YzVlZDRiNTMyNDc0MTU2NTg5MzY4Yjlk NmYzZTY1ZTJlZDg0YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNw cApAQCAtODE5Niw2ICs4MTk2LDE0IEBAIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6aGFzTWVkaWFT dHJlYW1Tb3VyY2UoKSBjb25zdAogI2VuZGlmCiB9CiAKKyNpZiBFTkFCTEUoTUVESUFfU1RSRUFN KQordm9pZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVN0cmVhbUNhcHR1cmVTdGFydGVkKCkKK3sK KyAgICBpZiAoY2FuVHJhbnNpdGlvbkZyb21BdXRvcGxheVRvUGxheSgpKQorICAgICAgICBwbGF5 KCk7Cit9CisjZW5kaWYKKwogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjplbnF1ZXVlVGFza0ZvckRp c3BhdGNoZXIoRnVuY3Rpb248dm9pZCgpPiYmIGZ1bmN0aW9uKQogewogICAgIGlmICghaXNNYWlu VGhyZWFkKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxl bWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKaW5kZXggYTVm MTg3Yjc4Zjk0NjE0MTQ5ZWQyYzNkNjRmNGRhNjg0YTNiYzYyZS4uZjk5MDMzZDA5NDg2ZGY4MDRi MWIxNDNjZWM1YmYyZGY4YThjMWUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MTWVkaWFFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmgKQEAgLTU1OSw3ICs1NTksNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgY29u c3QgTWVkaWFSZXNvdXJjZUxvYWRlciogbGFzdE1lZGlhUmVzb3VyY2VMb2FkZXJGb3JUZXN0aW5n KCkgY29uc3Q7CiAKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQotICAgIHZvaWQgbWVkaWFTdHJl YW1DYXB0dXJlU3RhcnRlZCgpIHsgcmVzdW1lQXV0b3BsYXlpbmcoKTsgfQorICAgIHZvaWQgbWVk aWFTdHJlYW1DYXB0dXJlU3RhcnRlZCgpOwogICAgIGJvb2wgaGFzTWVkaWFTdHJlYW1TcmNPYmpl Y3QoKSBjb25zdCB7IHJldHVybiBtX21lZGlhUHJvdmlkZXIgJiYgV1RGOjpob2xkc19hbHRlcm5h dGl2ZTxSZWZQdHI8TWVkaWFTdHJlYW0+PigqbV9tZWRpYVByb3ZpZGVyKTsgfQogI2VuZGlmCiAK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwNWFlNTNmNzkwZTUxZmEzYzExZDgyMGM4YmQyMmY4OTEwZjlkZGViLi4xYTg3YWRl NDVhMGM4YTdlZDY4YmI0NjljYmU5ZGEwZGVmMDVkY2E0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTktMTItMTYgIHlvdWVubiBmYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAg IFNhZmFyaSByZXN1bWVzIGF1dG9wbGF5IGF1ZGlvIGVsZW1lbnRzIGFmdGVyIGdldFVzZXJNZWRp YQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3Njg4 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NzY3NDM5NT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYnJ0Yy92aWRlby1hdXRvcGxheS1leHBl Y3RlZC50eHQ6CisgICAgICAgICogd2VicnRjL3ZpZGVvLWF1dG9wbGF5Lmh0bWw6CisKIDIwMTkt MTItMTUgIHlvdWVubiBmYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFNlY3Vy aXR5T3JpZ2luIHNob3VsZCBiZSB1bmlxdWUgZm9yIG51bGwgYmxvYiBVUkxzIHRoYXQgaGF2ZSBi ZWVuIHVucmVnaXN0ZXJlZApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWF1 dG9wbGF5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hdXRvcGxheS1l eHBlY3RlZC50eHQKaW5kZXggMTIyZWRjMjg5MTAwOTNhNmVlMDBiNTNiZDllZTYxODk3MTcxYjIy MS4uMGQ0NmJlMjhhYzllODk2Y2UyMTY1NTIzYThjMmNlNTExMDczNmRiYiAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWF1dG9wbGF5LWV4cGVjdGVkLnR4dAorKysgYi9MYXlv dXRUZXN0cy93ZWJydGMvdmlkZW8tYXV0b3BsYXktZXhwZWN0ZWQudHh0CkBAIC0xLDcgKzEsMTAg QEAKKyAKIAogCiBQQVNTIEVuc3VyaW5nIGF1dG9wbGF5IGRvZXMgbm90IHdvcmsgb24gcmVndWxh ciB2aWRlbyBlbGVtZW50cyAKIFBBU1MgRW5zdXJpbmcgYXV0b3BsYXkgZG9lcyBub3Qgd29yayBv biByZWd1bGFyIHZpZGVvIGVsZW1lbnRzIHdoZW4gZ2V0VXNlck1lZGlhIGlzIG9uIAogUEFTUyBM b2NhbCBtZWRpYSBzdHJlYW0gYXV0b3BsYXkgCiBQQVNTIFJlbW90ZSBtZWRpYSBzdHJlYW0gYXV0 b3BsYXkgCitQQVNTIEdyYW50aW5nIGdldFVzZXJNZWRpYSBzaG91bGQgbm90IHN0YXJ0IHBhdXNl ZCBtZWRpYSAKK1BBU1MgR3JhbnRpbmcgZ2V0VXNlck1lZGlhIHNob3VsZCBub3Qgc3RhcnQgcGF1 c2VkIG1lZGlhIG9yIG1lZGlhIHRoYXQgY2Fubm90IGF1dG9wbGF5IGR1ZSB0byBhdXRvcGxheSBy ZXN0cmljdGlvbnMgCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hdXRv cGxheS5odG1sIGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWF1dG9wbGF5Lmh0bWwKaW5kZXgg NTc2NWQ0NGQzOTFkYTdkYTM4MWIzNjY1M2I0OWYxZWEzYjQwZWUwZS4uZDZkZmE5YjYxMGQyZTVk OGEwYjYwZWNjZjk1MDA5MTVjMmNiNjdlMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvd2VicnRj L3ZpZGVvLWF1dG9wbGF5Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWF1dG9w bGF5Lmh0bWwKQEAgLTIsNyArMiw3IEBACiA8aHRtbD4KICAgICA8aGVhZD4KICAgICAgICAgPG1l dGEgY2hhcnNldD0idXRmLTgiPgotICAgICAgICA8dGl0bGU+VGVzdGluZyBiYXNpYyB2aWRlbyBl eGNoYW5nZSBmcm9tIG9mZmVyZXIgdG8gcmVjZWl2ZXI8L3RpdGxlPgorICAgICAgICA8dGl0bGU+ VGVzdGluZyBiYXNpYyBhdXRvcGxheSB3aXRoIGdldFVzZXJNZWRpYTwvdGl0bGU+CiAgICAgICAg IDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgogICAg ICAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3Nj cmlwdD4KICAgICAgICAgPHNjcmlwdCBzcmM9Li4vbWVkaWEvbWVkaWEtZmlsZS5qcz48L3Njcmlw dD4KQEAgLTEwLDYgKzEwLDE2IEBACiAgICAgPC9oZWFkPgogICAgIDxib2R5PgogICAgICAgICA8 dmlkZW8gaWQ9InZpZGVvIiBhdXRvcGxheT48L3ZpZGVvPgorICAgICAgICA8YnI+CisgICAgICAg IDx2aWRlbyBpZD0idmlkZW8xIiBsb29wIGF1dG9wbGF5IHBsYXlzSW5saW5lPjwvdmlkZW8+Cisg ICAgICAgIDx2aWRlbyBpZD0idmlkZW8yIiBsb29wIGF1dG9wbGF5IHBsYXlzSW5saW5lPjwvdmlk ZW8+CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW8zIiBsb29wIGF1dG9wbGF5IHBsYXlzSW5saW5l PjwvdmlkZW8+CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW80IiBsb29wIGF1dG9wbGF5IHBsYXlz SW5saW5lPjwvdmlkZW8+CisgICAgICAgIDxicj4KKyAgICAgICAgPHZpZGVvIGlkPSJ2aWRlbzEw IiBsb29wIGF1dG9wbGF5IHBsYXlzSW5saW5lPjwvdmlkZW8+CisgICAgICAgIDx2aWRlbyBpZD0i dmlkZW8yMCIgbG9vcCBhdXRvcGxheSBwbGF5c0lubGluZT48L3ZpZGVvPgorICAgICAgICA8dmlk ZW8gaWQ9InZpZGVvMzAiIGxvb3AgYXV0b3BsYXkgcGxheXNJbmxpbmU+PC92aWRlbz4KKyAgICAg ICAgPHZpZGVvIGlkPSJ2aWRlbzQwIiBsb29wIGF1dG9wbGF5IHBsYXlzSW5saW5lPjwvdmlkZW8+ CiAgICAgICAgIDxzY3JpcHQgc3JjID0icm91dGluZXMuanMiPjwvc2NyaXB0PgogICAgICAgICA8 c2NyaXB0PgogdmlkZW8gPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidmlkZW8iKTsKQEAgLTYz LDYgKzczLDY5IEBAIHByb21pc2VfdGVzdCgodGVzdCkgPT4gewogICAgIH0pOwogfSwgIlJlbW90 ZSBtZWRpYSBzdHJlYW0gYXV0b3BsYXkiKTsKIAorcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9 PiB7CisgICAgdmlkZW8xLnNyYyA9IGZpbmRNZWRpYUZpbGUoInZpZGVvIiwgIi4uL21lZGlhL2Nv bnRlbnQvYXVkaW8tdHJhY2tzIik7CisgICAgdmlkZW8yLnNyYyA9IGZpbmRNZWRpYUZpbGUoInZp ZGVvIiwgIi4uL21lZGlhL2NvbnRlbnQvYXVkaW8tdHJhY2tzIik7CisgICAgdmlkZW8zLnNyYyA9 IGZpbmRNZWRpYUZpbGUoInZpZGVvIiwgIi4uL21lZGlhL2NvbnRlbnQvYXVkaW8tdHJhY2tzIik7 CisKKyAgICB3aGlsZSAodmlkZW8xLnBhdXNlZCkKKyAgICAgICAgYXdhaXQgbmV3IFByb21pc2Uo cmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDUwKSk7CisgICAgd2hpbGUgKHZpZGVvMi5w YXVzZWQpCisgICAgICAgIGF3YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gc2V0VGltZW91dChy ZXNvbHZlLCA1MCkpOworICAgIHdoaWxlICh2aWRlbzMucGF1c2VkKQorICAgICAgICBhd2FpdCBu ZXcgUHJvbWlzZShyZXNvbHZlID0+IHNldFRpbWVvdXQocmVzb2x2ZSwgNTApKTsKKworICAgIHZp ZGVvMS5wYXVzZSgpOworICAgIGxldCByZW1vdmVkVmlkZW8yID0gdmlkZW8yOworICAgIHJlbW92 ZWRWaWRlbzIucmVtb3ZlKCk7CisKKyAgICB2aWRlbzQuc3JjT2JqZWN0ID0gYXdhaXQgbmF2aWdh dG9yLm1lZGlhRGV2aWNlcy5nZXRVc2VyTWVkaWEoeyB2aWRlbyA6IHRydWUgfSk7CisKKyAgICB3 aGlsZSAodmlkZW80LnBhdXNlZCkKKyAgICAgICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2ZSA9 PiBzZXRUaW1lb3V0KHJlc29sdmUsIDUwKSk7CisKKyAgICBhc3NlcnRfdHJ1ZSh2aWRlbzEucGF1 c2VkLCAicGF1c2VkIHZpZGVvIik7CisgICAgYXNzZXJ0X3RydWUocmVtb3ZlZFZpZGVvMi5wYXVz ZWQsICJvdXQgb2YgRE9NIHZpZGVvIik7CisgICAgYXNzZXJ0X2ZhbHNlKHZpZGVvMy5wYXVzZWQs ICJzdGlsbCBhdXRvcGxheWluZyB2aWRlbyIpOworCisgICAgdmlkZW8xLnJlbW92ZSgpOworICAg IHZpZGVvMy5yZW1vdmUoKTsKKyAgICB2aWRlbzQucmVtb3ZlKCk7Cit9LCAiR3JhbnRpbmcgZ2V0 VXNlck1lZGlhIHNob3VsZCBub3Qgc3RhcnQgcGF1c2VkIG1lZGlhIik7CisKK3Byb21pc2VfdGVz dChhc3luYyAodGVzdCkgPT4geworICAgIHZpZGVvMTAuc3JjID0gZmluZE1lZGlhRmlsZSgidmlk ZW8iLCAiLi4vbWVkaWEvY29udGVudC9hdWRpby10cmFja3MiKTsKKyAgICB2aWRlbzIwLnNyYyA9 IGZpbmRNZWRpYUZpbGUoInZpZGVvIiwgIi4uL21lZGlhL2NvbnRlbnQvYXVkaW8tdHJhY2tzIik7 CisgICAgdmlkZW8zMC5zcmMgPSBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIsICIuLi9tZWRpYS9jb250 ZW50L2F1ZGlvLXRyYWNrcyIpOworICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKSB7CisgICAgICAg IGludGVybmFscy5zZXRNZWRpYUVsZW1lbnRSZXN0cmljdGlvbnModmlkZW8xMCwgIlJlcXVpcmVV c2VyR2VzdHVyZUZvclZpZGVvUmF0ZUNoYW5nZSIpOworICAgICAgICBpbnRlcm5hbHMuc2V0TWVk aWFFbGVtZW50UmVzdHJpY3Rpb25zKHZpZGVvMjAsICJSZXF1aXJlVXNlckdlc3R1cmVGb3JWaWRl b1JhdGVDaGFuZ2UiKTsKKyAgICAgICAgaW50ZXJuYWxzLnNldE1lZGlhRWxlbWVudFJlc3RyaWN0 aW9ucyh2aWRlbzMwLCAiUmVxdWlyZVVzZXJHZXN0dXJlRm9yVmlkZW9SYXRlQ2hhbmdlIik7Cisg ICAgICAgIGludGVybmFscy5zZXRNZWRpYUVsZW1lbnRSZXN0cmljdGlvbnModmlkZW80MCwgIlJl cXVpcmVVc2VyR2VzdHVyZUZvclZpZGVvUmF0ZUNoYW5nZSIpOworICAgIH0KKyAgICBhd2FpdCBu ZXcgUHJvbWlzZShyZXNvbHZlID0+IHNldFRpbWVvdXQocmVzb2x2ZSwgNTApKTsKKyAgICBhc3Nl cnRfdHJ1ZSh2aWRlbzEwLnBhdXNlZCwgInBhdXNlZCB2aWRlbyIpOworICAgIGFzc2VydF90cnVl KHZpZGVvMjAucGF1c2VkLCAicGF1c2VkIHZpZGVvIik7CisgICAgYXNzZXJ0X3RydWUodmlkZW8z MC5wYXVzZWQsICJwYXVzZWQgdmlkZW8iKTsKKworICAgIHZpZGVvMTAucGF1c2UoKTsKKyAgICBs ZXQgcmVtb3ZlZFZpZGVvMjAgPSB2aWRlbzIwOworICAgIHJlbW92ZWRWaWRlbzIwLnJlbW92ZSgp OworCisgICAgdmlkZW80MC5zcmNPYmplY3QgPSBhd2FpdCBuYXZpZ2F0b3IubWVkaWFEZXZpY2Vz LmdldFVzZXJNZWRpYSh7IHZpZGVvIDogdHJ1ZSB9KTsKKworICAgIHdoaWxlICh2aWRlbzQwLnBh dXNlZCkKKyAgICAgICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJl c29sdmUsIDUwKSk7CisKKyAgICBhc3NlcnRfdHJ1ZSh2aWRlbzEwLnBhdXNlZCwgInBhdXNlZCB2 aWRlbyIpOworICAgIGFzc2VydF90cnVlKHJlbW92ZWRWaWRlbzIwLnBhdXNlZCwgIm91dCBvZiBE T00gdmlkZW8iKTsKKyAgICBhc3NlcnRfdHJ1ZSh2aWRlbzMwLnBhdXNlZCwgInN0aWxsIG5vdCBh dXRvcGxheWluZyB2aWRlbyIpOworCisgICAgdmlkZW8xMC5yZW1vdmUoKTsKKyAgICB2aWRlbzMw LnJlbW92ZSgpOworICAgIHZpZGVvNDAucmVtb3ZlKCk7Cit9LCAiR3JhbnRpbmcgZ2V0VXNlck1l ZGlhIHNob3VsZCBub3Qgc3RhcnQgcGF1c2VkIG1lZGlhIG9yIG1lZGlhIHRoYXQgY2Fubm90IGF1 dG9wbGF5IGR1ZSB0byBhdXRvcGxheSByZXN0cmljdGlvbnMiKTsKKwogICAgICAgICA8L3Njcmlw dD4KICAgICA8L2JvZHk+CiA8L2h0bWw+Cg== 385948 2019-12-18 02:23:23 -0800 2019-12-18 07:02:04 -0800 Patch bug-197688-20191218112320.patch text/plain 8181 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjEyODNiZjFkNWIyMGQ5 ZTY4NzRmNjk1MmM1ZmIwZGM0Yjk5NzM0NS4uYzYzNGMwMDhkZWRmYWM5MGUwY2QwZThhY2VmYjQz OTkxMjNhNGRiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTEyLTE3ICB5b3Vl bm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTYWZhcmkgcmVzdW1lcyBh dXRvcGxheSBhdWRpbyBlbGVtZW50cyBhZnRlciBnZXRVc2VyTWVkaWEKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzY4OAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNTc2NzQzOTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ292ZXJlZCBieSB1cGRhdGVkIHRlc3QuCisKKyAgICAgICAgKiBodG1sL0hU TUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6 bWVkaWFTdHJlYW1DYXB0dXJlU3RhcnRlZCk6CisgICAgICAgIFByZXZpb3VzbHksIHdlIHdlcmUg cGlnZ3kgYmFja2luZyBvbiByZXN1bWluZyBhdXRvcGxheSwgd2hpY2ggaGFwcGVucyBhZnRlciBp bnR0ZXJ1cHRpb24uCisgICAgICAgIFRoaXMgaXMgaW5jb3JyZWN0IGFzIGl0IHRyaWVzIHRvIHBs YXkgcGF1c2VkIGVsZW1lbnRzLgorICAgICAgICBJbnN0ZWFkIHdlIGp1c3QgdHJ5IHRvIHBsYXkg YSBtZWRpYSBlbGVtZW50IGlmIGl0IGNhbiBhdXRvcGxheSB3aXRob3V0IGNoYW5naW5nIHRoZSBt X2F1dG9wbGF5aW5nIHZhbHVlLgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5oOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6bWVkaWFTdHJlYW1DYXB0dXJlU3Rh cnRlZCk6IERlbGV0ZWQuCisKIDIwMTktMTItMTcgIFRoaWJhdWx0IFNhdW5pZXIgIDx0c2F1bmll ckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdW1dQRV0gRml4IHJlZ3Jlc3Npb25z IHJlbGF0ZWQgdG8gb3VyICdGaXggR1N0cmVhbWVyIGNhcHR1cmVyIG1vY2snIHBhdGNoCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCA3MzBiNGUzODllNzgzZmU1 NjY3NTViOGFjMzY4ODExOWYwOTY5MTY0Li5mNWM1ZWQ0YjUzMjQ3NDE1NjU4OTM2OGI5ZDZmM2U2 NWUyZWQ4NGI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAg LTgxOTYsNiArODE5NiwxNCBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6Omhhc01lZGlhU3RyZWFt U291cmNlKCkgY29uc3QKICNlbmRpZgogfQogCisjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKK3Zv aWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFTdHJlYW1DYXB0dXJlU3RhcnRlZCgpCit7CisgICAg aWYgKGNhblRyYW5zaXRpb25Gcm9tQXV0b3BsYXlUb1BsYXkoKSkKKyAgICAgICAgcGxheSgpOwor fQorI2VuZGlmCisKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6ZW5xdWV1ZVRhc2tGb3JEaXNwYXRj aGVyKEZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5jdGlvbikKIHsKICAgICBpZiAoIWlzTWFpblRocmVh ZCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu aCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IGE1ZjE4N2I3 OGY5NDYxNDE0OWVkMmMzZDY0ZjRkYTY4NGEzYmM2MmUuLmY5OTAzM2QwOTQ4NmRmODA0YjFiMTQz Y2VjNWJmMmRmOGE4YzFlMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1l ZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5o CkBAIC01NTksNyArNTU5LDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIGNvbnN0IE1l ZGlhUmVzb3VyY2VMb2FkZXIqIGxhc3RNZWRpYVJlc291cmNlTG9hZGVyRm9yVGVzdGluZygpIGNv bnN0OwogCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKLSAgICB2b2lkIG1lZGlhU3RyZWFtQ2Fw dHVyZVN0YXJ0ZWQoKSB7IHJlc3VtZUF1dG9wbGF5aW5nKCk7IH0KKyAgICB2b2lkIG1lZGlhU3Ry ZWFtQ2FwdHVyZVN0YXJ0ZWQoKTsKICAgICBib29sIGhhc01lZGlhU3RyZWFtU3JjT2JqZWN0KCkg Y29uc3QgeyByZXR1cm4gbV9tZWRpYVByb3ZpZGVyICYmIFdURjo6aG9sZHNfYWx0ZXJuYXRpdmU8 UmVmUHRyPE1lZGlhU3RyZWFtPj4oKm1fbWVkaWFQcm92aWRlcik7IH0KICNlbmRpZgogCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5k ZXggOTI3NDI3NWZlNTk3NDQxYThmZGYwMjhkMTg4MTc5MDYxNjQ1MmM4MS4uMGNjNDc1NjhkNzA4 MWU4MGMzOGY2YWZmZjc5ZWIxNmM2ZGEzYmZjNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5 LTEyLTE3ICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTYWZh cmkgcmVzdW1lcyBhdXRvcGxheSBhdWRpbyBlbGVtZW50cyBhZnRlciBnZXRVc2VyTWVkaWEKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzY4OAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNTc2NzQzOTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3ZWJydGMvdmlkZW8tYXV0b3BsYXktZXhwZWN0ZWQu dHh0OgorICAgICAgICAqIHdlYnJ0Yy92aWRlby1hdXRvcGxheS5odG1sOgorCiAyMDE5LTEyLTE3 ICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBCdW1wIHRoZSBw cmlvcml0eSBvZiBDYWNoZVN0b3JhZ2VFbmdpbmUgd3JpdGUgb3BlcmF0aW9ucwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWF1dG9wbGF5LWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL3dlYnJ0Yy92aWRlby1hdXRvcGxheS1leHBlY3RlZC50eHQKaW5kZXggMTIyZWRjMjg5 MTAwOTNhNmVlMDBiNTNiZDllZTYxODk3MTcxYjIyMS4uMGQ0NmJlMjhhYzllODk2Y2UyMTY1NTIz YThjMmNlNTExMDczNmRiYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWF1 dG9wbGF5LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tYXV0b3Bs YXktZXhwZWN0ZWQudHh0CkBAIC0xLDcgKzEsMTAgQEAKKyAKIAogCiBQQVNTIEVuc3VyaW5nIGF1 dG9wbGF5IGRvZXMgbm90IHdvcmsgb24gcmVndWxhciB2aWRlbyBlbGVtZW50cyAKIFBBU1MgRW5z dXJpbmcgYXV0b3BsYXkgZG9lcyBub3Qgd29yayBvbiByZWd1bGFyIHZpZGVvIGVsZW1lbnRzIHdo ZW4gZ2V0VXNlck1lZGlhIGlzIG9uIAogUEFTUyBMb2NhbCBtZWRpYSBzdHJlYW0gYXV0b3BsYXkg CiBQQVNTIFJlbW90ZSBtZWRpYSBzdHJlYW0gYXV0b3BsYXkgCitQQVNTIEdyYW50aW5nIGdldFVz ZXJNZWRpYSBzaG91bGQgbm90IHN0YXJ0IHBhdXNlZCBtZWRpYSAKK1BBU1MgR3JhbnRpbmcgZ2V0 VXNlck1lZGlhIHNob3VsZCBub3Qgc3RhcnQgcGF1c2VkIG1lZGlhIG9yIG1lZGlhIHRoYXQgY2Fu bm90IGF1dG9wbGF5IGR1ZSB0byBhdXRvcGxheSByZXN0cmljdGlvbnMgCiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hdXRvcGxheS5odG1sIGIvTGF5b3V0VGVzdHMvd2Vi cnRjL3ZpZGVvLWF1dG9wbGF5Lmh0bWwKaW5kZXggNTc2NWQ0NGQzOTFkYTdkYTM4MWIzNjY1M2I0 OWYxZWEzYjQwZWUwZS4uZGE4NjRiYzliNWM0MDA3Mjk3YzI4OTlmYTEzZmM4YzUyMzQwOTU1OCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWF1dG9wbGF5Lmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLWF1dG9wbGF5Lmh0bWwKQEAgLTIsNyArMiw3IEBACiA8 aHRtbD4KICAgICA8aGVhZD4KICAgICAgICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgotICAgICAg ICA8dGl0bGU+VGVzdGluZyBiYXNpYyB2aWRlbyBleGNoYW5nZSBmcm9tIG9mZmVyZXIgdG8gcmVj ZWl2ZXI8L3RpdGxlPgorICAgICAgICA8dGl0bGU+VGVzdGluZyBiYXNpYyBhdXRvcGxheSB3aXRo IGdldFVzZXJNZWRpYTwvdGl0bGU+CiAgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMv dGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgogICAgICAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3Vy Y2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdCBzcmM9 Li4vbWVkaWEvbWVkaWEtZmlsZS5qcz48L3NjcmlwdD4KQEAgLTEwLDYgKzEwLDE2IEBACiAgICAg PC9oZWFkPgogICAgIDxib2R5PgogICAgICAgICA8dmlkZW8gaWQ9InZpZGVvIiBhdXRvcGxheT48 L3ZpZGVvPgorICAgICAgICA8YnI+CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW8xIiBsb29wIGF1 dG9wbGF5IHBsYXlzSW5saW5lPjwvdmlkZW8+CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW8yIiBs b29wIGF1dG9wbGF5IHBsYXlzSW5saW5lPjwvdmlkZW8+CisgICAgICAgIDx2aWRlbyBpZD0idmlk ZW8zIiBsb29wIGF1dG9wbGF5IHBsYXlzSW5saW5lPjwvdmlkZW8+CisgICAgICAgIDx2aWRlbyBp ZD0idmlkZW80IiBsb29wIGF1dG9wbGF5IHBsYXlzSW5saW5lPjwvdmlkZW8+CisgICAgICAgIDxi cj4KKyAgICAgICAgPHZpZGVvIGlkPSJ2aWRlbzEwIiBsb29wIGF1dG9wbGF5IHBsYXlzSW5saW5l PjwvdmlkZW8+CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW8yMCIgbG9vcCBhdXRvcGxheSBwbGF5 c0lubGluZT48L3ZpZGVvPgorICAgICAgICA8dmlkZW8gaWQ9InZpZGVvMzAiIGxvb3AgYXV0b3Bs YXkgcGxheXNJbmxpbmU+PC92aWRlbz4KKyAgICAgICAgPHZpZGVvIGlkPSJ2aWRlbzQwIiBsb29w IGF1dG9wbGF5IHBsYXlzSW5saW5lPjwvdmlkZW8+CiAgICAgICAgIDxzY3JpcHQgc3JjID0icm91 dGluZXMuanMiPjwvc2NyaXB0PgogICAgICAgICA8c2NyaXB0PgogdmlkZW8gPSBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgidmlkZW8iKTsKQEAgLTYzLDYgKzczLDc1IEBAIHByb21pc2VfdGVzdCgo dGVzdCkgPT4gewogICAgIH0pOwogfSwgIlJlbW90ZSBtZWRpYSBzdHJlYW0gYXV0b3BsYXkiKTsK IAorcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICAgaWYgKHdpbmRvdy5pbnRlcm5h bHMpIHsKKyAgICAgICAgaW50ZXJuYWxzLnNldE1lZGlhRWxlbWVudFJlc3RyaWN0aW9ucyh2aWRl bzEsICIiKTsKKyAgICAgICAgaW50ZXJuYWxzLnNldE1lZGlhRWxlbWVudFJlc3RyaWN0aW9ucyh2 aWRlbzIsICIiKTsKKyAgICAgICAgaW50ZXJuYWxzLnNldE1lZGlhRWxlbWVudFJlc3RyaWN0aW9u cyh2aWRlbzMsICIiKTsKKyAgICAgICAgaW50ZXJuYWxzLnNldE1lZGlhRWxlbWVudFJlc3RyaWN0 aW9ucyh2aWRlbzQsICIiKTsKKyAgICB9CisKKyAgICB2aWRlbzEuc3JjID0gZmluZE1lZGlhRmls ZSgidmlkZW8iLCAiLi4vbWVkaWEvY29udGVudC9hdWRpby10cmFja3MiKTsKKyAgICB2aWRlbzIu c3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8iLCAiLi4vbWVkaWEvY29udGVudC9hdWRpby10cmFj a3MiKTsKKyAgICB2aWRlbzMuc3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8iLCAiLi4vbWVkaWEv Y29udGVudC9hdWRpby10cmFja3MiKTsKKworICAgIGF3YWl0IHZpZGVvMS5wbGF5KCk7CisgICAg YXdhaXQgdmlkZW8yLnBsYXkoKTsKKyAgICBhd2FpdCB2aWRlbzMucGxheSgpOworCisgICAgYXdh aXQgdmlkZW8xLnBhdXNlKCk7CisgICAgbGV0IHJlbW92ZWRWaWRlbzIgPSB2aWRlbzI7CisgICAg cmVtb3ZlZFZpZGVvMi5yZW1vdmUoKTsKKworICAgIHZpZGVvNC5zcmNPYmplY3QgPSBhd2FpdCBu YXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7IHZpZGVvIDogdHJ1ZSB9KTsKKwor ICAgIHdoaWxlICh2aWRlbzQucGF1c2VkKQorICAgICAgICBhd2FpdCBuZXcgUHJvbWlzZShyZXNv bHZlID0+IHNldFRpbWVvdXQocmVzb2x2ZSwgNTApKTsKKworICAgIGFzc2VydF90cnVlKHZpZGVv MS5wYXVzZWQsICJwYXVzZWQgdmlkZW8iKTsKKyAgICBhc3NlcnRfdHJ1ZShyZW1vdmVkVmlkZW8y LnBhdXNlZCwgIm91dCBvZiBET00gdmlkZW8iKTsKKyAgICBhc3NlcnRfZmFsc2UodmlkZW8zLnBh dXNlZCwgInN0aWxsIHBsYXlpbmcgdmlkZW8iKTsKKworICAgIHZpZGVvMS5yZW1vdmUoKTsKKyAg ICB2aWRlbzMucmVtb3ZlKCk7CisgICAgdmlkZW80LnJlbW92ZSgpOworfSwgIkdyYW50aW5nIGdl dFVzZXJNZWRpYSBzaG91bGQgbm90IHN0YXJ0IHBhdXNlZCBtZWRpYSIpOworCitwcm9taXNlX3Rl c3QoYXN5bmMgKHRlc3QpID0+IHsKKyAgICBpZiAod2luZG93LmludGVybmFscykgeworICAgICAg ICBpbnRlcm5hbHMuc2V0TWVkaWFFbGVtZW50UmVzdHJpY3Rpb25zKHZpZGVvMTAsICJSZXF1aXJl VXNlckdlc3R1cmVGb3JWaWRlb1JhdGVDaGFuZ2UiKTsKKyAgICAgICAgaW50ZXJuYWxzLnNldE1l ZGlhRWxlbWVudFJlc3RyaWN0aW9ucyh2aWRlbzIwLCAiUmVxdWlyZVVzZXJHZXN0dXJlRm9yVmlk ZW9SYXRlQ2hhbmdlIik7CisgICAgICAgIGludGVybmFscy5zZXRNZWRpYUVsZW1lbnRSZXN0cmlj dGlvbnModmlkZW8zMCwgIlJlcXVpcmVVc2VyR2VzdHVyZUZvclZpZGVvUmF0ZUNoYW5nZSIpOwor ICAgICAgICBpbnRlcm5hbHMuc2V0TWVkaWFFbGVtZW50UmVzdHJpY3Rpb25zKHZpZGVvNDAsICJS ZXF1aXJlVXNlckdlc3R1cmVGb3JWaWRlb1JhdGVDaGFuZ2UiKTsKKyAgICB9CisKKyAgICB2aWRl bzEwLnNyYyA9IGZpbmRNZWRpYUZpbGUoInZpZGVvIiwgIi4uL21lZGlhL2NvbnRlbnQvYXVkaW8t dHJhY2tzIik7CisgICAgdmlkZW8yMC5zcmMgPSBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIsICIuLi9t ZWRpYS9jb250ZW50L2F1ZGlvLXRyYWNrcyIpOworICAgIHZpZGVvMzAuc3JjID0gZmluZE1lZGlh RmlsZSgidmlkZW8iLCAiLi4vbWVkaWEvY29udGVudC9hdWRpby10cmFja3MiKTsKKworICAgIGF3 YWl0IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gc2V0VGltZW91dChyZXNvbHZlLCA1MCkpOworICAg IGFzc2VydF90cnVlKHZpZGVvMTAucGF1c2VkLCAicGF1c2VkIHZpZGVvIik7CisgICAgYXNzZXJ0 X3RydWUodmlkZW8yMC5wYXVzZWQsICJwYXVzZWQgdmlkZW8iKTsKKyAgICBhc3NlcnRfdHJ1ZSh2 aWRlbzMwLnBhdXNlZCwgInBhdXNlZCB2aWRlbyIpOworCisgICAgdmlkZW8xMC5wYXVzZSgpOwor ICAgIGxldCByZW1vdmVkVmlkZW8yMCA9IHZpZGVvMjA7CisgICAgcmVtb3ZlZFZpZGVvMjAucmVt b3ZlKCk7CisKKyAgICB2aWRlbzQwLnNyY09iamVjdCA9IGF3YWl0IG5hdmlnYXRvci5tZWRpYURl dmljZXMuZ2V0VXNlck1lZGlhKHsgdmlkZW8gOiB0cnVlIH0pOworCisgICAgd2hpbGUgKHZpZGVv NDAucGF1c2VkKQorICAgICAgICBhd2FpdCBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHNldFRpbWVv dXQocmVzb2x2ZSwgNTApKTsKKworICAgIGFzc2VydF90cnVlKHZpZGVvMTAucGF1c2VkLCAicGF1 c2VkIHZpZGVvIik7CisgICAgYXNzZXJ0X3RydWUocmVtb3ZlZFZpZGVvMjAucGF1c2VkLCAib3V0 IG9mIERPTSB2aWRlbyIpOworICAgIGFzc2VydF90cnVlKHZpZGVvMzAucGF1c2VkLCAic3RpbGwg bm90IGF1dG9wbGF5aW5nIHZpZGVvIik7CisKKyAgICB2aWRlbzEwLnJlbW92ZSgpOworICAgIHZp ZGVvMzAucmVtb3ZlKCk7CisgICAgdmlkZW80MC5yZW1vdmUoKTsKK30sICJHcmFudGluZyBnZXRV c2VyTWVkaWEgc2hvdWxkIG5vdCBzdGFydCBwYXVzZWQgbWVkaWEgb3IgbWVkaWEgdGhhdCBjYW5u b3QgYXV0b3BsYXkgZHVlIHRvIGF1dG9wbGF5IHJlc3RyaWN0aW9ucyIpOworCiAgICAgICAgIDwv c2NyaXB0PgogICAgIDwvYm9keT4KIDwvaHRtbD4K 385969 2019-12-18 07:02:08 -0800 2019-12-19 01:03:14 -0800 Patch for landing bug-197688-20191218160207.patch text/plain 8149 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTgwMWExMzMzNjg3Nzg0 NDkxNTllM2YzYTA2ZTg2MGE3MGJlOGUzOS4uZmM2MGM5OTUwYmY4YTVkNGVhYTFhMzMzN2FmZDg4 YTg3YzhiNzcyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTEyLTE4ICB5b3Vl bm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTYWZhcmkgcmVzdW1lcyBh dXRvcGxheSBhdWRpbyBlbGVtZW50cyBhZnRlciBnZXRVc2VyTWVkaWEKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzY4OAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vNTc2NzQzOTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgor CisgICAgICAgIENvdmVyZWQgYnkgdXBkYXRlZCB0ZXN0LgorCisgICAgICAgICogaHRtbC9IVE1M TWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1l ZGlhU3RyZWFtQ2FwdHVyZVN0YXJ0ZWQpOgorICAgICAgICBQcmV2aW91c2x5LCB3ZSB3ZXJlIHBp Z2d5YmFja2luZyBvbiByZXN1bWluZyBhdXRvcGxheSwgd2hpY2ggaGFwcGVucyBhZnRlciBpbnRl cnVwdGlvbi4KKyAgICAgICAgVGhpcyBpcyBpbmNvcnJlY3QgYXMgaXQgdHJpZXMgdG8gcGxheSBw YXVzZWQgZWxlbWVudHMuCisgICAgICAgIEluc3RlYWQgd2UganVzdCB0cnkgdG8gcGxheSBhIG1l ZGlhIGVsZW1lbnQgaWYgaXQgY2FuIGF1dG9wbGF5IHdpdGhvdXQgY2hhbmdpbmcgdGhlIG1fYXV0 b3BsYXlpbmcgdmFsdWUuCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50Lmg6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVN0cmVhbUNhcHR1cmVTdGFydGVk KTogRGVsZXRlZC4KKwogMjAxOS0xMi0xOCAgeW91ZW5uIGZhYmxldCAgPHlvdWVubkBhcHBsZS5j b20+CiAKICAgICAgICAgQXBwQ2FjaGUgc2hvdWxkIHJlcXVlc3QgY2VydGlmaWNhdGUgaW5mbyB3 aGVuIGxvYWRpbmcgcmVzb3VyY2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50 LmNwcAppbmRleCA3MzBiNGUzODllNzgzZmU1NjY3NTViOGFjMzY4ODExOWYwOTY5MTY0Li5mNWM1 ZWQ0YjUzMjQ3NDE1NjU4OTM2OGI5ZDZmM2U2NWUyZWQ4NGI1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTgxOTYsNiArODE5NiwxNCBAQCBib29sIEhUTUxN ZWRpYUVsZW1lbnQ6Omhhc01lZGlhU3RyZWFtU291cmNlKCkgY29uc3QKICNlbmRpZgogfQogCisj aWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKK3ZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFTdHJl YW1DYXB0dXJlU3RhcnRlZCgpCit7CisgICAgaWYgKGNhblRyYW5zaXRpb25Gcm9tQXV0b3BsYXlU b1BsYXkoKSkKKyAgICAgICAgcGxheSgpOworfQorI2VuZGlmCisKIHZvaWQgSFRNTE1lZGlhRWxl bWVudDo6ZW5xdWV1ZVRhc2tGb3JEaXNwYXRjaGVyKEZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5jdGlv bikKIHsKICAgICBpZiAoIWlzTWFpblRocmVhZCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1l ZGlhRWxlbWVudC5oCmluZGV4IGE1ZjE4N2I3OGY5NDYxNDE0OWVkMmMzZDY0ZjRkYTY4NGEzYmM2 MmUuLmY5OTAzM2QwOTQ4NmRmODA0YjFiMTQzY2VjNWJmMmRmOGE4YzFlMTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCkBAIC01NTksNyArNTU5LDcgQEAgcHVibGljOgog ICAgIFdFQkNPUkVfRVhQT1JUIGNvbnN0IE1lZGlhUmVzb3VyY2VMb2FkZXIqIGxhc3RNZWRpYVJl c291cmNlTG9hZGVyRm9yVGVzdGluZygpIGNvbnN0OwogCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVB TSkKLSAgICB2b2lkIG1lZGlhU3RyZWFtQ2FwdHVyZVN0YXJ0ZWQoKSB7IHJlc3VtZUF1dG9wbGF5 aW5nKCk7IH0KKyAgICB2b2lkIG1lZGlhU3RyZWFtQ2FwdHVyZVN0YXJ0ZWQoKTsKICAgICBib29s IGhhc01lZGlhU3RyZWFtU3JjT2JqZWN0KCkgY29uc3QgeyByZXR1cm4gbV9tZWRpYVByb3ZpZGVy ICYmIFdURjo6aG9sZHNfYWx0ZXJuYXRpdmU8UmVmUHRyPE1lZGlhU3RyZWFtPj4oKm1fbWVkaWFQ cm92aWRlcik7IH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYzQzMjQ5NWM5NjU5Zjg5NzY3YTk0YjM5MjU3 YjdlNmQ4NGNjZGJkMS4uNDdjNDhhNDM5NjFlODAzYjhkMzg3NTFmOGNlYzFiMDRhNGMxMmViYSAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTEyLTE4ICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5u QGFwcGxlLmNvbT4KKworICAgICAgICBTYWZhcmkgcmVzdW1lcyBhdXRvcGxheSBhdWRpbyBlbGVt ZW50cyBhZnRlciBnZXRVc2VyTWVkaWEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5NzY4OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTc2NzQzOTU+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgICogd2VicnRj L3ZpZGVvLWF1dG9wbGF5LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiB3ZWJydGMvdmlkZW8tYXV0 b3BsYXkuaHRtbDoKKwogMjAxOS0xMi0xNyAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWpp aUBzb255LmNvbT4KIAogICAgICAgICBbaU9TXSBBcmFiaWMgdGV4dCBvbiBXaWtpcGVkaWEgaXMg c2hvd24gYXMgYm94ZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hdXRv cGxheS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tYXV0b3BsYXktZXhw ZWN0ZWQudHh0CmluZGV4IDEyMmVkYzI4OTEwMDkzYTZlZTAwYjUzYmQ5ZWU2MTg5NzE3MWIyMjEu LjBkNDZiZTI4YWM5ZTg5NmNlMjE2NTUyM2E4YzJjZTUxMTA3MzZkYmIgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hdXRvcGxheS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvd2VicnRjL3ZpZGVvLWF1dG9wbGF5LWV4cGVjdGVkLnR4dApAQCAtMSw3ICsxLDEwIEBA CisgCiAKIAogUEFTUyBFbnN1cmluZyBhdXRvcGxheSBkb2VzIG5vdCB3b3JrIG9uIHJlZ3VsYXIg dmlkZW8gZWxlbWVudHMgCiBQQVNTIEVuc3VyaW5nIGF1dG9wbGF5IGRvZXMgbm90IHdvcmsgb24g cmVndWxhciB2aWRlbyBlbGVtZW50cyB3aGVuIGdldFVzZXJNZWRpYSBpcyBvbiAKIFBBU1MgTG9j YWwgbWVkaWEgc3RyZWFtIGF1dG9wbGF5IAogUEFTUyBSZW1vdGUgbWVkaWEgc3RyZWFtIGF1dG9w bGF5IAorUEFTUyBHcmFudGluZyBnZXRVc2VyTWVkaWEgc2hvdWxkIG5vdCBzdGFydCBwYXVzZWQg bWVkaWEgCitQQVNTIEdyYW50aW5nIGdldFVzZXJNZWRpYSBzaG91bGQgbm90IHN0YXJ0IHBhdXNl ZCBtZWRpYSBvciBtZWRpYSB0aGF0IGNhbm5vdCBhdXRvcGxheSBkdWUgdG8gYXV0b3BsYXkgcmVz dHJpY3Rpb25zIAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tYXV0b3Bs YXkuaHRtbCBiL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hdXRvcGxheS5odG1sCmluZGV4IDU3 NjVkNDRkMzkxZGE3ZGEzODFiMzY2NTNiNDlmMWVhM2I0MGVlMGUuLmRhODY0YmM5YjVjNDAwNzI5 N2MyODk5ZmExM2ZjOGM1MjM0MDk1NTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3dlYnJ0Yy92 aWRlby1hdXRvcGxheS5odG1sCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1hdXRvcGxh eS5odG1sCkBAIC0yLDcgKzIsNyBAQAogPGh0bWw+CiAgICAgPGhlYWQ+CiAgICAgICAgIDxtZXRh IGNoYXJzZXQ9InV0Zi04Ij4KLSAgICAgICAgPHRpdGxlPlRlc3RpbmcgYmFzaWMgdmlkZW8gZXhj aGFuZ2UgZnJvbSBvZmZlcmVyIHRvIHJlY2VpdmVyPC90aXRsZT4KKyAgICAgICAgPHRpdGxlPlRl c3RpbmcgYmFzaWMgYXV0b3BsYXkgd2l0aCBnZXRVc2VyTWVkaWE8L3RpdGxlPgogICAgICAgICA8 c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KICAgICAg ICAgPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3Jp cHQ+CiAgICAgICAgIDxzY3JpcHQgc3JjPS4uL21lZGlhL21lZGlhLWZpbGUuanM+PC9zY3JpcHQ+ CkBAIC0xMCw2ICsxMCwxNiBAQAogICAgIDwvaGVhZD4KICAgICA8Ym9keT4KICAgICAgICAgPHZp ZGVvIGlkPSJ2aWRlbyIgYXV0b3BsYXk+PC92aWRlbz4KKyAgICAgICAgPGJyPgorICAgICAgICA8 dmlkZW8gaWQ9InZpZGVvMSIgbG9vcCBhdXRvcGxheSBwbGF5c0lubGluZT48L3ZpZGVvPgorICAg ICAgICA8dmlkZW8gaWQ9InZpZGVvMiIgbG9vcCBhdXRvcGxheSBwbGF5c0lubGluZT48L3ZpZGVv PgorICAgICAgICA8dmlkZW8gaWQ9InZpZGVvMyIgbG9vcCBhdXRvcGxheSBwbGF5c0lubGluZT48 L3ZpZGVvPgorICAgICAgICA8dmlkZW8gaWQ9InZpZGVvNCIgbG9vcCBhdXRvcGxheSBwbGF5c0lu bGluZT48L3ZpZGVvPgorICAgICAgICA8YnI+CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW8xMCIg bG9vcCBhdXRvcGxheSBwbGF5c0lubGluZT48L3ZpZGVvPgorICAgICAgICA8dmlkZW8gaWQ9InZp ZGVvMjAiIGxvb3AgYXV0b3BsYXkgcGxheXNJbmxpbmU+PC92aWRlbz4KKyAgICAgICAgPHZpZGVv IGlkPSJ2aWRlbzMwIiBsb29wIGF1dG9wbGF5IHBsYXlzSW5saW5lPjwvdmlkZW8+CisgICAgICAg IDx2aWRlbyBpZD0idmlkZW80MCIgbG9vcCBhdXRvcGxheSBwbGF5c0lubGluZT48L3ZpZGVvPgog ICAgICAgICA8c2NyaXB0IHNyYyA9InJvdXRpbmVzLmpzIj48L3NjcmlwdD4KICAgICAgICAgPHNj cmlwdD4KIHZpZGVvID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInZpZGVvIik7CkBAIC02Myw2 ICs3Myw3NSBAQCBwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKICAgICB9KTsKIH0sICJSZW1vdGUg bWVkaWEgc3RyZWFtIGF1dG9wbGF5Iik7CiAKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4g eworICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKSB7CisgICAgICAgIGludGVybmFscy5zZXRNZWRp YUVsZW1lbnRSZXN0cmljdGlvbnModmlkZW8xLCAiIik7CisgICAgICAgIGludGVybmFscy5zZXRN ZWRpYUVsZW1lbnRSZXN0cmljdGlvbnModmlkZW8yLCAiIik7CisgICAgICAgIGludGVybmFscy5z ZXRNZWRpYUVsZW1lbnRSZXN0cmljdGlvbnModmlkZW8zLCAiIik7CisgICAgICAgIGludGVybmFs cy5zZXRNZWRpYUVsZW1lbnRSZXN0cmljdGlvbnModmlkZW80LCAiIik7CisgICAgfQorCisgICAg dmlkZW8xLnNyYyA9IGZpbmRNZWRpYUZpbGUoInZpZGVvIiwgIi4uL21lZGlhL2NvbnRlbnQvYXVk aW8tdHJhY2tzIik7CisgICAgdmlkZW8yLnNyYyA9IGZpbmRNZWRpYUZpbGUoInZpZGVvIiwgIi4u L21lZGlhL2NvbnRlbnQvYXVkaW8tdHJhY2tzIik7CisgICAgdmlkZW8zLnNyYyA9IGZpbmRNZWRp YUZpbGUoInZpZGVvIiwgIi4uL21lZGlhL2NvbnRlbnQvYXVkaW8tdHJhY2tzIik7CisKKyAgICBh d2FpdCB2aWRlbzEucGxheSgpOworICAgIGF3YWl0IHZpZGVvMi5wbGF5KCk7CisgICAgYXdhaXQg dmlkZW8zLnBsYXkoKTsKKworICAgIGF3YWl0IHZpZGVvMS5wYXVzZSgpOworICAgIGxldCByZW1v dmVkVmlkZW8yID0gdmlkZW8yOworICAgIHJlbW92ZWRWaWRlbzIucmVtb3ZlKCk7CisKKyAgICB2 aWRlbzQuc3JjT2JqZWN0ID0gYXdhaXQgbmF2aWdhdG9yLm1lZGlhRGV2aWNlcy5nZXRVc2VyTWVk aWEoeyB2aWRlbyA6IHRydWUgfSk7CisKKyAgICB3aGlsZSAodmlkZW80LnBhdXNlZCkKKyAgICAg ICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDUwKSk7 CisKKyAgICBhc3NlcnRfdHJ1ZSh2aWRlbzEucGF1c2VkLCAicGF1c2VkIHZpZGVvIik7CisgICAg YXNzZXJ0X3RydWUocmVtb3ZlZFZpZGVvMi5wYXVzZWQsICJvdXQgb2YgRE9NIHZpZGVvIik7Cisg ICAgYXNzZXJ0X2ZhbHNlKHZpZGVvMy5wYXVzZWQsICJzdGlsbCBwbGF5aW5nIHZpZGVvIik7CisK KyAgICB2aWRlbzEucmVtb3ZlKCk7CisgICAgdmlkZW8zLnJlbW92ZSgpOworICAgIHZpZGVvNC5y ZW1vdmUoKTsKK30sICJHcmFudGluZyBnZXRVc2VyTWVkaWEgc2hvdWxkIG5vdCBzdGFydCBwYXVz ZWQgbWVkaWEiKTsKKworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICAgaWYgKHdp bmRvdy5pbnRlcm5hbHMpIHsKKyAgICAgICAgaW50ZXJuYWxzLnNldE1lZGlhRWxlbWVudFJlc3Ry aWN0aW9ucyh2aWRlbzEwLCAiUmVxdWlyZVVzZXJHZXN0dXJlRm9yVmlkZW9SYXRlQ2hhbmdlIik7 CisgICAgICAgIGludGVybmFscy5zZXRNZWRpYUVsZW1lbnRSZXN0cmljdGlvbnModmlkZW8yMCwg IlJlcXVpcmVVc2VyR2VzdHVyZUZvclZpZGVvUmF0ZUNoYW5nZSIpOworICAgICAgICBpbnRlcm5h bHMuc2V0TWVkaWFFbGVtZW50UmVzdHJpY3Rpb25zKHZpZGVvMzAsICJSZXF1aXJlVXNlckdlc3R1 cmVGb3JWaWRlb1JhdGVDaGFuZ2UiKTsKKyAgICAgICAgaW50ZXJuYWxzLnNldE1lZGlhRWxlbWVu dFJlc3RyaWN0aW9ucyh2aWRlbzQwLCAiUmVxdWlyZVVzZXJHZXN0dXJlRm9yVmlkZW9SYXRlQ2hh bmdlIik7CisgICAgfQorCisgICAgdmlkZW8xMC5zcmMgPSBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIs ICIuLi9tZWRpYS9jb250ZW50L2F1ZGlvLXRyYWNrcyIpOworICAgIHZpZGVvMjAuc3JjID0gZmlu ZE1lZGlhRmlsZSgidmlkZW8iLCAiLi4vbWVkaWEvY29udGVudC9hdWRpby10cmFja3MiKTsKKyAg ICB2aWRlbzMwLnNyYyA9IGZpbmRNZWRpYUZpbGUoInZpZGVvIiwgIi4uL21lZGlhL2NvbnRlbnQv YXVkaW8tdHJhY2tzIik7CisKKyAgICBhd2FpdCBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHNldFRp bWVvdXQocmVzb2x2ZSwgNTApKTsKKyAgICBhc3NlcnRfdHJ1ZSh2aWRlbzEwLnBhdXNlZCwgInBh dXNlZCB2aWRlbyIpOworICAgIGFzc2VydF90cnVlKHZpZGVvMjAucGF1c2VkLCAicGF1c2VkIHZp ZGVvIik7CisgICAgYXNzZXJ0X3RydWUodmlkZW8zMC5wYXVzZWQsICJwYXVzZWQgdmlkZW8iKTsK KworICAgIHZpZGVvMTAucGF1c2UoKTsKKyAgICBsZXQgcmVtb3ZlZFZpZGVvMjAgPSB2aWRlbzIw OworICAgIHJlbW92ZWRWaWRlbzIwLnJlbW92ZSgpOworCisgICAgdmlkZW80MC5zcmNPYmplY3Qg PSBhd2FpdCBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7IHZpZGVvIDogdHJ1 ZSB9KTsKKworICAgIHdoaWxlICh2aWRlbzQwLnBhdXNlZCkKKyAgICAgICAgYXdhaXQgbmV3IFBy b21pc2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUsIDUwKSk7CisKKyAgICBhc3NlcnRf dHJ1ZSh2aWRlbzEwLnBhdXNlZCwgInBhdXNlZCB2aWRlbyIpOworICAgIGFzc2VydF90cnVlKHJl bW92ZWRWaWRlbzIwLnBhdXNlZCwgIm91dCBvZiBET00gdmlkZW8iKTsKKyAgICBhc3NlcnRfdHJ1 ZSh2aWRlbzMwLnBhdXNlZCwgInN0aWxsIG5vdCBhdXRvcGxheWluZyB2aWRlbyIpOworCisgICAg dmlkZW8xMC5yZW1vdmUoKTsKKyAgICB2aWRlbzMwLnJlbW92ZSgpOworICAgIHZpZGVvNDAucmVt b3ZlKCk7Cit9LCAiR3JhbnRpbmcgZ2V0VXNlck1lZGlhIHNob3VsZCBub3Qgc3RhcnQgcGF1c2Vk IG1lZGlhIG9yIG1lZGlhIHRoYXQgY2Fubm90IGF1dG9wbGF5IGR1ZSB0byBhdXRvcGxheSByZXN0 cmljdGlvbnMiKTsKKwogICAgICAgICA8L3NjcmlwdD4KICAgICA8L2JvZHk+CiA8L2h0bWw+Cg==