172391 2017-05-19 15:31:07 -0700 [MediaStream] Allow transition from autoplay to play when a capture stream begins. 2017-05-23 17:07:26 -0700 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson buildbot commit-queue webkit-bug-importer youennf oldest_to_newest 1310811 0 eric.carlson 2017-05-19 15:31:07 -0700 Allow audio/video elements to transition from autoplay to play when a capture stream begin. 1310815 1 webkit-bug-importer 2017-05-19 15:32:06 -0700 <rdar://problem/32304934> 1310827 2 310714 eric.carlson 2017-05-19 15:41:33 -0700 Created attachment 310714 WIP patch No test yet. 1310831 3 buildbot 2017-05-19 15:44:14 -0700 Attachment 310714 did not pass style-queue: ERROR: Source/WebCore/ChangeLog:9: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1310835 4 310714 youennf 2017-05-19 15:55:19 -0700 Comment on attachment 310714 WIP patch View in context: https://bugs.webkit.org/attachment.cgi?id=310714&action=review > Source/WebCore/dom/Document.cpp:3497 > + mediaStreamStateChanged(); Change the name to captureStateChanged() or mediaStreamCaptureStateChanged() maybe? > Source/WebCore/dom/Document.h:1771 > + HashSet<HTMLMediaElement*> m_mediaStreamStateChangeElements; Might be able to use HashSet<std::reference_wrapper<HTMLMediaElement>> Then in the mediaStreamStateChanged, you would have: for (HTMLMediaElement& mediaElement : m_mediaStreamStateChangeElements) mediaElement.mediaStreamStateChanged(); > Source/WebCore/html/HTMLMediaElement.cpp:7500 > + play(); There is resumeAutoplaying() which does almost the same but is also setting m_autoplaying = true as well. Can we reuse it instead? 1310836 5 youennf 2017-05-19 15:55:48 -0700 Looks good, will have a go at it whenever I am finishing my build 1311546 6 310914 eric.carlson 2017-05-22 13:47:29 -0700 Created attachment 310914 Proposed patch. 1311549 7 310915 eric.carlson 2017-05-22 13:50:45 -0700 Created attachment 310915 Proposed patch. 1311558 8 310915 youennf 2017-05-22 14:09:41 -0700 Comment on attachment 310915 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=310915&action=review > Source/WebCore/dom/Document.h:1772 > + String m_idHashSalt; nit: unneeded whitespaces > LayoutTests/webrtc/autoplay_remote_stream.html:40 > + assert_true(Object.isFrozen(trackEvent.streams), "Object.isFrozen() should return true"); nit: Probably do not need all of these asserts since they are tested in other tests already. > LayoutTests/webrtc/autoplay_remote_stream.html:49 > + remote_video.srcObject = stream; Shouldn't we check that remote_video is not autoplaying after setting srcObject? IIRC, one issue was that the remote_video element was not visible or in the DOM at the time srcObject is set. Maybe we should test these two cases? > LayoutTests/webrtc/autoplay_remote_stream.html:65 > + remote_video.play().then(() => resolve() ); then(resolve) maybe 1312114 9 311072 youennf 2017-05-23 16:19:06 -0700 Created attachment 311072 Patch 1312134 10 311072 commit-queue 2017-05-23 17:07:25 -0700 Comment on attachment 311072 Patch Clearing flags on attachment: 311072 Committed r217311: <http://trac.webkit.org/changeset/217311> 1312135 11 commit-queue 2017-05-23 17:07:26 -0700 All reviewed patches have been landed. Closing bug. 310714 2017-05-19 15:41:33 -0700 2017-05-22 13:47:29 -0700 WIP patch auto_play_transition_patch_2.txt text/plain 5153 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNzE2MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE3LTA1LTE5ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV0g QWxsb3cgdHJhbnNpdGlvbiBmcm9tIGF1dG9wbGF5IHRvIHBsYXkgd2hlbiBhIGNhcHR1cmUgc3Ry ZWFtIGJlZ2luLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTcyMzkxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjMwNDkzND4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMh KS4KKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudDo6dXBkYXRlSXNQbGF5aW5nTWVkaWEpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6 OnJlZ2lzdGVyRm9yTWVkaWFTdHJlYW1TdGF0ZUNoYW5nZUNhbGxiYWNrcyk6CisgICAgICAgIChX ZWJDb3JlOjpEb2N1bWVudDo6dW5yZWdpc3RlckZvck1lZGlhU3RyZWFtU3RhdGVDaGFuZ2VDYWxs YmFja3MpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6Om1lZGlhU3RyZWFtU3RhdGVDaGFu Z2VkKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuaDoKKworICAgICAgICAqIGh0bWwvSFRNTE1l ZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpyZWdp c3RlcldpdGhEb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojp1 bnJlZ2lzdGVyV2l0aERvY3VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1l bnQ6Om1lZGlhU3RyZWFtU3RhdGVDaGFuZ2VkKToKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVs ZW1lbnQuaDoKKwogMjAxNy0wNS0xOSAgTWF0dCBSYWpjYSAgPG1yYWpjYUBhcHBsZS5jb20+CiAK ICAgICAgICAgSW5oZXJpdCBtZWRpYSB1c2VyIGdlc3R1cmVzIGZyb20gdGhlIHRvcCBkb2N1bWVu dCB3aGVuIGF1dG9wbGF5IHF1aXJrcyBhcmUgYWxsb3dlZC4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcAkocmV2aXNpb24gMjE3MTUwKQorKysgU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQ4MywxMCArMzQ4MywxOSBAQCB2b2lkIERvY3VtZW50 Ojp1cGRhdGVJc1BsYXlpbmdNZWRpYSh1aW50CiAgICAgaWYgKHN0YXRlID09IG1fbWVkaWFTdGF0 ZSkKICAgICAgICAgcmV0dXJuOwogCisjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKKyAgICBib29s IHN0YXJ0aW5nQ2FwdHVyZSA9ICFNZWRpYVByb2R1Y2VyOjppc0NhcHR1cmluZyhtX21lZGlhU3Rh dGUpICYmIE1lZGlhUHJvZHVjZXI6OmlzQ2FwdHVyaW5nKHN0YXRlKTsKKyNlbmRpZgorICAgIAog ICAgIG1fbWVkaWFTdGF0ZSA9IHN0YXRlOwogCiAgICAgaWYgKHBhZ2UoKSkKICAgICAgICAgcGFn ZSgpLT51cGRhdGVJc1BsYXlpbmdNZWRpYShzb3VyY2VFbGVtZW50SUQpOworCisjaWYgRU5BQkxF KE1FRElBX1NUUkVBTSkKKyAgICBpZiAoc3RhcnRpbmdDYXB0dXJlKQorICAgICAgICBtZWRpYVN0 cmVhbVN0YXRlQ2hhbmdlZCgpOworI2VuZGlmCiB9CiAKIHZvaWQgRG9jdW1lbnQ6OnBhZ2VNdXRl ZFN0YXRlRGlkQ2hhbmdlKCkKQEAgLTcwMTQsNiArNzAyMywyMiBAQCB2b2lkIERvY3VtZW50Ojpz dG9wTWVkaWFDYXB0dXJlKCkKICAgICAgICAgICAgIHN0cmVhbS5lbmRDYXB0dXJlVHJhY2tzKCk7 CiAgICAgfSk7CiB9CisKK3ZvaWQgRG9jdW1lbnQ6OnJlZ2lzdGVyRm9yTWVkaWFTdHJlYW1TdGF0 ZUNoYW5nZUNhbGxiYWNrcyhIVE1MTWVkaWFFbGVtZW50JiBlbGVtZW50KQoreworICAgIG1fbWVk aWFTdHJlYW1TdGF0ZUNoYW5nZUVsZW1lbnRzLmFkZCgmZWxlbWVudCk7Cit9CisKK3ZvaWQgRG9j dW1lbnQ6OnVucmVnaXN0ZXJGb3JNZWRpYVN0cmVhbVN0YXRlQ2hhbmdlQ2FsbGJhY2tzKEhUTUxN ZWRpYUVsZW1lbnQmIGVsZW1lbnQpCit7CisgICAgbV9tZWRpYVN0cmVhbVN0YXRlQ2hhbmdlRWxl bWVudHMucmVtb3ZlKCZlbGVtZW50KTsKK30KKwordm9pZCBEb2N1bWVudDo6bWVkaWFTdHJlYW1T dGF0ZUNoYW5nZWQoKQoreworICAgIGZvciAoYXV0byogbWVkaWFFbGVtZW50IDogbV9tZWRpYVN0 cmVhbVN0YXRlQ2hhbmdlRWxlbWVudHMpCisgICAgICAgIG1lZGlhRWxlbWVudC0+bWVkaWFTdHJl YW1TdGF0ZUNoYW5nZWQoKTsKK30KICNlbmRpZgogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9kb20vRG9jdW1lbnQuaAkocmV2aXNpb24gMjE3MTUwKQorKysgU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEyODMsNiArMTI4Myw5IEBAIHB1 YmxpYzoKICAgICB2b2lkIHNldERldmljZUlESGFzaFNhbHQoY29uc3QgU3RyaW5nJiBzYWx0KSB7 IG1faWRIYXNoU2FsdCA9IHNhbHQ7IH0KICAgICBTdHJpbmcgZGV2aWNlSURIYXNoU2FsdCgpIGNv bnN0IHsgcmV0dXJuIG1faWRIYXNoU2FsdDsgfQogICAgIHZvaWQgc3RvcE1lZGlhQ2FwdHVyZSgp OworICAgIHZvaWQgcmVnaXN0ZXJGb3JNZWRpYVN0cmVhbVN0YXRlQ2hhbmdlQ2FsbGJhY2tzKEhU TUxNZWRpYUVsZW1lbnQmKTsKKyAgICB2b2lkIHVucmVnaXN0ZXJGb3JNZWRpYVN0cmVhbVN0YXRl Q2hhbmdlQ2FsbGJhY2tzKEhUTUxNZWRpYUVsZW1lbnQmKTsKKyAgICB2b2lkIG1lZGlhU3RyZWFt U3RhdGVDaGFuZ2VkKCk7CiAjZW5kaWYKIAogLy8gRklYTUU6IEZpbmQgYSBiZXR0ZXIgcGxhY2Ug Zm9yIHRoaXMgZnVuY3Rpb25hbGl0eS4KQEAgLTE3NjUsNyArMTc2OCw4IEBAIHByaXZhdGU6CiAj ZW5kaWYKIAogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCi0gICAgU3RyaW5nIG1faWRIYXNoU2Fs dDsKKyAgICAgICAgSGFzaFNldDxIVE1MTWVkaWFFbGVtZW50Kj4gbV9tZWRpYVN0cmVhbVN0YXRl Q2hhbmdlRWxlbWVudHM7CisgICAgICAgIFN0cmluZyBtX2lkSGFzaFNhbHQ7CiAgICAgYm9vbCBt X2hhc0hhZEFjdGl2ZU1lZGlhU3RyZWFtVHJhY2sgeyBmYWxzZSB9OwogI2VuZGlmCiAKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gMjE3MTUw KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjg1LDYgKzY4NSwxMCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnJlZ2lzdGVy V2l0aERvY3VtCiAKICAgICBkb2N1bWVudC5hZGRBdWRpb1Byb2R1Y2VyKHRoaXMpOwogICAgIGFk ZEVsZW1lbnRUb0RvY3VtZW50TWFwKCp0aGlzLCBkb2N1bWVudCk7CisKKyNpZiBFTkFCTEUoTUVE SUFfU1RSRUFNKQorICAgIGRvY3VtZW50LnJlZ2lzdGVyRm9yTWVkaWFTdHJlYW1TdGF0ZUNoYW5n ZUNhbGxiYWNrcygqdGhpcyk7CisjZW5kaWYKIH0KIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1 bnJlZ2lzdGVyV2l0aERvY3VtZW50KERvY3VtZW50JiBkb2N1bWVudCkKQEAgLTcyMCw2ICs3MjQs MTEgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1bnJlZ2lzdGVyV2l0aERvYwogCiAgICAgZG9j dW1lbnQucmVtb3ZlQXVkaW9Qcm9kdWNlcih0aGlzKTsKICAgICByZW1vdmVFbGVtZW50RnJvbURv Y3VtZW50TWFwKCp0aGlzLCBkb2N1bWVudCk7CisKKyNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQor ICAgIGRvY3VtZW50LnVucmVnaXN0ZXJGb3JNZWRpYVN0cmVhbVN0YXRlQ2hhbmdlQ2FsbGJhY2tz KCp0aGlzKTsKKyNlbmRpZgorCiB9CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6ZGlkTW92ZVRv TmV3RG9jdW1lbnQoRG9jdW1lbnQmIG9sZERvY3VtZW50KQpAQCAtNzQ4NCw2ICs3NDkzLDE0IEBA IHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6ZnVsbHNjcmVlbk1vZGVDaGEKICAgICBzY2hlZHVsZVVw ZGF0ZVBsYXliYWNrQ29udHJvbHNNYW5hZ2VyKCk7CiB9CiAKKyNpZiBFTkFCTEUoTUVESUFfU1RS RUFNKQordm9pZCBIVE1MTWVkaWFFbGVtZW50OjptZWRpYVN0cmVhbVN0YXRlQ2hhbmdlZCgpCit7 CisgICAgaWYgKGNhblRyYW5zaXRpb25Gcm9tQXV0b3BsYXlUb1BsYXkoKSkKKyAgICAgICAgcGxh eSgpOworfQorI2VuZGlmCisKIH0KIAogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxNZWRpYUVsZW1lbnQuaAkocmV2aXNpb24gMjE3MTUwKQorKysgU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MTWVkaWFFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTUxNSw2ICs1MTUsNyBAQCBw dWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgY29uc3QgTWVkaWFSZXNvdXJjZUxvYWRlciogbGFz dE1lZGlhUmVzb3VyY2VMb2FkZXJGb3JUZXN0aW5nKCkgY29uc3Q7CiAKICNpZiBFTkFCTEUoTUVE SUFfU1RSRUFNKQorICAgIHZvaWQgbWVkaWFTdHJlYW1TdGF0ZUNoYW5nZWQoKTsKICAgICBib29s IGhhc01lZGlhU3RyZWFtU3JjT2JqZWN0KCkgY29uc3QgeyByZXR1cm4gISFtX21lZGlhU3RyZWFt U3JjT2JqZWN0OyB9CiAjZW5kaWYKIAo= 310914 2017-05-22 13:47:29 -0700 2017-05-22 13:50:45 -0700 Proposed patch. media_streamauto_play_transition_patch_3.txt text/plain 9798 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNzI0MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA1LTIyICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV0g QWxsb3cgdHJhbnNpdGlvbiBmcm9tIGF1dG9wbGF5IHRvIHBsYXkgd2hlbiBhIGNhcHR1cmUgc3Ry ZWFtIGJlZ2lucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE3MjM5MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzIzMDQ5MzQ+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogd2VicnRjL2F1dG9w bGF5X3JlbW90ZV9zdHJlYW0uaHRtbAorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVJc1BsYXlpbmdNZWRpYSk6IENhbGwgbWVk aWFTdHJlYW1DYXB0dXJlU3RhdGVDaGFuZ2VkIHdoZW4gY2FwdHVyZQorICAgICAgICBzdGF0ZSBj aGFuZ2VzLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJlZ2lzdGVyRm9yTWVkaWFTdHJl YW1TdGF0ZUNoYW5nZUNhbGxiYWNrcyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6dW5y ZWdpc3RlckZvck1lZGlhU3RyZWFtU3RhdGVDaGFuZ2VDYWxsYmFja3MpOgorICAgICAgICAoV2Vi Q29yZTo6RG9jdW1lbnQ6Om1lZGlhU3RyZWFtQ2FwdHVyZVN0YXRlQ2hhbmdlZCk6IENhbGwgYWxs IHJlZ2lzdGVyZWQgZWxlbWVudHMuCisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisKKyAgICAg ICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1l ZGlhRWxlbWVudDo6cmVnaXN0ZXJXaXRoRG9jdW1lbnQpOiBSZWdpc3RlciBmb3IgY2FwdHVyZSBz dGF0ZSBjaGFuZ2VzLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6dW5yZWdp c3RlcldpdGhEb2N1bWVudCk6IFVucmVnaXN0ZXIgZm9yIGNhcHR1cmUgc3RhdGUgY2hhbmdlcy4K KyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhU3RyZWFtQ2FwdHVyZVN0 YXRlQ2hhbmdlZCk6IEF0dGVtcHQgYXV0b3BsYXkgYXMgbmVjZXNzYXJ5LgorICAgICAgICAqIGh0 bWwvSFRNTE1lZGlhRWxlbWVudC5oOgorCiAyMDE3LTA1LTIyICBaYWxhbiBCdWp0YXMgIDx6YWxh bkBhcHBsZS5jb20+CiAKICAgICAgICAgU2FtZVNpemVBc0lubGluZUJveCBtaXNtYXRjaCBvbiBB Uk1WNy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gMjE3MTUwKQorKysg U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQ4Mywx MCArMzQ4MywxOSBAQCB2b2lkIERvY3VtZW50Ojp1cGRhdGVJc1BsYXlpbmdNZWRpYSh1aW50CiAg ICAgaWYgKHN0YXRlID09IG1fbWVkaWFTdGF0ZSkKICAgICAgICAgcmV0dXJuOwogCisjaWYgRU5B QkxFKE1FRElBX1NUUkVBTSkKKyAgICBib29sIHN0YXJ0aW5nQ2FwdHVyZSA9ICFNZWRpYVByb2R1 Y2VyOjppc0NhcHR1cmluZyhtX21lZGlhU3RhdGUpICYmIE1lZGlhUHJvZHVjZXI6OmlzQ2FwdHVy aW5nKHN0YXRlKTsKKyNlbmRpZgorICAgIAogICAgIG1fbWVkaWFTdGF0ZSA9IHN0YXRlOwogCiAg ICAgaWYgKHBhZ2UoKSkKICAgICAgICAgcGFnZSgpLT51cGRhdGVJc1BsYXlpbmdNZWRpYShzb3Vy Y2VFbGVtZW50SUQpOworCisjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKKyAgICBpZiAoc3RhcnRp bmdDYXB0dXJlKQorICAgICAgICBtZWRpYVN0cmVhbUNhcHR1cmVTdGF0ZUNoYW5nZWQoKTsKKyNl bmRpZgogfQogCiB2b2lkIERvY3VtZW50OjpwYWdlTXV0ZWRTdGF0ZURpZENoYW5nZSgpCkBAIC03 MDE0LDYgKzcwMjMsMjIgQEAgdm9pZCBEb2N1bWVudDo6c3RvcE1lZGlhQ2FwdHVyZSgpCiAgICAg ICAgICAgICBzdHJlYW0uZW5kQ2FwdHVyZVRyYWNrcygpOwogICAgIH0pOwogfQorCit2b2lkIERv Y3VtZW50OjpyZWdpc3RlckZvck1lZGlhU3RyZWFtU3RhdGVDaGFuZ2VDYWxsYmFja3MoSFRNTE1l ZGlhRWxlbWVudCYgZWxlbWVudCkKK3sKKyAgICBtX21lZGlhU3RyZWFtU3RhdGVDaGFuZ2VFbGVt ZW50cy5hZGQoJmVsZW1lbnQpOworfQorCit2b2lkIERvY3VtZW50Ojp1bnJlZ2lzdGVyRm9yTWVk aWFTdHJlYW1TdGF0ZUNoYW5nZUNhbGxiYWNrcyhIVE1MTWVkaWFFbGVtZW50JiBlbGVtZW50KQor eworICAgIG1fbWVkaWFTdHJlYW1TdGF0ZUNoYW5nZUVsZW1lbnRzLnJlbW92ZSgmZWxlbWVudCk7 Cit9CisKK3ZvaWQgRG9jdW1lbnQ6Om1lZGlhU3RyZWFtQ2FwdHVyZVN0YXRlQ2hhbmdlZCgpCit7 CisgICAgZm9yIChhdXRvKiBtZWRpYUVsZW1lbnQgOiBtX21lZGlhU3RyZWFtU3RhdGVDaGFuZ2VF bGVtZW50cykKKyAgICAgICAgbWVkaWFFbGVtZW50LT5tZWRpYVN0cmVhbUNhcHR1cmVTdGF0ZUNo YW5nZWQoKTsKK30KICNlbmRpZgogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuaAkocmV2aXNpb24gMjE3MTUwKQorKysgU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEyODMsNiArMTI4Myw5IEBAIHB1YmxpYzoKICAg ICB2b2lkIHNldERldmljZUlESGFzaFNhbHQoY29uc3QgU3RyaW5nJiBzYWx0KSB7IG1faWRIYXNo U2FsdCA9IHNhbHQ7IH0KICAgICBTdHJpbmcgZGV2aWNlSURIYXNoU2FsdCgpIGNvbnN0IHsgcmV0 dXJuIG1faWRIYXNoU2FsdDsgfQogICAgIHZvaWQgc3RvcE1lZGlhQ2FwdHVyZSgpOworICAgIHZv aWQgcmVnaXN0ZXJGb3JNZWRpYVN0cmVhbVN0YXRlQ2hhbmdlQ2FsbGJhY2tzKEhUTUxNZWRpYUVs ZW1lbnQmKTsKKyAgICB2b2lkIHVucmVnaXN0ZXJGb3JNZWRpYVN0cmVhbVN0YXRlQ2hhbmdlQ2Fs bGJhY2tzKEhUTUxNZWRpYUVsZW1lbnQmKTsKKyAgICB2b2lkIG1lZGlhU3RyZWFtQ2FwdHVyZVN0 YXRlQ2hhbmdlZCgpOwogI2VuZGlmCiAKIC8vIEZJWE1FOiBGaW5kIGEgYmV0dGVyIHBsYWNlIGZv ciB0aGlzIGZ1bmN0aW9uYWxpdHkuCkBAIC0xNzY1LDcgKzE3NjgsOCBAQCBwcml2YXRlOgogI2Vu ZGlmCiAKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQotICAgIFN0cmluZyBtX2lkSGFzaFNhbHQ7 CisgICAgICAgIEhhc2hTZXQ8SFRNTE1lZGlhRWxlbWVudCo+IG1fbWVkaWFTdHJlYW1TdGF0ZUNo YW5nZUVsZW1lbnRzOworICAgICAgICBTdHJpbmcgbV9pZEhhc2hTYWx0OwogICAgIGJvb2wgbV9o YXNIYWRBY3RpdmVNZWRpYVN0cmVhbVRyYWNrIHsgZmFsc2UgfTsKICNlbmRpZgogCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHJldmlzaW9uIDIxNzE1MCkK KysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTY4NSw2ICs2ODUsMTAgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpyZWdpc3Rlcldp dGhEb2N1bQogCiAgICAgZG9jdW1lbnQuYWRkQXVkaW9Qcm9kdWNlcih0aGlzKTsKICAgICBhZGRF bGVtZW50VG9Eb2N1bWVudE1hcCgqdGhpcywgZG9jdW1lbnQpOworCisjaWYgRU5BQkxFKE1FRElB X1NUUkVBTSkKKyAgICBkb2N1bWVudC5yZWdpc3RlckZvck1lZGlhU3RyZWFtU3RhdGVDaGFuZ2VD YWxsYmFja3MoKnRoaXMpOworI2VuZGlmCiB9CiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dW5y ZWdpc3RlcldpdGhEb2N1bWVudChEb2N1bWVudCYgZG9jdW1lbnQpCkBAIC03MjAsNiArNzI0LDEx IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dW5yZWdpc3RlcldpdGhEb2MKIAogICAgIGRvY3Vt ZW50LnJlbW92ZUF1ZGlvUHJvZHVjZXIodGhpcyk7CiAgICAgcmVtb3ZlRWxlbWVudEZyb21Eb2N1 bWVudE1hcCgqdGhpcywgZG9jdW1lbnQpOworCisjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKKyAg ICBkb2N1bWVudC51bnJlZ2lzdGVyRm9yTWVkaWFTdHJlYW1TdGF0ZUNoYW5nZUNhbGxiYWNrcygq dGhpcyk7CisjZW5kaWYKKwogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRpZE1vdmVUb05l d0RvY3VtZW50KERvY3VtZW50JiBvbGREb2N1bWVudCkKQEAgLTc0ODQsNiArNzQ5MywxMyBAQCB2 b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmZ1bGxzY3JlZW5Nb2RlQ2hhCiAgICAgc2NoZWR1bGVVcGRh dGVQbGF5YmFja0NvbnRyb2xzTWFuYWdlcigpOwogfQogCisjaWYgRU5BQkxFKE1FRElBX1NUUkVB TSkKK3ZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFTdHJlYW1DYXB0dXJlU3RhdGVDaGFuZ2Vk KCkKK3sKKyAgICByZXN1bWVBdXRvcGxheWluZygpOworfQorI2VuZGlmCisKIH0KIAogI2VuZGlm CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuaAkocmV2aXNpb24gMjE3 MTUwKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgJKHdvcmtpbmcg Y29weSkKQEAgLTUxNSw2ICs1MTUsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgY29u c3QgTWVkaWFSZXNvdXJjZUxvYWRlciogbGFzdE1lZGlhUmVzb3VyY2VMb2FkZXJGb3JUZXN0aW5n KCkgY29uc3Q7CiAKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQorICAgIHZvaWQgbWVkaWFTdHJl YW1DYXB0dXJlU3RhdGVDaGFuZ2VkKCk7CiAgICAgYm9vbCBoYXNNZWRpYVN0cmVhbVNyY09iamVj dCgpIGNvbnN0IHsgcmV0dXJuICEhbV9tZWRpYVN0cmVhbVNyY09iamVjdDsgfQogI2VuZGlmCiAK SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDIxNzE1MCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE3LTA1LTIyICBFcmljIENhcmxzb24gIDxl cmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV0gQWxsb3cgdHJh bnNpdGlvbiBmcm9tIGF1dG9wbGF5IHRvIHBsYXkgd2hlbiBhIGNhcHR1cmUgc3RyZWFtIGJlZ2lu cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjM5 MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzIzMDQ5MzQ+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3ZWJydGMvYXV0b3BsYXlfcmVtb3RlX3N0 cmVhbS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHdlYnJ0Yy9hdXRvcGxheV9yZW1v dGVfc3RyZWFtLmh0bWw6IEFkZGVkLgorCiAyMDE3LTA1LTE5ICBBbGV4ZXkgUHJvc2t1cnlha292 ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIE1hbnkgQ1NTIGpzLXRlc3RzIHVzZSB3YWl0VW50 aWxEb25lCkluZGV4OiBMYXlvdXRUZXN0cy93ZWJydGMvYXV0b3BsYXlfcmVtb3RlX3N0cmVhbS1l eHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvd2VicnRjL2F1dG9wbGF5X3Jl bW90ZV9zdHJlYW0tZXhwZWN0ZWQudHh0CShub25leGlzdGVudCkKKysrIExheW91dFRlc3RzL3dl YnJ0Yy9hdXRvcGxheV9yZW1vdGVfc3RyZWFtLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpA QCAtMCwwICsxLDYgQEAKKyAgICAKKworUEFTUyBTZXR1cCByZW1vdGUgc3RyZWFtIGFuZCB2aWRl byBlbGVtZW50IAorUEFTUyBTZXR1cCBsb2NhbCBzdHJlYW0gYW5kIHZpZGVvIGVsZW1lbnQgCitQ QVNTIFJlbW90ZSB2aWRlbyBwbGF5YmFjayBhbGxvd2VkIAorCkluZGV4OiBMYXlvdXRUZXN0cy93 ZWJydGMvYXV0b3BsYXlfcmVtb3RlX3N0cmVhbS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL3dlYnJ0Yy9hdXRvcGxheV9yZW1vdGVfc3RyZWFtLmh0bWwJKG5vbmV4aXN0ZW50KQorKysg TGF5b3V0VGVzdHMvd2VicnRjL2F1dG9wbGF5X3JlbW90ZV9zdHJlYW0uaHRtbAkod29ya2luZyBj b3B5KQpAQCAtMCwwICsxLDcxIEBACis8IURPQ1RZUEUgSFRNTD4KKzxodG1sPgorICAgIDxoZWFk PgorICAgICAgICA8Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPTEwMHB4IGhlaWdodD0xMDBweD48 L2NhbnZhcz4KKyAgICAgICAgPHZpZGVvIGlkPSJyZW1vdGVfdmlkZW8iIGF1dG9wbGF5IHdpZHRo PTEwMHB4IGhlaWdodD0xMDBweD48L3ZpZGVvPgorICAgICAgICA8dmlkZW8gaWQ9ImxvY2FsX3Zp ZGVvIiBhdXRvcGxheSBtdXRlZCB3aWR0aD0xMDBweCBoZWlnaHQ9MTAwcHg+PC92aWRlbz4KKyAg ICAgICAgPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+ CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMi Pjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYyA9InJvdXRpbmVzLmpzIj48L3NjcmlwdD4K KyAgICAgICAgPHNjcmlwdD4KKworICAgICAgICBpZiAod2luZG93LmludGVybmFscykgeworICAg ICAgICAgICAgaW50ZXJuYWxzLnNldE1lZGlhRWxlbWVudFJlc3RyaWN0aW9ucyhsb2NhbF92aWRl bywgIlJlcXVpcmVVc2VyR2VzdHVyZUZvckF1ZGlvUmF0ZUNoYW5nZSIpOworICAgICAgICAgICAg aW50ZXJuYWxzLnNldE1lZGlhRWxlbWVudFJlc3RyaWN0aW9ucyhyZW1vdGVfdmlkZW8sICJSZXF1 aXJlVXNlckdlc3R1cmVGb3JBdWRpb1JhdGVDaGFuZ2UiKTsKKyAgICAgICAgfQorICAgICAgICBp ZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAgICB0ZXN0UnVubmVyLnNldFVzZXJNZWRp YVBlcm1pc3Npb24odHJ1ZSk7CisKKyAgICAgICAgbGV0IGNvbG9yID0gImdyZWVuIjsKKyAgICAg ICAgZnVuY3Rpb24gc3RhcnREcmF3aW5nVG9DYW52YXMoKQorICAgICAgICB7CisgICAgICAgICAg ICBsZXQgY29udGV4dCA9IGNhbnZhcy5nZXRDb250ZXh0KCIyZCIpOworICAgICAgICAgICAgY29u dGV4dC5maWxsU3R5bGUgPSBjb2xvcjsKKyAgICAgICAgICAgIGNvbnRleHQuZmlsbFJlY3QoMCwg MCwgMTAwLCAxMDApOworICAgICAgICAgICAgc2V0VGltZW91dChzdGFydERyYXdpbmdUb0NhbnZh cywgNTApOworICAgICAgICB9CisKKyAgICAgICAgcHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7Cisg ICAgICAgICAgICByZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUsIHJlamVjdCkgPT4geworICAg ICAgICAgICAgICAgIHN0YXJ0RHJhd2luZ1RvQ2FudmFzKCk7CisKKyAgICAgICAgICAgICAgICBj cmVhdGVDb25uZWN0aW9ucygoZmlyc3RDb25uZWN0aW9uKSA9PiB7CisgICAgICAgICAgICAgICAg ICAgIGxldCBzdHJlYW0gPSBjYW52YXMuY2FwdHVyZVN0cmVhbSgpOworICAgICAgICAgICAgICAg ICAgICBmaXJzdENvbm5lY3Rpb24uYWRkVHJhY2soc3RyZWFtLmdldFZpZGVvVHJhY2tzKClbMF0s IHN0cmVhbSk7CisgICAgICAgICAgICAgICAgfSwgKHNlY29uZENvbm5lY3Rpb24pID0+IHsKKyAg ICAgICAgICAgICAgICAgICAgc2Vjb25kQ29ubmVjdGlvbi5vbnRyYWNrID0gKHRyYWNrRXZlbnQp ID0+IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGFzc2VydF90cnVlKHRyYWNrRXZlbnQudHJh Y2sgaW5zdGFuY2VvZiBNZWRpYVN0cmVhbVRyYWNrKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IGFzc2VydF90cnVlKHRyYWNrRXZlbnQucmVjZWl2ZXIgaW5zdGFuY2VvZiBSVENSdHBSZWNlaXZl cik7CisgICAgICAgICAgICAgICAgICAgICAgICBhc3NlcnRfdHJ1ZShBcnJheS5pc0FycmF5KHRy YWNrRXZlbnQuc3RyZWFtcyksICJBcnJheS5pc0FycmF5KCkgc2hvdWxkIHJldHVybiB0cnVlIik7 CisgICAgICAgICAgICAgICAgICAgICAgICBhc3NlcnRfdHJ1ZShPYmplY3QuaXNGcm96ZW4odHJh Y2tFdmVudC5zdHJlYW1zKSwgIk9iamVjdC5pc0Zyb3plbigpIHNob3VsZCByZXR1cm4gdHJ1ZSIp OworICAgICAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZSh0cmFja0V2ZW50LnN0cmVhbXNbMF0p OworICAgICAgICAgICAgICAgICAgICB9OworICAgICAgICAgICAgICAgIH0pOworCisgICAgICAg ICAgICAgICAgdGVzdC5zdGVwX3RpbWVvdXQoKCkgPT4gcmVqZWN0KCJTZXR0aW5nIHVwIHJlbW90 ZSBzdHJlYW0gdGltZWQgb3V0IiksIDUwMDApOworICAgICAgICAgICAgfSkKKyAgICAgICAgICAg IC50aGVuKChzdHJlYW0pID0+IHsKKyAgICAgICAgICAgICAgICBsb2NhbF92aWRlby5zcmNPYmpl Y3QgPSBzdHJlYW07CisgICAgICAgICAgICAgICAgcmVtb3RlX3ZpZGVvLnNyY09iamVjdCA9IHN0 cmVhbTsKKyAgICAgICAgICAgICAgICBjb2xvciA9ICJ5ZWxsb3ciOworICAgICAgICAgICAgIH0p CisgICAgICAgIH0sICJTZXR1cCByZW1vdGUgc3RyZWFtIGFuZCB2aWRlbyBlbGVtZW50Iik7CisK KyAgICAgICAgcHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7CisgICAgICAgICAgICByZXR1cm4gbmF2 aWdhdG9yLm1lZGlhRGV2aWNlcy5nZXRVc2VyTWVkaWEoe2F1ZGlvOiB0cnVlLCB2aWRlbzogdHJ1 ZX0pLnRoZW4oKHN0cmVhbSkgPT4geworICAgICAgICAgICAgICAgIGNvbG9yID0gImJsdWUiOwor ICAgICAgICAgICAgICAgIGxvY2FsX3ZpZGVvLnNyY09iamVjdCA9IHN0cmVhbTsKKyAgICAgICAg ICAgIH0pOworICAgICAgICB9LCAiU2V0dXAgbG9jYWwgc3RyZWFtIGFuZCB2aWRlbyBlbGVtZW50 Iik7CisKKyAgICAgICAgcHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7CisgICAgICAgICAgICByZXR1 cm4gbmV3IFByb21pc2UoKHJlc29sdmUsIHJlamVjdCkgPT4geworICAgICAgICAgICAgICAgIHRl c3Quc3RlcF90aW1lb3V0KCgpID0+IHJlamVjdCgiU3RhcnRpbmcgcmVtb3RlIHZpZGVvIHBsYXli YWNrIHRpbWVkIG91dCIpLCA1MDAwKTsKKyAgICAgICAgICAgICAgICBjb2xvciA9ICJyZWQiOwor ICAgICAgICAgICAgICAgIHJlbW90ZV92aWRlby5wbGF5KCkudGhlbigoKSA9PiByZXNvbHZlKCkg KTsKKyAgICAgICAgICAgIH0pCisgICAgICAgIH0sICJSZW1vdGUgdmlkZW8gcGxheWJhY2sgYWxs b3dlZCIpOworCisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9keT4KKzwvaHRtbD4K 310915 2017-05-22 13:50:45 -0700 2017-05-23 16:19:05 -0700 Proposed patch. media_streamauto_play_transition_patch_4.txt text/plain 9805 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNzI0MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA1LTIyICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV0g QWxsb3cgdHJhbnNpdGlvbiBmcm9tIGF1dG9wbGF5IHRvIHBsYXkgd2hlbiBhIGNhcHR1cmUgc3Ry ZWFtIGJlZ2lucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE3MjM5MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzIzMDQ5MzQ+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogd2VicnRjL2F1dG9w bGF5X3JlbW90ZV9zdHJlYW0uaHRtbAorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVJc1BsYXlpbmdNZWRpYSk6IENhbGwgbWVk aWFTdHJlYW1DYXB0dXJlU3RhdGVDaGFuZ2VkIHdoZW4gY2FwdHVyZQorICAgICAgICBzdGF0ZSBj aGFuZ2VzLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJlZ2lzdGVyRm9yTWVkaWFTdHJl YW1TdGF0ZUNoYW5nZUNhbGxiYWNrcyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6dW5y ZWdpc3RlckZvck1lZGlhU3RyZWFtU3RhdGVDaGFuZ2VDYWxsYmFja3MpOgorICAgICAgICAoV2Vi Q29yZTo6RG9jdW1lbnQ6Om1lZGlhU3RyZWFtQ2FwdHVyZVN0YXRlQ2hhbmdlZCk6IENhbGwgYWxs IHJlZ2lzdGVyZWQgZWxlbWVudHMuCisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6CisKKyAgICAg ICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1l ZGlhRWxlbWVudDo6cmVnaXN0ZXJXaXRoRG9jdW1lbnQpOiBSZWdpc3RlciBmb3IgY2FwdHVyZSBz dGF0ZSBjaGFuZ2VzLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6dW5yZWdp c3RlcldpdGhEb2N1bWVudCk6IFVucmVnaXN0ZXIgZm9yIGNhcHR1cmUgc3RhdGUgY2hhbmdlcy4K KyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhU3RyZWFtQ2FwdHVyZVN0 YXRlQ2hhbmdlZCk6IEF0dGVtcHQgYXV0b3BsYXkgYXMgbmVjZXNzYXJ5LgorICAgICAgICAqIGh0 bWwvSFRNTE1lZGlhRWxlbWVudC5oOgorCiAyMDE3LTA1LTIyICBaYWxhbiBCdWp0YXMgIDx6YWxh bkBhcHBsZS5jb20+CiAKICAgICAgICAgU2FtZVNpemVBc0lubGluZUJveCBtaXNtYXRjaCBvbiBB Uk1WNy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gMjE3MTUwKQorKysg U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQ4Mywx MCArMzQ4MywxOSBAQCB2b2lkIERvY3VtZW50Ojp1cGRhdGVJc1BsYXlpbmdNZWRpYSh1aW50CiAg ICAgaWYgKHN0YXRlID09IG1fbWVkaWFTdGF0ZSkKICAgICAgICAgcmV0dXJuOwogCisjaWYgRU5B QkxFKE1FRElBX1NUUkVBTSkKKyAgICBib29sIGNhcHR1cmVTdGF0ZUNoYW5nZWQgPSBNZWRpYVBy b2R1Y2VyOjppc0NhcHR1cmluZyhtX21lZGlhU3RhdGUpICE9IE1lZGlhUHJvZHVjZXI6OmlzQ2Fw dHVyaW5nKHN0YXRlKTsKKyNlbmRpZgorICAgIAogICAgIG1fbWVkaWFTdGF0ZSA9IHN0YXRlOwog CiAgICAgaWYgKHBhZ2UoKSkKICAgICAgICAgcGFnZSgpLT51cGRhdGVJc1BsYXlpbmdNZWRpYShz b3VyY2VFbGVtZW50SUQpOworCisjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKKyAgICBpZiAoY2Fw dHVyZVN0YXRlQ2hhbmdlZCkKKyAgICAgICAgbWVkaWFTdHJlYW1DYXB0dXJlU3RhdGVDaGFuZ2Vk KCk7CisjZW5kaWYKIH0KIAogdm9pZCBEb2N1bWVudDo6cGFnZU11dGVkU3RhdGVEaWRDaGFuZ2Uo KQpAQCAtNzAxNCw2ICs3MDIzLDIyIEBAIHZvaWQgRG9jdW1lbnQ6OnN0b3BNZWRpYUNhcHR1cmUo KQogICAgICAgICAgICAgc3RyZWFtLmVuZENhcHR1cmVUcmFja3MoKTsKICAgICB9KTsKIH0KKwor dm9pZCBEb2N1bWVudDo6cmVnaXN0ZXJGb3JNZWRpYVN0cmVhbVN0YXRlQ2hhbmdlQ2FsbGJhY2tz KEhUTUxNZWRpYUVsZW1lbnQmIGVsZW1lbnQpCit7CisgICAgbV9tZWRpYVN0cmVhbVN0YXRlQ2hh bmdlRWxlbWVudHMuYWRkKCZlbGVtZW50KTsKK30KKwordm9pZCBEb2N1bWVudDo6dW5yZWdpc3Rl ckZvck1lZGlhU3RyZWFtU3RhdGVDaGFuZ2VDYWxsYmFja3MoSFRNTE1lZGlhRWxlbWVudCYgZWxl bWVudCkKK3sKKyAgICBtX21lZGlhU3RyZWFtU3RhdGVDaGFuZ2VFbGVtZW50cy5yZW1vdmUoJmVs ZW1lbnQpOworfQorCit2b2lkIERvY3VtZW50OjptZWRpYVN0cmVhbUNhcHR1cmVTdGF0ZUNoYW5n ZWQoKQoreworICAgIGZvciAoYXV0byogbWVkaWFFbGVtZW50IDogbV9tZWRpYVN0cmVhbVN0YXRl Q2hhbmdlRWxlbWVudHMpCisgICAgICAgIG1lZGlhRWxlbWVudC0+bWVkaWFTdHJlYW1DYXB0dXJl U3RhdGVDaGFuZ2VkKCk7Cit9CiAjZW5kaWYKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRl eDogU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmgJKHJldmlzaW9uIDIxNzE1MCkKKysrIFNvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMjgzLDYgKzEyODMsOSBAQCBwdWJs aWM6CiAgICAgdm9pZCBzZXREZXZpY2VJREhhc2hTYWx0KGNvbnN0IFN0cmluZyYgc2FsdCkgeyBt X2lkSGFzaFNhbHQgPSBzYWx0OyB9CiAgICAgU3RyaW5nIGRldmljZUlESGFzaFNhbHQoKSBjb25z dCB7IHJldHVybiBtX2lkSGFzaFNhbHQ7IH0KICAgICB2b2lkIHN0b3BNZWRpYUNhcHR1cmUoKTsK KyAgICB2b2lkIHJlZ2lzdGVyRm9yTWVkaWFTdHJlYW1TdGF0ZUNoYW5nZUNhbGxiYWNrcyhIVE1M TWVkaWFFbGVtZW50Jik7CisgICAgdm9pZCB1bnJlZ2lzdGVyRm9yTWVkaWFTdHJlYW1TdGF0ZUNo YW5nZUNhbGxiYWNrcyhIVE1MTWVkaWFFbGVtZW50Jik7CisgICAgdm9pZCBtZWRpYVN0cmVhbUNh cHR1cmVTdGF0ZUNoYW5nZWQoKTsKICNlbmRpZgogCiAvLyBGSVhNRTogRmluZCBhIGJldHRlciBw bGFjZSBmb3IgdGhpcyBmdW5jdGlvbmFsaXR5LgpAQCAtMTc2NSw3ICsxNzY4LDggQEAgcHJpdmF0 ZToKICNlbmRpZgogCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKLSAgICBTdHJpbmcgbV9pZEhh c2hTYWx0OworICAgICAgICBIYXNoU2V0PEhUTUxNZWRpYUVsZW1lbnQqPiBtX21lZGlhU3RyZWFt U3RhdGVDaGFuZ2VFbGVtZW50czsKKyAgICAgICAgU3RyaW5nIG1faWRIYXNoU2FsdDsKICAgICBi b29sIG1faGFzSGFkQWN0aXZlTWVkaWFTdHJlYW1UcmFjayB7IGZhbHNlIH07CiAjZW5kaWYKIApJ bmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZpc2lvbiAy MTcxNTApCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC02ODUsNiArNjg1LDEwIEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cmVn aXN0ZXJXaXRoRG9jdW0KIAogICAgIGRvY3VtZW50LmFkZEF1ZGlvUHJvZHVjZXIodGhpcyk7CiAg ICAgYWRkRWxlbWVudFRvRG9jdW1lbnRNYXAoKnRoaXMsIGRvY3VtZW50KTsKKworI2lmIEVOQUJM RShNRURJQV9TVFJFQU0pCisgICAgZG9jdW1lbnQucmVnaXN0ZXJGb3JNZWRpYVN0cmVhbVN0YXRl Q2hhbmdlQ2FsbGJhY2tzKCp0aGlzKTsKKyNlbmRpZgogfQogCiB2b2lkIEhUTUxNZWRpYUVsZW1l bnQ6OnVucmVnaXN0ZXJXaXRoRG9jdW1lbnQoRG9jdW1lbnQmIGRvY3VtZW50KQpAQCAtNzIwLDYg KzcyNCwxMSBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnVucmVnaXN0ZXJXaXRoRG9jCiAKICAg ICBkb2N1bWVudC5yZW1vdmVBdWRpb1Byb2R1Y2VyKHRoaXMpOwogICAgIHJlbW92ZUVsZW1lbnRG cm9tRG9jdW1lbnRNYXAoKnRoaXMsIGRvY3VtZW50KTsKKworI2lmIEVOQUJMRShNRURJQV9TVFJF QU0pCisgICAgZG9jdW1lbnQudW5yZWdpc3RlckZvck1lZGlhU3RyZWFtU3RhdGVDaGFuZ2VDYWxs YmFja3MoKnRoaXMpOworI2VuZGlmCisKIH0KIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpkaWRN b3ZlVG9OZXdEb2N1bWVudChEb2N1bWVudCYgb2xkRG9jdW1lbnQpCkBAIC03NDg0LDYgKzc0OTMs MTMgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpmdWxsc2NyZWVuTW9kZUNoYQogICAgIHNjaGVk dWxlVXBkYXRlUGxheWJhY2tDb250cm9sc01hbmFnZXIoKTsKIH0KIAorI2lmIEVOQUJMRShNRURJ QV9TVFJFQU0pCit2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhU3RyZWFtQ2FwdHVyZVN0YXRl Q2hhbmdlZCgpCit7CisgICAgcmVzdW1lQXV0b3BsYXlpbmcoKTsKK30KKyNlbmRpZgorCiB9CiAK ICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgJKHJldmlz aW9uIDIxNzE1MCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC01MTUsNiArNTE1LDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQ T1JUIGNvbnN0IE1lZGlhUmVzb3VyY2VMb2FkZXIqIGxhc3RNZWRpYVJlc291cmNlTG9hZGVyRm9y VGVzdGluZygpIGNvbnN0OwogCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKKyAgICB2b2lkIG1l ZGlhU3RyZWFtQ2FwdHVyZVN0YXRlQ2hhbmdlZCgpOwogICAgIGJvb2wgaGFzTWVkaWFTdHJlYW1T cmNPYmplY3QoKSBjb25zdCB7IHJldHVybiAhIW1fbWVkaWFTdHJlYW1TcmNPYmplY3Q7IH0KICNl bmRpZgogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMTcxNTApCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxNy0wNS0yMiAgRXJpYyBDYXJs c29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWVkaWFTdHJlYW1dIEFs bG93IHRyYW5zaXRpb24gZnJvbSBhdXRvcGxheSB0byBwbGF5IHdoZW4gYSBjYXB0dXJlIHN0cmVh bSBiZWdpbnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNzIzOTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMyMzA0OTM0PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd2VicnRjL2F1dG9wbGF5X3Jl bW90ZV9zdHJlYW0tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiB3ZWJydGMvYXV0b3Bs YXlfcmVtb3RlX3N0cmVhbS5odG1sOiBBZGRlZC4KKwogMjAxNy0wNS0xOSAgQWxleGV5IFByb3Nr dXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBNYW55IENTUyBqcy10ZXN0cyB1c2Ug d2FpdFVudGlsRG9uZQpJbmRleDogTGF5b3V0VGVzdHMvd2VicnRjL2F1dG9wbGF5X3JlbW90ZV9z dHJlYW0tZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3dlYnJ0Yy9hdXRv cGxheV9yZW1vdGVfc3RyZWFtLWV4cGVjdGVkLnR4dAkobm9uZXhpc3RlbnQpCisrKyBMYXlvdXRU ZXN0cy93ZWJydGMvYXV0b3BsYXlfcmVtb3RlX3N0cmVhbS1leHBlY3RlZC50eHQJKHdvcmtpbmcg Y29weSkKQEAgLTAsMCArMSw2IEBACisgICAgCisKK1BBU1MgU2V0dXAgcmVtb3RlIHN0cmVhbSBh bmQgdmlkZW8gZWxlbWVudCAKK1BBU1MgU2V0dXAgbG9jYWwgc3RyZWFtIGFuZCB2aWRlbyBlbGVt ZW50IAorUEFTUyBSZW1vdGUgdmlkZW8gcGxheWJhY2sgYWxsb3dlZCAKKwpJbmRleDogTGF5b3V0 VGVzdHMvd2VicnRjL2F1dG9wbGF5X3JlbW90ZV9zdHJlYW0uaHRtbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy93ZWJydGMvYXV0b3BsYXlfcmVtb3RlX3N0cmVhbS5odG1sCShub25leGlzdGVu dCkKKysrIExheW91dFRlc3RzL3dlYnJ0Yy9hdXRvcGxheV9yZW1vdGVfc3RyZWFtLmh0bWwJKHdv cmtpbmcgY29weSkKQEAgLTAsMCArMSw3MSBAQAorPCFET0NUWVBFIEhUTUw+Cis8aHRtbD4KKyAg ICA8aGVhZD4KKyAgICAgICAgPGNhbnZhcyBpZD0iY2FudmFzIiB3aWR0aD0xMDBweCBoZWlnaHQ9 MTAwcHg+PC9jYW52YXM+CisgICAgICAgIDx2aWRlbyBpZD0icmVtb3RlX3ZpZGVvIiBhdXRvcGxh eSB3aWR0aD0xMDBweCBoZWlnaHQ9MTAwcHg+PC92aWRlbz4KKyAgICAgICAgPHZpZGVvIGlkPSJs b2NhbF92aWRlbyIgYXV0b3BsYXkgbXV0ZWQgd2lkdGg9MTAwcHggaGVpZ2h0PTEwMHB4Pjwvdmlk ZW8+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwv c2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVw b3J0LmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmMgPSJyb3V0aW5lcy5qcyI+PC9z Y3JpcHQ+CisgICAgICAgIDxzY3JpcHQ+CisKKyAgICAgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMp IHsKKyAgICAgICAgICAgIGludGVybmFscy5zZXRNZWRpYUVsZW1lbnRSZXN0cmljdGlvbnMobG9j YWxfdmlkZW8sICJSZXF1aXJlVXNlckdlc3R1cmVGb3JBdWRpb1JhdGVDaGFuZ2UiKTsKKyAgICAg ICAgICAgIGludGVybmFscy5zZXRNZWRpYUVsZW1lbnRSZXN0cmljdGlvbnMocmVtb3RlX3ZpZGVv LCAiUmVxdWlyZVVzZXJHZXN0dXJlRm9yQXVkaW9SYXRlQ2hhbmdlIik7CisgICAgICAgIH0KKyAg ICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICAgICAgdGVzdFJ1bm5lci5zZXRV c2VyTWVkaWFQZXJtaXNzaW9uKHRydWUpOworCisgICAgICAgIGxldCBjb2xvciA9ICJncmVlbiI7 CisgICAgICAgIGZ1bmN0aW9uIHN0YXJ0RHJhd2luZ1RvQ2FudmFzKCkKKyAgICAgICAgeworICAg ICAgICAgICAgbGV0IGNvbnRleHQgPSBjYW52YXMuZ2V0Q29udGV4dCgiMmQiKTsKKyAgICAgICAg ICAgIGNvbnRleHQuZmlsbFN0eWxlID0gY29sb3I7CisgICAgICAgICAgICBjb250ZXh0LmZpbGxS ZWN0KDAsIDAsIDEwMCwgMTAwKTsKKyAgICAgICAgICAgIHNldFRpbWVvdXQoc3RhcnREcmF3aW5n VG9DYW52YXMsIDUwKTsKKyAgICAgICAgfQorCisgICAgICAgIHByb21pc2VfdGVzdCgodGVzdCkg PT4geworICAgICAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+ IHsKKyAgICAgICAgICAgICAgICBzdGFydERyYXdpbmdUb0NhbnZhcygpOworCisgICAgICAgICAg ICAgICAgY3JlYXRlQ29ubmVjdGlvbnMoKGZpcnN0Q29ubmVjdGlvbikgPT4geworICAgICAgICAg ICAgICAgICAgICBsZXQgc3RyZWFtID0gY2FudmFzLmNhcHR1cmVTdHJlYW0oKTsKKyAgICAgICAg ICAgICAgICAgICAgZmlyc3RDb25uZWN0aW9uLmFkZFRyYWNrKHN0cmVhbS5nZXRWaWRlb1RyYWNr cygpWzBdLCBzdHJlYW0pOworICAgICAgICAgICAgICAgIH0sIChzZWNvbmRDb25uZWN0aW9uKSA9 PiB7CisgICAgICAgICAgICAgICAgICAgIHNlY29uZENvbm5lY3Rpb24ub250cmFjayA9ICh0cmFj a0V2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAgICAgICAgICBhc3NlcnRfdHJ1ZSh0cmFja0V2 ZW50LnRyYWNrIGluc3RhbmNlb2YgTWVkaWFTdHJlYW1UcmFjayk7CisgICAgICAgICAgICAgICAg ICAgICAgICBhc3NlcnRfdHJ1ZSh0cmFja0V2ZW50LnJlY2VpdmVyIGluc3RhbmNlb2YgUlRDUnRw UmVjZWl2ZXIpOworICAgICAgICAgICAgICAgICAgICAgICAgYXNzZXJ0X3RydWUoQXJyYXkuaXNB cnJheSh0cmFja0V2ZW50LnN0cmVhbXMpLCAiQXJyYXkuaXNBcnJheSgpIHNob3VsZCByZXR1cm4g dHJ1ZSIpOworICAgICAgICAgICAgICAgICAgICAgICAgYXNzZXJ0X3RydWUoT2JqZWN0LmlzRnJv emVuKHRyYWNrRXZlbnQuc3RyZWFtcyksICJPYmplY3QuaXNGcm96ZW4oKSBzaG91bGQgcmV0dXJu IHRydWUiKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJlc29sdmUodHJhY2tFdmVudC5zdHJl YW1zWzBdKTsKKyAgICAgICAgICAgICAgICAgICAgfTsKKyAgICAgICAgICAgICAgICB9KTsKKwor ICAgICAgICAgICAgICAgIHRlc3Quc3RlcF90aW1lb3V0KCgpID0+IHJlamVjdCgiU2V0dGluZyB1 cCByZW1vdGUgc3RyZWFtIHRpbWVkIG91dCIpLCA1MDAwKTsKKyAgICAgICAgICAgIH0pCisgICAg ICAgICAgICAudGhlbigoc3RyZWFtKSA9PiB7CisgICAgICAgICAgICAgICAgbG9jYWxfdmlkZW8u c3JjT2JqZWN0ID0gc3RyZWFtOworICAgICAgICAgICAgICAgIHJlbW90ZV92aWRlby5zcmNPYmpl Y3QgPSBzdHJlYW07CisgICAgICAgICAgICAgICAgY29sb3IgPSAieWVsbG93IjsKKyAgICAgICAg ICAgICB9KQorICAgICAgICB9LCAiU2V0dXAgcmVtb3RlIHN0cmVhbSBhbmQgdmlkZW8gZWxlbWVu dCIpOworCisgICAgICAgIHByb21pc2VfdGVzdCgodGVzdCkgPT4geworICAgICAgICAgICAgcmV0 dXJuIG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHthdWRpbzogdHJ1ZSwgdmlk ZW86IHRydWV9KS50aGVuKChzdHJlYW0pID0+IHsKKyAgICAgICAgICAgICAgICBjb2xvciA9ICJi bHVlIjsKKyAgICAgICAgICAgICAgICBsb2NhbF92aWRlby5zcmNPYmplY3QgPSBzdHJlYW07Cisg ICAgICAgICAgICB9KTsKKyAgICAgICAgfSwgIlNldHVwIGxvY2FsIHN0cmVhbSBhbmQgdmlkZW8g ZWxlbWVudCIpOworCisgICAgICAgIHByb21pc2VfdGVzdCgodGVzdCkgPT4geworICAgICAgICAg ICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHsKKyAgICAgICAgICAg ICAgICB0ZXN0LnN0ZXBfdGltZW91dCgoKSA9PiByZWplY3QoIlN0YXJ0aW5nIHJlbW90ZSB2aWRl byBwbGF5YmFjayB0aW1lZCBvdXQiKSwgNTAwMCk7CisgICAgICAgICAgICAgICAgY29sb3IgPSAi cmVkIjsKKyAgICAgICAgICAgICAgICByZW1vdGVfdmlkZW8ucGxheSgpLnRoZW4oKCkgPT4gcmVz b2x2ZSgpICk7CisgICAgICAgICAgICB9KQorICAgICAgICB9LCAiUmVtb3RlIHZpZGVvIHBsYXli YWNrIGFsbG93ZWQiKTsKKworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+ Cg== 311072 2017-05-23 16:19:06 -0700 2017-05-23 17:07:25 -0700 Patch bug-172391-20170523161905.patch text/plain 5698 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3MjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWE3MzZiNjVkOGJlYWFl YzdmODUxZGFmYTVmOWZjNjc3NmRhYTNkZS4uYWY2NDA0ZTE1Nzk0MDY1OWJiZmZlYzgwZWM0Zjc1 NWY4ZDE3OTBjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTA1LTIzICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVh bV0gQWxsb3cgdHJhbnNpdGlvbiBmcm9tIGF1dG9wbGF5IHRvIHBsYXkgd2hlbiBhIGNhcHR1cmUg c3RyZWFtIGJlZ2lucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE3MjM5MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzIzMDQ5MzQ+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICBNYW51YWwgdGVzdGluZy4g UmVncmVzc2lvbiB0ZXN0aW5nIHRvIGJlIGFkZGVkIGFzIGEgZm9sbG93LXVwLgorCisgICAgICAg ICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp1cGRhdGVJ c1BsYXlpbmdNZWRpYSk6IENhbGwgbWVkaWFTdHJlYW1DYXB0dXJlU3RhdGVDaGFuZ2VkIHdoZW4g Y2FwdHVyZQorICAgICAgICBzdGF0ZSBjaGFuZ2VzLgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnQ6OnJlZ2lzdGVyRm9yTWVkaWFTdHJlYW1TdGF0ZUNoYW5nZUNhbGxiYWNrcyk6CisgICAgICAg IChXZWJDb3JlOjpEb2N1bWVudDo6dW5yZWdpc3RlckZvck1lZGlhU3RyZWFtU3RhdGVDaGFuZ2VD YWxsYmFja3MpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6Om1lZGlhU3RyZWFtQ2FwdHVy ZVN0YXRlQ2hhbmdlZCk6IENhbGwgYWxsIHJlZ2lzdGVyZWQgZWxlbWVudHMuCisgICAgICAgICog ZG9tL0RvY3VtZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnJlZ2lzdGVyV2l0aERvY3VtZW50KTog UmVnaXN0ZXIgZm9yIGNhcHR1cmUgc3RhdGUgY2hhbmdlcy4KKyAgICAgICAgKFdlYkNvcmU6OkhU TUxNZWRpYUVsZW1lbnQ6OnVucmVnaXN0ZXJXaXRoRG9jdW1lbnQpOiBVbnJlZ2lzdGVyIGZvciBj YXB0dXJlIHN0YXRlIGNoYW5nZXMuCisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50 OjptZWRpYVN0cmVhbUNhcHR1cmVTdGF0ZUNoYW5nZWQpOiBBdHRlbXB0IGF1dG9wbGF5IGFzIG5l Y2Vzc2FyeS4KKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKwogMjAxNy0wNS0y MyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtXZWJJRExdIFJlbW92 ZSBzb21lIHVubmVjZXNzYXJ5IHNwZWNpYWxpemF0aW9uIGZvciBlbnVtIHR5cGVzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAppbmRleCAzZDFkN2U5NWNhNGRiODY2YTZiNWM1YmU1MzMyZjQxNmUyMGIy ODRjLi42M2RjMzMyZjI1N2NhMmMxMTk2MGJlZGI1Mzg5N2RjMjM2OGE2YjMwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKQEAgLTM0ODMsMTAgKzM0ODMsMTkgQEAgdm9pZCBEb2N1bWVudDo6dXBk YXRlSXNQbGF5aW5nTWVkaWEodWludDY0X3Qgc291cmNlRWxlbWVudElEKQogICAgIGlmIChzdGF0 ZSA9PSBtX21lZGlhU3RhdGUpCiAgICAgICAgIHJldHVybjsKIAorI2lmIEVOQUJMRShNRURJQV9T VFJFQU0pCisgICAgYm9vbCBjYXB0dXJlU3RhdGVDaGFuZ2VkID0gTWVkaWFQcm9kdWNlcjo6aXND YXB0dXJpbmcobV9tZWRpYVN0YXRlKSAhPSBNZWRpYVByb2R1Y2VyOjppc0NhcHR1cmluZyhzdGF0 ZSk7CisjZW5kaWYKKyAgICAKICAgICBtX21lZGlhU3RhdGUgPSBzdGF0ZTsKIAogICAgIGlmIChw YWdlKCkpCiAgICAgICAgIHBhZ2UoKS0+dXBkYXRlSXNQbGF5aW5nTWVkaWEoc291cmNlRWxlbWVu dElEKTsKKworI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCisgICAgaWYgKGNhcHR1cmVTdGF0ZUNo YW5nZWQpCisgICAgICAgIG1lZGlhU3RyZWFtQ2FwdHVyZVN0YXRlQ2hhbmdlZCgpOworI2VuZGlm CiB9CiAKIHZvaWQgRG9jdW1lbnQ6OnBhZ2VNdXRlZFN0YXRlRGlkQ2hhbmdlKCkKQEAgLTcwMTEs NiArNzAyMCwyMiBAQCB2b2lkIERvY3VtZW50OjpzdG9wTWVkaWFDYXB0dXJlKCkKICAgICAgICAg ICAgIHN0cmVhbS5lbmRDYXB0dXJlVHJhY2tzKCk7CiAgICAgfSk7CiB9CisKK3ZvaWQgRG9jdW1l bnQ6OnJlZ2lzdGVyRm9yTWVkaWFTdHJlYW1TdGF0ZUNoYW5nZUNhbGxiYWNrcyhIVE1MTWVkaWFF bGVtZW50JiBlbGVtZW50KQoreworICAgIG1fbWVkaWFTdHJlYW1TdGF0ZUNoYW5nZUVsZW1lbnRz LmFkZCgmZWxlbWVudCk7Cit9CisKK3ZvaWQgRG9jdW1lbnQ6OnVucmVnaXN0ZXJGb3JNZWRpYVN0 cmVhbVN0YXRlQ2hhbmdlQ2FsbGJhY2tzKEhUTUxNZWRpYUVsZW1lbnQmIGVsZW1lbnQpCit7Cisg ICAgbV9tZWRpYVN0cmVhbVN0YXRlQ2hhbmdlRWxlbWVudHMucmVtb3ZlKCZlbGVtZW50KTsKK30K Kwordm9pZCBEb2N1bWVudDo6bWVkaWFTdHJlYW1DYXB0dXJlU3RhdGVDaGFuZ2VkKCkKK3sKKyAg ICBmb3IgKGF1dG8qIG1lZGlhRWxlbWVudCA6IG1fbWVkaWFTdHJlYW1TdGF0ZUNoYW5nZUVsZW1l bnRzKQorICAgICAgICBtZWRpYUVsZW1lbnQtPm1lZGlhU3RyZWFtQ2FwdHVyZVN0YXRlQ2hhbmdl ZCgpOworfQogI2VuZGlmCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50 LmgKaW5kZXggNmQzYmI2OTcxODg3YWYxYjI3ZDIwNDBmODhiNjQ1YmNiNzliOTE4MC4uZjgzNjNi YzI5OWVlZmZkOWQzNWQwZmU0NTc3YjY3MTgwOWMzNDgwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0RvY3VtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgK QEAgLTEyODMsNiArMTI4Myw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldERldmljZUlESGFzaFNh bHQoY29uc3QgU3RyaW5nJiBzYWx0KSB7IG1faWRIYXNoU2FsdCA9IHNhbHQ7IH0KICAgICBTdHJp bmcgZGV2aWNlSURIYXNoU2FsdCgpIGNvbnN0IHsgcmV0dXJuIG1faWRIYXNoU2FsdDsgfQogICAg IHZvaWQgc3RvcE1lZGlhQ2FwdHVyZSgpOworICAgIHZvaWQgcmVnaXN0ZXJGb3JNZWRpYVN0cmVh bVN0YXRlQ2hhbmdlQ2FsbGJhY2tzKEhUTUxNZWRpYUVsZW1lbnQmKTsKKyAgICB2b2lkIHVucmVn aXN0ZXJGb3JNZWRpYVN0cmVhbVN0YXRlQ2hhbmdlQ2FsbGJhY2tzKEhUTUxNZWRpYUVsZW1lbnQm KTsKKyAgICB2b2lkIG1lZGlhU3RyZWFtQ2FwdHVyZVN0YXRlQ2hhbmdlZCgpOwogI2VuZGlmCiAK IC8vIEZJWE1FOiBGaW5kIGEgYmV0dGVyIHBsYWNlIGZvciB0aGlzIGZ1bmN0aW9uYWxpdHkuCkBA IC0xNzY1LDYgKzE3NjgsNyBAQCBwcml2YXRlOgogI2VuZGlmCiAKICNpZiBFTkFCTEUoTUVESUFf U1RSRUFNKQorICAgIEhhc2hTZXQ8SFRNTE1lZGlhRWxlbWVudCo+IG1fbWVkaWFTdHJlYW1TdGF0 ZUNoYW5nZUVsZW1lbnRzOwogICAgIFN0cmluZyBtX2lkSGFzaFNhbHQ7CiAgICAgYm9vbCBtX2hh c0hhZEFjdGl2ZU1lZGlhU3RyZWFtVHJhY2sgeyBmYWxzZSB9OwogI2VuZGlmCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCA4MzU4YWMzYzU0YzI5MzRhMGVjMjM3 NGY0ZDFlOTkyNzVkNWU5MTNkLi44MDk0YTE3ZTYyMzdjZjlhMjNkNTk1MzE1NWY5MjE0OTBhZjBm NDFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTY4NSw2 ICs2ODUsMTAgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpyZWdpc3RlcldpdGhEb2N1bWVudChE b2N1bWVudCYgZG9jdW1lbnQpCiAKICAgICBkb2N1bWVudC5hZGRBdWRpb1Byb2R1Y2VyKHRoaXMp OwogICAgIGFkZEVsZW1lbnRUb0RvY3VtZW50TWFwKCp0aGlzLCBkb2N1bWVudCk7CisKKyNpZiBF TkFCTEUoTUVESUFfU1RSRUFNKQorICAgIGRvY3VtZW50LnJlZ2lzdGVyRm9yTWVkaWFTdHJlYW1T dGF0ZUNoYW5nZUNhbGxiYWNrcygqdGhpcyk7CisjZW5kaWYKIH0KIAogdm9pZCBIVE1MTWVkaWFF bGVtZW50Ojp1bnJlZ2lzdGVyV2l0aERvY3VtZW50KERvY3VtZW50JiBkb2N1bWVudCkKQEAgLTcy MCw2ICs3MjQsMTEgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1bnJlZ2lzdGVyV2l0aERvY3Vt ZW50KERvY3VtZW50JiBkb2N1bWVudCkKIAogICAgIGRvY3VtZW50LnJlbW92ZUF1ZGlvUHJvZHVj ZXIodGhpcyk7CiAgICAgcmVtb3ZlRWxlbWVudEZyb21Eb2N1bWVudE1hcCgqdGhpcywgZG9jdW1l bnQpOworCisjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKKyAgICBkb2N1bWVudC51bnJlZ2lzdGVy Rm9yTWVkaWFTdHJlYW1TdGF0ZUNoYW5nZUNhbGxiYWNrcygqdGhpcyk7CisjZW5kaWYKKwogfQog CiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRpZE1vdmVUb05ld0RvY3VtZW50KERvY3VtZW50JiBv bGREb2N1bWVudCkKQEAgLTc0ODUsNiArNzQ5NCwxMyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OmZ1bGxzY3JlZW5Nb2RlQ2hhbmdlZChWaWRlb0Z1bGxzY3JlZW5Nb2RlIG1vZGUpCiAgICAgc2No ZWR1bGVVcGRhdGVQbGF5YmFja0NvbnRyb2xzTWFuYWdlcigpOwogfQogCisjaWYgRU5BQkxFKE1F RElBX1NUUkVBTSkKK3ZvaWQgSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFTdHJlYW1DYXB0dXJlU3Rh dGVDaGFuZ2VkKCkKK3sKKyAgICByZXN1bWVBdXRvcGxheWluZygpOworfQorI2VuZGlmCisKIH0K IAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCmluZGV4IDVmMDg1 ZDMyMDlhZTc1NmM4MzE3M2ZlYTEwNDgzZThjNTkwZGUzODAuLjhlYmYxNTIxMzJkYTJiYmY5NDNl OTdjZmQ2ZTg2YjY3MmJkYmZhZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5oCkBAIC01MTUsNiArNTE1LDcgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIGNvbnN0 IE1lZGlhUmVzb3VyY2VMb2FkZXIqIGxhc3RNZWRpYVJlc291cmNlTG9hZGVyRm9yVGVzdGluZygp IGNvbnN0OwogCiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkKKyAgICB2b2lkIG1lZGlhU3RyZWFt Q2FwdHVyZVN0YXRlQ2hhbmdlZCgpOwogICAgIGJvb2wgaGFzTWVkaWFTdHJlYW1TcmNPYmplY3Qo KSBjb25zdCB7IHJldHVybiAhIW1fbWVkaWFTdHJlYW1TcmNPYmplY3Q7IH0KICNlbmRpZgogCg==