163044 2016-10-06 11:24:16 -0700 Address flaky airplay-* LayouTests 2016-10-10 10:20:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 162971 1 jer.noble jer.noble ap commit-queue oldest_to_newest 1237190 0 jer.noble 2016-10-06 11:24:16 -0700 Address flaky airplay-* LayouTests 1237340 1 290863 jer.noble 2016-10-06 14:10:48 -0700 Created attachment 290863 Patch 1237342 2 commit-queue 2016-10-06 14:12:52 -0700 Attachment 290863 did not pass style-queue: ERROR: Source/WebCore/Modules/mediasession/WebMediaSessionManager.h:49: std::unique_ptr is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] Total errors found: 1 in 17 files If any of these errors are false positives, please file a bug against check-webkit-style. 1237394 3 290863 bfulgham 2016-10-06 16:27:36 -0700 Comment on attachment 290863 Patch This looks fine. You need someone to review the WK2 part of this (Beth or Alex Christensen?) 1237422 4 290863 ap 2016-10-06 18:32:20 -0700 Comment on attachment 290863 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=290863&action=review > Source/WebCore/ChangeLog:8 > + AirPlay LayoutTests will occasionally flake, likely due to two tests being run simultaneously. This is because When multiple tests are run simultaneously, that's in separate DumpRenderTree/WebKitTestRunner processes. So, this doesn't sound like a feasible explanation. Perhaps there is a race when navigating from one test to another? 1237473 5 jer.noble 2016-10-06 22:17:47 -0700 (In reply to comment #4) > Comment on attachment 290863 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=290863&action=review > > > Source/WebCore/ChangeLog:8 > > + AirPlay LayoutTests will occasionally flake, likely due to two tests being run simultaneously. This is because > > When multiple tests are run simultaneously, that's in separate > DumpRenderTree/WebKitTestRunner processes. So, this doesn't sound like a > feasible explanation. > > Perhaps there is a race when navigating from one test to another? Yes, I came to that conclusion myself. I think there is a simpler explanation: the mock AirPlay picker isn't being reset to consistent values between tests. So depending on the order in which tests are run, tests could have inconsistent results, time out, etc. 1237645 6 290939 jer.noble 2016-10-07 10:15:05 -0700 Created attachment 290939 Patch 1237802 7 290939 bfulgham 2016-10-07 14:49:22 -0700 Comment on attachment 290939 Patch Wow! So much simpler than before :-) r=me. 1238366 8 290939 commit-queue 2016-10-10 10:20:16 -0700 Comment on attachment 290939 Patch Clearing flags on attachment: 290939 Committed r207005: <http://trac.webkit.org/changeset/207005> 1238367 9 commit-queue 2016-10-10 10:20:19 -0700 All reviewed patches have been landed. Closing bug. 290863 2016-10-06 14:10:48 -0700 2016-10-07 10:15:03 -0700 Patch bug-163044-20161006140734.patch text/plain 25380 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTFhZTAzNzAyNDEyNjBm ZTAxNjA4OTIxYjIzYjg1MTJhY2FlZDQ5MC4uYzQ0MzhjMzYxMWZjODk5NTkxNzBmMTkxMDcxZjhh ZjRjNzIwNWNlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE2LTEwLTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEFkZHJlc3MgZmxha3kgYWly cGxheS0qIExheW91VGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2MzA0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFpclBsYXkgTGF5b3V0VGVzdHMgd2lsbCBvY2Nhc2lvbmFsbHkgZmxha2UsIGxp a2VseSBkdWUgdG8gdHdvIHRlc3RzIGJlaW5nIHJ1biBzaW11bHRhbmVvdXNseS4gVGhpcyBpcyBi ZWNhdXNlCisgICAgICAgIHRoZXJlIGlzIG9uZSBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyIHBlci1w cm9jZXNzLCBhbmQgdGVzdHMgdGhhdCBkZXBlbmQgb24gdGhhdCBtYW5hZ2VyJ3Mgc3RhdGUgY2Fu IGJlY29tZQorICAgICAgICBjb25mdXNlZCB3aGVuIHR3byB0ZXN0cyBhcmUgbWFuaXB1bGF0aW5n IHRoZSBzYW1lIG1hbmFnZXIuICBJbiBXZWJDb3JlLCBhbGxvdyBtdWx0aXBsZSBXZWJNZWRpYVNl c3Npb25NYW5hZ2VycworICAgICAgICB0byBiZSBjcmVhdGVkIHNpbXVsdGFuZW91c2x5IChXZWJL aXQgYW5kIFdlYktpdDIgd2lsbCB0YWtlIGFkdmFudGFnZSBvZiB0aGlzKS4gQWxzbywgcmVtb3Zl IGFsbCB0aGUgVGltZXJzCisgICAgICAgIGRyaXZpbmcgZXZlbnRzIGluIE1lZGlhUGxheWJhY2tU YXJnZXRQaWNrZXJNb2NrOyB0ZXN0cyB3aWxsIGJlIHJlLXdyaXR0ZW4gdG8gZXhwbGljaXRseSBt YWtlIGNob2ljZXMgd2hlbiB0aGUKKyAgICAgICAgInBpY2tlciIgaXMgYWN0aXZlLCBhbmQgcmVh Y3QgdGhyb3VnaCBldmVudHMgcmF0aGVyIHRoYW4gd2l0aCBzZXRUaW1lb3V0KCkuICBTaW5jZSBX ZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjCisgICAgICAgIHdhcyBwcmV2aW91c2x5IGEgTmV2ZXJE ZXN0cm95ZWQgc2luZ2xldG9uLCBpdCBuZXZlciByZW1vdmVkIGl0cyBldmVudCBsaXN0ZW5lcnMg YmVmb3JlIGRlc3Ryb3lpbmcgaXQncyBPYmplY3RpdmUtQworICAgICAgICBsaXN0ZW5lciBvYmpl Y3Q7IG5vdyB0aGF0IGl0IGNhbiBiZSBkZXN0cm95ZWQsIG1ha2Ugc3VyZSB0byByZW1vdmUgb2Jz ZXJ2ZXJzIGluIGl0cyBkZXN0cnVjdG9yLgorCisgICAgICAgIERyaXZlLWJ5IGZpeDogT25lIGFk ZGl0aW9uYWwgc291cmNlIG9mIGZsYWtpbmVzcyBtYXkgYmUgdGhhdCB0aGUgSFRNTE1lZGlhRWxl bWVudCBkb2VzIG5vdCBuZWNlc3NhcmlseSBmaXJlIGEKKyAgICAgICAgIndlYmtpdGN1cnJlbnRw bGF5YmFja3RhcmdldGlzd2lyZWxlc3NjaGFuZ2VkIiBldmVudCB3aGVuIHRoZSBlbGVtZW50J3Mg TWVkaWFQbGF5ZXIgaXMgY2xlYXJlZC4gRG8gdGhpcyBleHBsaWNpdGx5LgorCisgICAgICAgICog TW9kdWxlcy9tZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlci5oOgorICAgICAgICAq IGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFF bGVtZW50OjpjbGVhck1lZGlhUGxheWVyKToKKyAgICAgICAgKiBwYWdlL1BhZ2UuaDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdl ck1hYy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpjcmVh dGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9XZWJNZWRpYVNl c3Npb25NYW5hZ2VyTWFjLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYy5tbToKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6On5NZWRpYVBsYXliYWNrVGFyZ2V0UGlj a2VyTWFjKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tb2NrL01lZGlhUGxheWJhY2tUYXJnZXRQaWNr ZXJNb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJN b2NrOjpNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTW9jayk6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTW9jazo6c2hvd1BsYXliYWNrVGFyZ2V0UGlja2VyKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNb2NrOjpzZXRTdGF0 ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTW9jazo6dGlt ZXJGaXJlZCk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vbW9jay9NZWRpYVBsYXliYWNr VGFyZ2V0UGlja2VyTW9jay5oOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6c2V0TW9ja01lZGlhUGxheWJhY2tUYXJnZXRQaWNr ZXJTdGF0ZSk6CisKIDIwMTYtMDktMjMgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+ CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjIwNjMwMCk6IExheW91dFRlc3QgbWVkaWEvbWVkaWEt c291cmNlL21lZGlhLXNvdXJjZS1kdXBsaWNhdGUtc2Vla2VkLmh0bWwgdGltaW5nIG91dApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMv Q2hhbmdlTG9nCmluZGV4IDQ3OTBkZTYxMzU5NWFhNGQyMjY2NGZiODRjZGYyNGYyMDAwNTdjMDUu LjE5NWM1ZTRhOGQ0ZDY0NGY2YTk3N2QzMWE5YTQxNGFjOWRjN2M4NjUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyNiBAQAorMjAxNi0xMC0wNiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KKworICAgICAgICBBZGRyZXNzIGZsYWt5IGFpcnBsYXktKiBMYXlvdVRlc3RzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjMwNDQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSBt b2NrTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlciBpcyBlbmFibGVkLCByYXRoZXIgdGhhbiB1c2lu ZyB0aGUgc2hhcmVkLCBnbG9iYWwKKyAgICAgICAgV2ViTWVkaWFTZXNzaW9uTWFuYWdlciwgY3Jl YXRlIGEgbmV3IG9uZSBzcGVjaWZpY2FsbHkgZm9yIHRoaXMgV2ViVmlldywgc28gdGhhdCBtdWx0 aXBsZQorICAgICAgICBXZWJWaWV3cyBydW5uaW5nIGluIHRoZSBzYW1lIHByb2Nlc3MgZG8gbm90 IGludGVyZmVyZSB3aXRoIGVhY2ggb3RoZXIncyB0ZXN0cy4KKworICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L1dlYkNocm9tZUNsaWVudC5tbToKKyAgICAgICAgKFdlYkNocm9tZUNsaWVudDo6bW9j a01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJEaXNtaXNzUG9wdXApOgorICAgICAgICAqIFdlYlZp ZXcvV2ViTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlci5oOgorICAgICAgICAqIFdlYlZpZXcvV2Vi TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlci5tbToKKyAgICAgICAgKFdlYk1lZGlhUGxheWJhY2tU YXJnZXRQaWNrZXI6OmFkZFBsYXliYWNrVGFyZ2V0UGlja2VyQ2xpZW50KToKKyAgICAgICAgKFdl Yk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXI6OnJlbW92ZVBsYXliYWNrVGFyZ2V0UGlja2VyQ2xp ZW50KToKKyAgICAgICAgKFdlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXI6OnNob3dQbGF5YmFj a1RhcmdldFBpY2tlcik6CisgICAgICAgIChXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpw bGF5YmFja1RhcmdldFBpY2tlckNsaWVudFN0YXRlRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYk1l ZGlhUGxheWJhY2tUYXJnZXRQaWNrZXI6OnNldE1vY2tNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2Vy RW5hYmxlZCk6CisgICAgICAgIChXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjppbnZhbGlk YXRlKToKKyAgICAgICAgKFdlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXI6Om1hbmFnZXIpOgor CiAyMDE2LTA5LTI3ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAg IFJlbW92ZSBkZXByZWNhdGVkIEVOQ1JZUFRFRF9NRURJQSBpbXBsZW1lbnRhdGlvbi4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwppbmRleCA2ZGVjZDNkODBmNmUzYTgwMmQ5NjFhMTNiYTcxZTA4NGZkMjI3NzkzLi41OWVjNDEx MWE1ZWIyNjljNmM0NDE0ZTIwYzI4MzNmYzllNmRlNGI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjUgQEAKKzIwMTYtMTAtMDYgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAg ICAgICAgQWRkcmVzcyBmbGFreSBhaXJwbGF5LSogTGF5b3VUZXN0cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzMDQ0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiB0aGUgbW9ja01lZGlhUGxheWJh Y2tUYXJnZXRQaWNrZXIgaXMgZW5hYmxlZCwgcmF0aGVyIHRoYW4gdXNpbmcgdGhlIHNoYXJlZCwg Z2xvYmFsCisgICAgICAgIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXIsIGNyZWF0ZSBhIG5ldyBvbmUg c3BlY2lmaWNhbGx5IGZvciB0aGlzIFdlYlBhZ2VQcm94eSwgc28gdGhhdCBtdWx0aXBsZQorICAg ICAgICBXZWJQYWdlUHJveHkgcnVubmluZyBpbiB0aGUgc2FtZSBwcm9jZXNzIGRvIG5vdCBpbnRl cmZlcmUgd2l0aCBlYWNoIG90aGVyJ3MgdGVzdHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjptZWRpYVNlc3Np b25NYW5hZ2VyKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjphZGRQbGF5YmFja1Rh cmdldFBpY2tlckNsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVtb3Zl UGxheWJhY2tUYXJnZXRQaWNrZXJDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OnNob3dQbGF5YmFja1RhcmdldFBpY2tlcik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6cGxheWJhY2tUYXJnZXRQaWNrZXJDbGllbnRTdGF0ZURpZENoYW5nZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0TW9ja01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJF bmFibGVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXRNb2NrTWVkaWFQbGF5 YmFja1RhcmdldFBpY2tlclN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKwogMjAx Ni0wOS0yOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgTmV0d29ya1Nlc3Npb246IEhUVFAgYXV0aGVudGljYXRpb24gZG9lc24ndCB3b3JrIGlm IFBST1RFQ1RJT05fU1BBQ0VfQVVUSF9DQUxMQkFDSyBpcyBub3QgZW5hYmxlZApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFu YWdlci5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNz aW9uTWFuYWdlci5oCmluZGV4IDJmOGU5MDk3YjUwMjBiNmY4MGVmYzA5YmQzODFmMWNmZDVmY2Zh MjIuLjBiOTc3OGI1ZTgxOGRjNmE1MGVmNmQwMmRkOTExNzVjYzhjYjJmY2YgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNzaW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFn ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNl c3Npb25NYW5hZ2VyLmgKQEAgLTQ2LDggKzQ2LDEwIEBAIGNsYXNzIFdlYk1lZGlhU2Vzc2lvbk1h bmFnZXJDbGllbnQ7CiBjbGFzcyBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyIDogcHVibGljIE1lZGlh UGxheWJhY2tUYXJnZXRQaWNrZXI6OkNsaWVudCB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUo V2ViTWVkaWFTZXNzaW9uTWFuYWdlcik7CiBwdWJsaWM6Ci0KKyAgICBmcmllbmQgc3RkOjp1bmlx dWVfcHRyPFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXI+OworICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRp YyBzdGQ6OnVuaXF1ZV9wdHI8V2ViTWVkaWFTZXNzaW9uTWFuYWdlcj4gY3JlYXRlKCk7CiAgICAg V0VCQ09SRV9FWFBPUlQgc3RhdGljIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXImIHNoYXJlZCgpOwor ICAgIHZpcnR1YWwgfldlYk1lZGlhU2Vzc2lvbk1hbmFnZXIoKTsKIAogICAgIFdFQkNPUkVfRVhQ T1JUIHZvaWQgc2V0TW9ja01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJFbmFibGVkKGJvb2wpOwog ICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0TW9ja01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJT dGF0ZShjb25zdCBTdHJpbmcmLCBNZWRpYVBsYXliYWNrVGFyZ2V0Q29udGV4dDo6U3RhdGUpOwpA QCAtNjAsNyArNjIsNiBAQCBwdWJsaWM6CiAKIHByb3RlY3RlZDoKICAgICBXZWJNZWRpYVNlc3Np b25NYW5hZ2VyKCk7Ci0gICAgdmlydHVhbCB+V2ViTWVkaWFTZXNzaW9uTWFuYWdlcigpOwogCiAg ICAgdmlydHVhbCBXZWJDb3JlOjpNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyJiBwbGF0Zm9ybVBp Y2tlcigpID0gMDsKICAgICBzdGF0aWMgV2ViTWVkaWFTZXNzaW9uTWFuYWdlciYgcGxhdGZvcm1N YW5hZ2VyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCAz OGU0OTM4MzEzZmY1MjM0NjYyNWMwYTAxNzlkNzA4ZmIzYjAyYTE2Li5hYjI1Y2NmYzRmOTQzYjlj NDgyOWNjMzRmNzExM2RhZmQ3NzNjYmM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAKQEAgLTUxMzYsNiArNTEzNiwxMSBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OmNsZWFyTWVkaWFQbGF5ZXIoRGVsYXllZEFjdGlvblR5cGUgZmxhZ3MpCiAgICAgICAgIC8vIGRv ZXNuJ3Qgc3VwcG9ydCBwbGF5YmFjayB0byBhIHRhcmdldC4KICAgICAgICAgZW5xdWV1ZVBsYXli YWNrVGFyZ2V0QXZhaWxhYmlsaXR5Q2hhbmdlZEV2ZW50KCk7CiAgICAgfQorCisgICAgaWYgKG1f aXNQbGF5aW5nVG9XaXJlbGVzc1RhcmdldCkgeworICAgICAgICBtX2lzUGxheWluZ1RvV2lyZWxl c3NUYXJnZXQgPSBmYWxzZTsKKyAgICAgICAgc2NoZWR1bGVFdmVudChldmVudE5hbWVzKCkud2Vi a2l0Y3VycmVudHBsYXliYWNrdGFyZ2V0aXN3aXJlbGVzc2NoYW5nZWRFdmVudCk7CisgICAgfQog I2VuZGlmCiAKICAgICBpZiAobV9pc1dhaXRpbmdVbnRpbE1lZGlhQ2FuU3RhcnQpIHsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9XZWJN ZWRpYVNlc3Npb25NYW5hZ2VyTWFjLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjLmNwcAppbmRleCBmZmIz ZGYzZTUyNTBjYTUzMDIxNDY0ZDkxMWJmNTQ4OWQ0NmVkMzM5Li5jNzlmYzVkNjFlYTgzNWVmYzkz NmY0YTBkYWNhZjVlZDJkNWExNmRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlck1hYy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL1dlYk1lZGlh U2Vzc2lvbk1hbmFnZXJNYWMuY3BwCkBAIC0zMyw2ICszMywxMSBAQAogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKK3N0ZDo6dW5pcXVlX3B0cjxXZWJNZWRpYVNlc3Npb25NYW5hZ2VyPiBXZWJNZWRp YVNlc3Npb25NYW5hZ2VyOjpjcmVhdGUoKQoreworICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVl PFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWM+KCk7Cit9CisKIFdlYk1lZGlhU2Vzc2lvbk1hbmFn ZXImIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZCgpCiB7CiAgICAgc3RhdGljIE5ldmVy RGVzdHJveWVkPFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWM+IHNoYXJlZE1hbmFnZXI7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vV2Vi TWVkaWFTZXNzaW9uTWFuYWdlck1hYy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWMuaAppbmRleCBmMTEzMTU5 NzgzMmFhMTU3MTlmMTNhNTIxYjgxNzYzYWIyYjgxMWIxLi42NWZhYjk5YWYxMmE4MzA0ZTAxNzNm Y2ExODJiNzI5NGFmMWQ3OThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlck1hYy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9XZWJNZWRpYVNlc3Np b25NYW5hZ2VyTWFjLmgKQEAgLTM0LDExICszNCwxMiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IGNsYXNzIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWMgOiBwdWJsaWMgV2ViTWVkaWFTZXNzaW9u TWFuYWdlciB7CiAgICAgZnJpZW5kIGNsYXNzIE5ldmVyRGVzdHJveWVkPFdlYk1lZGlhU2Vzc2lv bk1hbmFnZXJNYWM+OworICAgIGZyaWVuZCBzdGQ6OnVuaXF1ZV9wdHI8V2ViTWVkaWFTZXNzaW9u TWFuYWdlck1hYz4gc3RkOjptYWtlX3VuaXF1ZTxXZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjPigp OwogcHVibGljOgorICAgIHZpcnR1YWwgfldlYk1lZGlhU2Vzc2lvbk1hbmFnZXJNYWMoKTsKIAog cHJpdmF0ZToKICAgICBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyTWFjKCk7Ci0gICAgdmlydHVhbCB+ V2ViTWVkaWFTZXNzaW9uTWFuYWdlck1hYygpOwogCiAgICAgdmlydHVhbCBXZWJDb3JlOjpNZWRp YVBsYXliYWNrVGFyZ2V0UGlja2VyJiBwbGF0Zm9ybVBpY2tlcigpOwogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXliYWNrVGFyZ2V0UGlja2VyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYy5tbQppbmRl eCAyMmIwNGE3NWNhMzg3M2I1Y2M3NzIyYWM3YzBkZjUxNDRmMWQwYTFkLi4yMDY2ZjA3NTg5MDVl NjRhMzUxN2NjNzE1OTcwYTM3NzI0OTJhMjJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXliYWNrVGFyZ2V0UGlj a2VyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWMubW0KQEAgLTcyLDYgKzcyLDEx IEBAIE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6On5NZWRpYVBsYXliYWNrVGFyZ2V0UGlj a2VyTWFjKCkKIHsKICAgICBzZXRDbGllbnQobnVsbHB0cik7CiAgICAgW21fb3V0cHV0RGV2aWNl TWVudUNvbnRyb2xsZXJEZWxlZ2F0ZSBjbGVhckNhbGxiYWNrXTsKKyAgICBpZiAobV9vdXRwdXRE ZXZpY2VNZW51Q29udHJvbGxlcikgeworICAgICAgICBbbV9vdXRwdXREZXZpY2VNZW51Q29udHJv bGxlciByZW1vdmVPYnNlcnZlcjptX291dHB1dERldmljZU1lbnVDb250cm9sbGVyRGVsZWdhdGUu Z2V0KCkgZm9yS2V5UGF0aDpleHRlcm5hbE91dHB1dERldmljZUF2YWlsYWJsZUtleU5hbWVdOwor ICAgICAgICBbbV9vdXRwdXREZXZpY2VNZW51Q29udHJvbGxlciByZW1vdmVPYnNlcnZlcjptX291 dHB1dERldmljZU1lbnVDb250cm9sbGVyRGVsZWdhdGUuZ2V0KCkgZm9yS2V5UGF0aDpleHRlcm5h bE91dHB1dERldmljZVBpY2tlZEtleU5hbWVdOworICAgICAgICBtX291dHB1dERldmljZU1lbnVD b250cm9sbGVyID0gbnVsbHB0cjsKKyAgICB9CiB9CiAKIGJvb2wgTWVkaWFQbGF5YmFja1Rhcmdl dFBpY2tlck1hYzo6ZXh0ZXJuYWxPdXRwdXREZXZpY2VBdmFpbGFibGUoKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9NZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTW9j ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01lZGlhUGxheWJhY2tUYXJnZXRQ aWNrZXJNb2NrLmNwcAppbmRleCAxYTYwY2EyNGJiYzYwOTZiN2E5NWUyMTA2NjA0OTUxMmZlMmYy NTViLi42OGNlMzkzNTI5ZDliNGRmNTk4NTlhMDUzYjAyMzhmYjc0MjliODIzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJN b2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01lZGlhUGxheWJhY2tU YXJnZXRQaWNrZXJNb2NrLmNwcApAQCAtMzcsMTEgKzM3LDggQEAgdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIGNvbnN0IGRvdWJsZSB0aW1l ckludGVydmFsID0gMS4wIC8gMTAuMDsKLQogTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1vY2s6 Ok1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNb2NrKE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXI6 OkNsaWVudCYgY2xpZW50KQogICAgIDogTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlcihjbGllbnQp Ci0gICAgLCBtX3RpbWVyKFJ1bkxvb3A6Om1haW4oKSwgdGhpcywgJk1lZGlhUGxheWJhY2tUYXJn ZXRQaWNrZXJNb2NrOjp0aW1lckZpcmVkKQogewogICAgIExPRyhNZWRpYSwgIk1lZGlhUGxheWJh Y2tUYXJnZXRQaWNrZXJNb2NrOjpNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTW9jayIpOwogfQpA QCAtNjQsMTIgKzYxLDYgQEAgUmVmPE1lZGlhUGxheWJhY2tUYXJnZXQ+IE1lZGlhUGxheWJhY2tU YXJnZXRQaWNrZXJNb2NrOjpwbGF5YmFja1RhcmdldCgpCiAgICAgcmV0dXJuIFdlYkNvcmU6Ok1l ZGlhUGxheWJhY2tUYXJnZXRNb2NrOjpjcmVhdGUobV9kZXZpY2VOYW1lLCBtX3N0YXRlKTsKIH0K IAotdm9pZCBNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTW9jazo6dGltZXJGaXJlZCgpCi17Ci0g ICAgbV9zaG93aW5nTWVudSA9IGZhbHNlOwotICAgIGN1cnJlbnREZXZpY2VEaWRDaGFuZ2UoKTsK LX0KLQogdm9pZCBNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTW9jazo6c2hvd1BsYXliYWNrVGFy Z2V0UGlja2VyKGNvbnN0IEZsb2F0UmVjdCYsIGJvb2wgY2hlY2tBY3RpdmVSb3V0ZSkKIHsKICAg ICBpZiAoIWNsaWVudCgpIHx8IG1fc2hvd2luZ01lbnUpCkBAIC04MSw3ICs3Miw2IEBAIHZvaWQg TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1vY2s6OnNob3dQbGF5YmFja1RhcmdldFBpY2tlcihj b25zdCBGbG9hdFJlY3QmLCBiCiAgICAgTE9HKE1lZGlhLCAiTWVkaWFQbGF5YmFja1RhcmdldFBp Y2tlck1vY2s6OnNob3dQbGF5YmFja1RhcmdldFBpY2tlciAtIGNoZWNrQWN0aXZlUm91dGUgPSAl aSIsIChpbnQpY2hlY2tBY3RpdmVSb3V0ZSk7CiAKICAgICBtX3Nob3dpbmdNZW51ID0gdHJ1ZTsK LSAgICBtX3RpbWVyLnN0YXJ0T25lU2hvdCh0aW1lckludGVydmFsKTsKIH0KIAogdm9pZCBNZWRp YVBsYXliYWNrVGFyZ2V0UGlja2VyTW9jazo6c3RhcnRpbmdNb25pdG9yaW5nUGxheWJhY2tUYXJn ZXRzKCkKQEAgLTExMCw3ICsxMDAsNyBAQCB2b2lkIE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJN b2NrOjpzZXRTdGF0ZShjb25zdCBTdHJpbmcmIGRldmljZU5hbWUsIE1lZGlhUGxheQogewogICAg IExPRyhNZWRpYSwgIk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNb2NrOjpzZXRTdGF0ZSAtIG5h bWUgPSAlcywgc3RhdGUgPSAweCV4IiwgZGV2aWNlTmFtZS51dGY4KCkuZGF0YSgpLCAodW5zaWdu ZWQpc3RhdGUpOwogCi0gICAgaWYgKGRldmljZU5hbWUgIT0gbV9kZXZpY2VOYW1lICYmIHN0YXRl ICE9IE1lZGlhUGxheWJhY2tUYXJnZXRDb250ZXh0OjpVbmtub3duKSB7CisgICAgaWYgKChkZXZp Y2VOYW1lICE9IG1fZGV2aWNlTmFtZSAmJiBzdGF0ZSAhPSBNZWRpYVBsYXliYWNrVGFyZ2V0Q29u dGV4dDo6VW5rbm93bikgfHwgbV9zaG93aW5nTWVudSkgewogICAgICAgICBtX2RldmljZU5hbWUg PSBkZXZpY2VOYW1lOwogICAgICAgICBjdXJyZW50RGV2aWNlRGlkQ2hhbmdlKCk7CiAgICAgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9NZWRpYVBsYXliYWNrVGFy Z2V0UGlja2VyTW9jay5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9NZWRpYVBsYXli YWNrVGFyZ2V0UGlja2VyTW9jay5oCmluZGV4IDM1Y2M5NTRiMDY1NGUwN2FkNjc4OGZmYjJkYzUw OTNiNzlmMGZkZTEuLjJmYjFlY2U3NjE2Mzk4NWQ2NzliOGI3Njk2ZjRmODA1N2QzMjg0NWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21vY2svTWVkaWFQbGF5YmFja1Rhcmdl dFBpY2tlck1vY2suaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01lZGlhUGxh eWJhY2tUYXJnZXRQaWNrZXJNb2NrLmgKQEAgLTUyLDEwICs1Miw3IEBAIHByaXZhdGU6CiAgICAg Ym9vbCBleHRlcm5hbE91dHB1dERldmljZUF2YWlsYWJsZSgpIG92ZXJyaWRlOwogICAgIFJlZjxN ZWRpYVBsYXliYWNrVGFyZ2V0PiBwbGF5YmFja1RhcmdldCgpIG92ZXJyaWRlOwogCi0gICAgdm9p ZCB0aW1lckZpcmVkKCk7Ci0KLSAgICBTdHJpbmcgbV9kZXZpY2VOYW1lOwotICAgIFJ1bkxvb3A6 OlRpbWVyPE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNb2NrPiBtX3RpbWVyOworICAgIFN0cmlu ZyBtX2RldmljZU5hbWUgeyBlbXB0eVN0cmluZygpIH07CiAgICAgTWVkaWFQbGF5YmFja1Rhcmdl dENvbnRleHQ6OlN0YXRlIG1fc3RhdGUgeyBNZWRpYVBsYXliYWNrVGFyZ2V0Q29udGV4dDo6VW5r bm93biB9OwogICAgIGJvb2wgbV9zaG93aW5nTWVudSB7IGZhbHNlIH07CiB9OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2Vy LmggYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNr ZXIuaAppbmRleCBkYzBlZjg0Mzc1OGViOTE1OWYwZTQ2MzAwNzUzZTcxNTE2YWUzYWU5Li5kZGRj MDQxY2U1MTAzZTI0MWIyMWQyNzMzMjljMWVhODhlMzU1YTExIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXIuaAorKysgYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXIuaApA QCAtMjcsNiArMjcsNyBAQAogCiAjaW5jbHVkZSA8V2ViQ29yZS9NZWRpYVBsYXliYWNrVGFyZ2V0 Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9NZWRpYVBsYXliYWNrVGFyZ2V0Q29udGV4dC5oPgorI2lu Y2x1ZGUgPFdlYkNvcmUvV2ViTWVkaWFTZXNzaW9uTWFuYWdlci5oPgogI2luY2x1ZGUgPFdlYkNv cmUvV2ViTWVkaWFTZXNzaW9uTWFuYWdlckNsaWVudC5oPgogI2luY2x1ZGUgPHd0Zi9SZWYuaD4K IApAQCAtNTgsNiArNTksOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBpbnZhbGlkYXRlKCk7CiAKIHBy aXZhdGU6CisgICAgV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlciYgbWFuYWdlcigpOwor CisgICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXI+IG1f bW9ja01hbmFnZXI7CiAgICAgV2ViQ29yZTo6UGFnZSogbV9wYWdlOwogfTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2Vy Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlj a2VyLm1tCmluZGV4IDZkOGNiZjU3NWZmYTcwYmE2ZmU4ZjJmNzAwNjg1MzhmOWY5ZTJiMGYuLjM3 Mzk3NjBlNGZjNzc1YWQ3MzI1ZmE2MWRhOThkYTEwZmQyNjJjMTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlci5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXIu bW0KQEAgLTQzLDI3ICs0MywzMiBAQCBXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpXZWJN ZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyKFdlYkNvcmU6OlBhZ2UmIHBhZ2UpCiAKIHZvaWQgV2Vi TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlcjo6YWRkUGxheWJhY2tUYXJnZXRQaWNrZXJDbGllbnQo dWludDY0X3QgY29udGV4dElkKQogewotICAgIFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1hbmFn ZXI6OnNoYXJlZCgpLmFkZFBsYXliYWNrVGFyZ2V0UGlja2VyQ2xpZW50KCp0aGlzLCBjb250ZXh0 SWQpOworICAgIG1hbmFnZXIoKS5hZGRQbGF5YmFja1RhcmdldFBpY2tlckNsaWVudCgqdGhpcywg Y29udGV4dElkKTsKIH0KIAogdm9pZCBXZWJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyOjpyZW1v dmVQbGF5YmFja1RhcmdldFBpY2tlckNsaWVudCh1aW50NjRfdCBjb250ZXh0SWQpCiB7Ci0gICAg V2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVkKCkucmVtb3ZlUGxheWJhY2tU YXJnZXRQaWNrZXJDbGllbnQoKnRoaXMsIGNvbnRleHRJZCk7CisgICAgbWFuYWdlcigpLnJlbW92 ZVBsYXliYWNrVGFyZ2V0UGlja2VyQ2xpZW50KCp0aGlzLCBjb250ZXh0SWQpOwogfQogCiB2b2lk IFdlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXI6OnNob3dQbGF5YmFja1RhcmdldFBpY2tlcih1 aW50NjRfdCBjb250ZXh0SWQsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgcmVjdCwgYm9vbCBo YXNWaWRlbykKIHsKLSAgICBXZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWQo KS5zaG93UGxheWJhY2tUYXJnZXRQaWNrZXIoKnRoaXMsIGNvbnRleHRJZCwgV2ViQ29yZTo6SW50 UmVjdChyZWN0KSwgaGFzVmlkZW8pOworICAgIG1hbmFnZXIoKS5zaG93UGxheWJhY2tUYXJnZXRQ aWNrZXIoKnRoaXMsIGNvbnRleHRJZCwgV2ViQ29yZTo6SW50UmVjdChyZWN0KSwgaGFzVmlkZW8p OwogfQogCiB2b2lkIFdlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXI6OnBsYXliYWNrVGFyZ2V0 UGlja2VyQ2xpZW50U3RhdGVEaWRDaGFuZ2UodWludDY0X3QgY29udGV4dElkLCBXZWJDb3JlOjpN ZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlRmxhZ3Mgc3RhdGUpCiB7Ci0gICAgV2ViQ29yZTo6V2Vi TWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVkKCkuY2xpZW50U3RhdGVEaWRDaGFuZ2UoKnRoaXMs IGNvbnRleHRJZCwgc3RhdGUpOworICAgIG1hbmFnZXIoKS5jbGllbnRTdGF0ZURpZENoYW5nZSgq dGhpcywgY29udGV4dElkLCBzdGF0ZSk7CiB9CiAKIHZvaWQgV2ViTWVkaWFQbGF5YmFja1Rhcmdl dFBpY2tlcjo6c2V0TW9ja01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJFbmFibGVkKGJvb2wgZW5h YmxlZCkKIHsKLSAgICBXZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFyZWQoKS5z ZXRNb2NrTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlckVuYWJsZWQoZW5hYmxlZCk7CisgICAgaWYg KGVuYWJsZWQgJiYgIW1fbW9ja01hbmFnZXIpCisgICAgICAgIG1fbW9ja01hbmFnZXIgPSBXZWJD b3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpjcmVhdGUoKTsKKyAgICBlbHNlIGlmICghZW5h YmxlZCAmJiBtX21vY2tNYW5hZ2VyKQorICAgICAgICBtX21vY2tNYW5hZ2VyID0gbnVsbHB0cjsK KworICAgIG1hbmFnZXIoKS5zZXRNb2NrTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlckVuYWJsZWQo ZW5hYmxlZCk7CiB9CiAKIHZvaWQgV2ViTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlcjo6c2V0TW9j a01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJTdGF0ZShjb25zdCBTdHJpbmcmIG5hbWUsIFdlYkNv cmU6Ok1lZGlhUGxheWJhY2tUYXJnZXRDb250ZXh0OjpTdGF0ZSBzdGF0ZSkKQEAgLTk5LDYgKzEw NCwxNCBAQCB2b2lkIFdlYk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXI6OmludmFsaWRhdGUoKQog ewogICAgIG1fcGFnZSA9IG51bGxwdHI7CiAgICAgV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFu YWdlcjo6c2hhcmVkKCkucmVtb3ZlQWxsUGxheWJhY2tUYXJnZXRQaWNrZXJDbGllbnRzKCp0aGlz KTsKKyAgICBpZiAobV9tb2NrTWFuYWdlcikKKyAgICAgICAgbV9tb2NrTWFuYWdlci0+cmVtb3Zl QWxsUGxheWJhY2tUYXJnZXRQaWNrZXJDbGllbnRzKCp0aGlzKTsKIH0KIAorV2ViQ29yZTo6V2Vi TWVkaWFTZXNzaW9uTWFuYWdlciYgV2ViTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlcjo6bWFuYWdl cigpCit7CisgICAgaWYgKG1fbW9ja01hbmFnZXIpCisgICAgICAgIHJldHVybiAqbV9tb2NrTWFu YWdlcjsKKyAgICByZXR1cm4gV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVk KCk7Cit9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAK aW5kZXggMDJmZmQxODRkMjE3N2QyMjM3ZjRlODI0YWZiMDVjNmRiY2RhMGZjZi4uNzBhOWVkMmE3 NTVmNWJhNzMyMTkzODIzZTFiY2MzYzNkYzFmZjhjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTY1MTAsMzQgKzY1MTAsNDYgQEAgdm9pZCBXZWJQYWdl UHJveHk6OmhhbmRsZUF1dG9GaWxsQnV0dG9uQ2xpY2soY29uc3QgVXNlckRhdGEmIHVzZXJEYXRh KQogfQogCiAjaWYgRU5BQkxFKFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkgJiYgIVBMQVRGT1JN KElPUykKK1dlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXImIFdlYlBhZ2VQcm94eTo6bWVk aWFTZXNzaW9uTWFuYWdlcigpCit7CisgICAgaWYgKG1fbW9ja1Nlc3Npb25NYW5hZ2VyKQorICAg ICAgICByZXR1cm4gKm1fbW9ja1Nlc3Npb25NYW5hZ2VyOworICAgIHJldHVybiBtX3BhZ2VDbGll bnQubWVkaWFTZXNzaW9uTWFuYWdlcigpOworfQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6YWRkUGxh eWJhY2tUYXJnZXRQaWNrZXJDbGllbnQodWludDY0X3QgY29udGV4dElkKQogewotICAgIG1fcGFn ZUNsaWVudC5tZWRpYVNlc3Npb25NYW5hZ2VyKCkuYWRkUGxheWJhY2tUYXJnZXRQaWNrZXJDbGll bnQoKnRoaXMsIGNvbnRleHRJZCk7CisgICAgbWVkaWFTZXNzaW9uTWFuYWdlcigpLmFkZFBsYXli YWNrVGFyZ2V0UGlja2VyQ2xpZW50KCp0aGlzLCBjb250ZXh0SWQpOwogfQogCiB2b2lkIFdlYlBh Z2VQcm94eTo6cmVtb3ZlUGxheWJhY2tUYXJnZXRQaWNrZXJDbGllbnQodWludDY0X3QgY29udGV4 dElkKQogewotICAgIG1fcGFnZUNsaWVudC5tZWRpYVNlc3Npb25NYW5hZ2VyKCkucmVtb3ZlUGxh eWJhY2tUYXJnZXRQaWNrZXJDbGllbnQoKnRoaXMsIGNvbnRleHRJZCk7CisgICAgbWVkaWFTZXNz aW9uTWFuYWdlcigpLnJlbW92ZVBsYXliYWNrVGFyZ2V0UGlja2VyQ2xpZW50KCp0aGlzLCBjb250 ZXh0SWQpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2hvd1BsYXliYWNrVGFyZ2V0UGlja2Vy KHVpbnQ2NF90IGNvbnRleHRJZCwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiByZWN0LCBib29s IGhhc1ZpZGVvKQogewotICAgIG1fcGFnZUNsaWVudC5tZWRpYVNlc3Npb25NYW5hZ2VyKCkuc2hv d1BsYXliYWNrVGFyZ2V0UGlja2VyKCp0aGlzLCBjb250ZXh0SWQsIG1fcGFnZUNsaWVudC5yb290 Vmlld1RvU2NyZWVuKEludFJlY3QocmVjdCkpLCBoYXNWaWRlbyk7CisgICAgbWVkaWFTZXNzaW9u TWFuYWdlcigpLnNob3dQbGF5YmFja1RhcmdldFBpY2tlcigqdGhpcywgY29udGV4dElkLCBtX3Bh Z2VDbGllbnQucm9vdFZpZXdUb1NjcmVlbihJbnRSZWN0KHJlY3QpKSwgaGFzVmlkZW8pOwogfQog CiB2b2lkIFdlYlBhZ2VQcm94eTo6cGxheWJhY2tUYXJnZXRQaWNrZXJDbGllbnRTdGF0ZURpZENo YW5nZSh1aW50NjRfdCBjb250ZXh0SWQsIFdlYkNvcmU6Ok1lZGlhUHJvZHVjZXI6Ok1lZGlhU3Rh dGVGbGFncyBzdGF0ZSkKIHsKLSAgICBtX3BhZ2VDbGllbnQubWVkaWFTZXNzaW9uTWFuYWdlcigp LmNsaWVudFN0YXRlRGlkQ2hhbmdlKCp0aGlzLCBjb250ZXh0SWQsIHN0YXRlKTsKKyAgICBtZWRp YVNlc3Npb25NYW5hZ2VyKCkuY2xpZW50U3RhdGVEaWRDaGFuZ2UoKnRoaXMsIGNvbnRleHRJZCwg c3RhdGUpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0TW9ja01lZGlhUGxheWJhY2tUYXJn ZXRQaWNrZXJFbmFibGVkKGJvb2wgZW5hYmxlZCkKIHsKLSAgICBtX3BhZ2VDbGllbnQubWVkaWFT ZXNzaW9uTWFuYWdlcigpLnNldE1vY2tNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyRW5hYmxlZChl bmFibGVkKTsKKyAgICBpZiAoIWVuYWJsZWQgJiYgbV9tb2NrU2Vzc2lvbk1hbmFnZXIpCisgICAg ICAgIG1fbW9ja1Nlc3Npb25NYW5hZ2VyID0gbnVsbHB0cjsKKyAgICBlbHNlIGlmIChlbmFibGVk ICYmICFtX21vY2tTZXNzaW9uTWFuYWdlcikKKyAgICAgICAgbV9tb2NrU2Vzc2lvbk1hbmFnZXIg PSBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpjcmVhdGUoKTsKKworICAgIG1lZGlhU2Vzc2lvbk1h bmFnZXIoKS5zZXRNb2NrTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlckVuYWJsZWQoZW5hYmxlZCk7 CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRNb2NrTWVkaWFQbGF5YmFja1RhcmdldFBpY2tl clN0YXRlKGNvbnN0IFN0cmluZyYgbmFtZSwgV2ViQ29yZTo6TWVkaWFQbGF5YmFja1RhcmdldENv bnRleHQ6OlN0YXRlIHN0YXRlKQogewotICAgIG1fcGFnZUNsaWVudC5tZWRpYVNlc3Npb25NYW5h Z2VyKCkuc2V0TW9ja01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJTdGF0ZShuYW1lLCBzdGF0ZSk7 CisgICAgbWVkaWFTZXNzaW9uTWFuYWdlcigpLnNldE1vY2tNZWRpYVBsYXliYWNrVGFyZ2V0UGlj a2VyU3RhdGUobmFtZSwgc3RhdGUpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0UGxheWJh Y2tUYXJnZXQodWludDY0X3QgY29udGV4dElkLCBSZWY8TWVkaWFQbGF5YmFja1RhcmdldD4mJiB0 YXJnZXQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggMmVhMzA0 YWY2NmUyMDdmZTBhYmYxNjkxOTlmZmZmOTJlZGIzZTg3Mi4uYzc1ODdkZTRmOGQ2MjI5NDZkOTNi YjhhNTc5MjZiNWVjMmM5NjA0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaApAQCAtMTUzLDYgKzE1Myw3IEBAIGNsYXNzIFByb3RlY3Rpb25TcGFjZTsKIGNsYXNzIFJ1 bkxvb3BPYnNlcnZlcjsKIGNsYXNzIFNoYXJlZEJ1ZmZlcjsKIGNsYXNzIFRleHRJbmRpY2F0b3I7 CitjbGFzcyBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOwogZW51bSBjbGFzcyBIYXNJbnNlY3VyZUNv bnRlbnQ7CiBzdHJ1Y3QgRGljdGlvbmFyeVBvcHVwSW5mbzsKIHN0cnVjdCBFeGNlcHRpb25EZXRh aWxzOwpAQCAtMTA5Miw2ICsxMDkzLDcgQEAgcHVibGljOgogICAgIHZvaWQgcGxheWJhY2tUYXJn ZXRQaWNrZXJDbGllbnRTdGF0ZURpZENoYW5nZSh1aW50NjRfdCwgV2ViQ29yZTo6TWVkaWFQcm9k dWNlcjo6TWVkaWFTdGF0ZUZsYWdzKTsKICAgICB2b2lkIHNldE1vY2tNZWRpYVBsYXliYWNrVGFy Z2V0UGlja2VyRW5hYmxlZChib29sKTsKICAgICB2b2lkIHNldE1vY2tNZWRpYVBsYXliYWNrVGFy Z2V0UGlja2VyU3RhdGUoY29uc3QgU3RyaW5nJiwgV2ViQ29yZTo6TWVkaWFQbGF5YmFja1Rhcmdl dENvbnRleHQ6OlN0YXRlKTsKKyAgICBXZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyJiBt ZWRpYVNlc3Npb25NYW5hZ2VyKCk7CiAKICAgICAvLyBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyQ2xp ZW50CiAgICAgdm9pZCBzZXRQbGF5YmFja1RhcmdldCh1aW50NjRfdCwgUmVmPFdlYkNvcmU6Ok1l ZGlhUGxheWJhY2tUYXJnZXQ+JiYpIG92ZXJyaWRlOwpAQCAtMTg4MCw2ICsxODgyLDcgQEAgcHJp dmF0ZToKIAogI2lmIEVOQUJMRShXSVJFTEVTU19QTEFZQkFDS19UQVJHRVQpICYmICFQTEFURk9S TShJT1MpCiAgICAgYm9vbCBtX3JlcXVpcmVzVGFyZ2V0TW9uaXRvcmluZyB7IGZhbHNlIH07Cisg ICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXI+IG1fbW9j a1Nlc3Npb25NYW5hZ2VyOwogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1MpCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZGRj NTFkZGVlNzBkZDQwYmU0YmNjMjIyZTcxZmU5ZTQyMTYwZDYxYS4uMThmZWQ4MDFlODA3NjcxNWNi NzgxNGMwNGU4N2QwOTc1NDU0NmRiYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE2LTEwLTA2 ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEFkZHJlc3MgZmxh a3kgYWlycGxheS0qIExheW91VGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2MzA0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogbWVkaWEvYWlycGxheS1hdXRvcGxheS5odG1sOgorICAgICAgICAq IG1lZGlhL2NvbnRyb2xzL2FpcnBsYXktcGlja2VyLmh0bWw6CisKIDIwMTYtMDktMjMgIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjIwNjMw MCk6IExheW91dFRlc3QgbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1kdXBsaWNhdGUt c2Vla2VkLmh0bWwgdGltaW5nIG91dApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvYWly cGxheS1hdXRvcGxheS5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvYWlycGxheS1hdXRvcGxheS5o dG1sCmluZGV4IDEwNWMxNDgxODZlYmU3ZmJlMGQ2ZjgzNTAzNTU4NTk4MzkxNjEyOWYuLjM1YWFh YzZmY2Q1MzFiYmRjY2Q5ZmU0NTFiNjg4YTQ5ZDliN2VmZjggMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL21lZGlhL2FpcnBsYXktYXV0b3BsYXkuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9h aXJwbGF5LWF1dG9wbGF5Lmh0bWwKQEAgLTEwLDcgKzEwLDYgQEAKIAogICAgIGlmICh3aW5kb3cu aW50ZXJuYWxzKSB7CiAgICAgICAgIGludGVybmFscy5zZXRNb2NrTWVkaWFQbGF5YmFja1Rhcmdl dFBpY2tlckVuYWJsZWQodHJ1ZSk7Ci0gICAgICAgIGludGVybmFscy5zZXRNb2NrTWVkaWFQbGF5 YmFja1RhcmdldFBpY2tlclN0YXRlKCcnLCAnVW5rbm93bicpOwogICAgIH0KIAogICAgIGZ1bmN0 aW9uIHN0YXJ0KCkgCkBAIC0zMCwxMiArMjksOCBAQAogICAgICAgICBjb25zb2xlV3JpdGUoJzxi cj4qKiBzaW11bGF0ZSBjaG9vc2luZyBhIGRldmljZSBmcm9tIHRoZSBtZW51Jyk7CiAgICAgICAg IHJ1bldpdGhLZXlEb3duKGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgcnVuKGB2aWRlby53ZWJr aXRTaG93UGxheWJhY2tUYXJnZXRQaWNrZXIoKWApOwotICAgICAgICAgICAgc2V0VGltZW91dChm dW5jdGlvbigpIHsKLSAgICAgICAgICAgICAgICBpZiAod2luZG93LmludGVybmFscykgewotICAg ICAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0TW9ja01lZGlhUGxheWJhY2tUYXJnZXRQaWNr ZXJFbmFibGVkKHRydWUpOwotICAgICAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0TW9ja01l ZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJTdGF0ZSgnU2xlZXB5IFRWJywgJ0RldmljZUF2YWlsYWJs ZScpOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0sIDEwMCk7CisgICAgICAgICAg ICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0TW9j a01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJTdGF0ZSgnU2xlZXB5IFRWJywgJ0RldmljZUF2YWls YWJsZScpOwogICAgICAgICB9KTsKICAgICAgICAgdmlkZW8uY3VycmVudFRpbWUgPSB2aWRlby5k dXJhdGlvbiAtIDE7CiAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvY29udHJv bHMvYWlycGxheS1waWNrZXIuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL2NvbnRyb2xzL2FpcnBs YXktcGlja2VyLmh0bWwKaW5kZXggYTMzMDYwYzUzNDE4ZGI0NGYwNTNhNzk3OGYzOWI4NmVmODNm ODc2MS4uZjdkODU5YjFmNDE3Y2QxZTYxMDg5NGUwNzAwZTgwOTgyM2VmZjkzYyAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvbWVkaWEvY29udHJvbHMvYWlycGxheS1waWNrZXIuaHRtbAorKysgYi9M YXlvdXRUZXN0cy9tZWRpYS9jb250cm9scy9haXJwbGF5LXBpY2tlci5odG1sCkBAIC00LDcgKzQs NyBAQAogICAgICAgICA8c2NyaXB0IHNyYz0iLi4vbWVkaWEtZmlsZS5qcyI+PC9zY3JpcHQ+CiAg ICAgICAgIDxzY3JpcHQgc3JjPSJjb250cm9scy10ZXN0LWhlbHBlcnMuanMiPjwvc2NyaXB0Pgog ICAgICAgICA8c2NyaXB0PgotICAgICAgICAgICAgaW50ZXJuYWxzLnNldE1vY2tNZWRpYVBsYXli YWNrVGFyZ2V0UGlja2VyRW5hYmxlZChmYWxzZSk7CisgICAgICAgICAgICBpbnRlcm5hbHMuc2V0 TW9ja01lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJFbmFibGVkKHRydWUpOwogICAgICAgICAgICAg dmFyIHRlc3RlciA9IG5ldyBDb250cm9sc1Rlc3QoKQogICAgICAgICAgICAgICAgIC53aGVuUmVh ZHkocnVuVGVzdHNXaXRob3V0RGV2aWNlKQogICAgICAgICAgICAgICAgIC5zdGFydCgpOwpAQCAt MzUsMTIgKzM1LDE5IEBACiAgICAgICAgICAgICAgICAgICAgIC52YWx1ZShzdGF0dXNTdGF0ZS5h cmlhTGFiZWwpCiAgICAgICAgICAgICAgICAgICAgIC5pc0VxdWFsVG8oIkNob29zZSBXaXJlbGVz cyBEaXNwbGF5Iik7CiAKLSAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0TW9ja01lZGlhUGxh eWJhY2tUYXJnZXRQaWNrZXJFbmFibGVkKHRydWUpOwotICAgICAgICAgICAgICAgIGludGVybmFs cy5zZXRNb2NrTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlclN0YXRlKCJTbGVlcHkgVFYiLCAiRGV2 aWNlQXZhaWxhYmxlIik7Ci0gICAgICAgICAgICAgICAgd2luZG93LnNldFRpbWVvdXQocnVuVGVz dHNXaXRoRGV2aWNlLCAxMDApOworICAgICAgICAgICAgICAgIHRlc3Rlci5tZWRpYS5hZGRFdmVu dExpc3RlbmVyKCd3ZWJraXRwbGF5YmFja3RhcmdldGF2YWlsYWJpbGl0eWNoYW5nZWQnLCBhdmFp bGFiaWxpdHlDaGFuZ2VkLCBmYWxzZSk7CisgICAgICAgICAgICAgICAgaW50ZXJuYWxzLnNldE1v Y2tNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyU3RhdGUoJ1NsZWVweSBUVicsICdEZXZpY2VBdmFp bGFibGUnKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgZnVuY3Rpb24gcnVuVGVzdHNX aXRoRGV2aWNlKCkKKyAgICAgICAgICAgIGZ1bmN0aW9uIGF2YWlsYWJpbGl0eUNoYW5nZWQoZXZl bnQpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgaWYgKGV2ZW50LmF2YWlsYWJpbGl0 eSA9PT0gJ2F2YWlsYWJsZScpIHsKKyAgICAgICAgICAgICAgICAgICAgLy8gR2l2ZSB0aGUgamF2 YXNjcmlwdCBjb250cm9scyBhIGNoYW5jZSB0byByZXNwb25kIHRvIHRoZSBzYW1lIGV2ZW50IGFu ZCBkbyBsYXlvdXQKKyAgICAgICAgICAgICAgICAgICAgc2V0VGltZW91dChydW5UZXN0c1dpdGhE ZXZpY2UpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAg ZnVuY3Rpb24gcnVuVGVzdHNXaXRoRGV2aWNlKGV2ZW50KQogICAgICAgICAgICAgewogICAgICAg ICAgICAgICAgIHRlc3Rlci5zdGFydE5ld1NlY3Rpb24oIlNpbXVsYXRlIGFuIGF2YWlsYWJsZSBB cHBsZVRWIik7CiAgICAgICAgICAgICAgICAgdmFyIHN0YXR1c1N0YXRlID0gdGVzdGVyLnN0YXRl Rm9yQ29udHJvbHNFbGVtZW50KCJBcHBsZVRWIERldmljZSBQaWNrZXIiLCB0cnVlKTsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYjdiMmEyMDllOTU3MGE0 MWM0MTVjMTIzNjIyNDM4M2IzNmY2NjZhYi4uY2U1YmRiOWQzZWU5NjA5NTEwMjU0YTM1YjRlOTc0 MzFjYWU4ZmU4NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBl Y3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMK QEAgLTExNTgsOSArMTE1OCw2IEBAIHdlYmtpdC5vcmcvYi8xNDE1MzQgWyBZb3NlbWl0ZSBdIG1l ZGlhL3ZpZGVvLWxvYWQtbmV0d29ya1N0YXRlLmh0bWwgWyBQYXNzIENyYXNoCiAjIFNlZSBhbHNv OiByZGFyOi8vcHJvYmxlbS8yNzM1NjE0NAogd2Via2l0Lm9yZy9iLzE0MjcyNiBmYXN0L2ltYWdl cy9hbmltYXRlZC1wbmcuaHRtbCBbIFNraXAgXQogCi0jIEZhaWxzIHdoZW4gYW4gYWN0dWFsIEFw cGxlVFYgaXMgbmVhcmJ5Lgotd2Via2l0Lm9yZy9iLzE0ODkxMiBbIEVsQ2FwaXRhbisgXSBtZWRp YS9jb250cm9scy9haXJwbGF5LXBpY2tlci5odG1sIFsgUGFzcyBGYWlsdXJlIF0KLQogIyBPUyBY IDEwLjEwLjMrIGhhcyB0aGUgbmVjZXNzYXJ5IGdseXBocy4KIHdlYmtpdC5vcmcvYi8xNDI1NDgg WyBZb3NlbWl0ZSsgXSBlZGl0aW5nL3NlbGVjdGlvbi9leHRlbmQtYnktY2hhcmFjdGVyLTAwNy5o dG1sIFsgUGFzcyBdCiAK 290939 2016-10-07 10:15:05 -0700 2016-10-10 10:20:16 -0700 Patch bug-163044-20161007101150.patch text/plain 5082 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzllMjk0NWU3YTY2ZjBk NDkxODQ5NjhjYWNiMzNmOGI5MjJiY2EyMC4uYTI3YmFjODU3NGMwMDA1MzBlZmYyMDY0MTM1M2My YWMyZDM4ZWRiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE2LTEwLTA3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEFkZHJlc3MgZmxha3kgYWly cGxheS0qIExheW91VGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2MzA0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFR3byBzZXBhcmF0ZSBwcm9ibGVtcyBjb25zcGlyZWQgdG8gbWFrZSBhaXJwbGF5 IHRlc3RzIGEgYml0IGZsYWt5OgorCisgICAgICAgIEZvciBvbmUsIHdoZW4gdGhlIEhUTUxNZWRp YUVsZW1lbnQgY2xlYXJzIGl0cyBNZWRpYVBsYXllciwgaXQgd29uJ3QgbmVjZXNzYXJpbHkgbm90 aWZ5CisgICAgICAgIGNsaWVudHMgdGhhdCBpdCBoYXMgc3RvcHBlZCBwbGF5aW5nIHRvIGEgd2ly ZWxlc3MgdGFyZ2V0LiBUaGUgV2ViTWVkaWFTZXNzaW9uTWFuYWdlciBtYXkKKyAgICAgICAgZXZl bnR1YWxseSBjYXVzZSB0aGlzIHZhbHVlIHRvIHJlc2V0LCBidXQgaXQncyBhc3luY2hyb25vdXMs IGFuZCBtYXkgZmlyZSBhZnRlciB0aGUgbmV4dAorICAgICAgICB0ZXN0IHN0YXJ0cy4gUmVzZXQg dGhpcyBzdGF0ZSBleHBsaWNpdGx5LgorCisgICAgICAgIEZvciB0d28sIHRoZSBzdGF0ZSBvZiB0 aGUgbW9jayBwbGF5YmFjayB0YXJnZXQgcGlja2VyIHdhcyBub3QgYmVpbmcgcmVzZXQgYmV0d2Vl biB0ZXN0CisgICAgICAgIGludm9jYXRpb25zLgorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFF bGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmNsZWFyTWVk aWFQbGF5ZXIpOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkludGVybmFsczo6cmVzZXRUb0NvbnNpc3RlbnRTdGF0ZSk6CisKIDIwMTYtMTAtMDUg IEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IHRo ZSBSZW1vdGUgUGxheWJhY2sgQVBJLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHAKaW5kZXggYjA3ZWY4NzQ0MTllZTA1NDE0ZGNhZDc1YWI0MmQ2YmJjZWE3MDEzNy4uZjc5 MDhlOWY3ZjUzZDAyYTYyMTcyYWU0MmM4ZTI5NTQ0YWQ2Njk2MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC01MTQwLDYgKzUxNDAsMTEgQEAgdm9pZCBIVE1M TWVkaWFFbGVtZW50OjpjbGVhck1lZGlhUGxheWVyKERlbGF5ZWRBY3Rpb25UeXBlIGZsYWdzKQog ICAgICAgICAvLyBkb2Vzbid0IHN1cHBvcnQgcGxheWJhY2sgdG8gYSB0YXJnZXQuCiAgICAgICAg IGVucXVldWVQbGF5YmFja1RhcmdldEF2YWlsYWJpbGl0eUNoYW5nZWRFdmVudCgpOwogICAgIH0K KworICAgIGlmIChtX2lzUGxheWluZ1RvV2lyZWxlc3NUYXJnZXQpIHsKKyAgICAgICAgbV9pc1Bs YXlpbmdUb1dpcmVsZXNzVGFyZ2V0ID0gZmFsc2U7CisgICAgICAgIHNjaGVkdWxlRXZlbnQoZXZl bnROYW1lcygpLndlYmtpdGN1cnJlbnRwbGF5YmFja3RhcmdldGlzd2lyZWxlc3NjaGFuZ2VkRXZl bnQpOworICAgIH0KICNlbmRpZgogCiAgICAgaWYgKG1faXNXYWl0aW5nVW50aWxNZWRpYUNhblN0 YXJ0KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggZWE2Y2FhMTQ3YjVl NDgzNDgwNGZjOTdiMzZjMGE4NThhMjZjNDUyMC4uOGUyZjNmNjA1NTc0MzBmNmNkNDgzZTczYmQz YjZkMTJkMmYzOWU2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5h bHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtNDA4 LDYgKzQwOCwxMSBAQCB2b2lkIEludGVybmFsczo6cmVzZXRUb0NvbnNpc3RlbnRTdGF0ZShQYWdl JiBwYWdlKQogICAgIE1vY2tDb250ZW50RmlsdGVyU2V0dGluZ3M6OnJlc2V0KCk7CiAjZW5kaWYK IAorI2lmIEVOQUJMRShXSVJFTEVTU19QTEFZQkFDS19UQVJHRVQpCisgICAgcGFnZS5zZXRNb2Nr TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlckVuYWJsZWQodHJ1ZSk7CisgICAgcGFnZS5zZXRNb2Nr TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlclN0YXRlKGVtcHR5U3RyaW5nKCksIE1lZGlhUGxheWJh Y2tUYXJnZXRDb250ZXh0OjpVbmtub3duKTsKKyNlbmRpZgorCiAgICAgcGFnZS5zZXRTaG93QWxs UGx1Z2lucyhmYWxzZSk7CiB9CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1MTM2NDU0MGI3Nzc1NDVlMjhiYTc3OGJjMmE2 MGMzMjM5NTJiOGExLi5kNDMwZGVmNjhiYWQwYWY0NzUwOTBlMDA4YzMxNWVkM2E2ZTQ5NmYzIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTYtMTAtMDcgIEplciBOb2JsZSAgPGplci5ub2JsZUBh cHBsZS5jb20+CisKKyAgICAgICAgQWRkcmVzcyBmbGFreSBhaXJwbGF5LSogTGF5b3VUZXN0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzMDQ0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBtZWRpYS9h aXJwbGF5LWF1dG9wbGF5Lmh0bWw6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3Rh dGlvbnM6CisKIDIwMTYtMTAtMDUgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAK ICAgICAgICAgSW1wbGVtZW50IHRoZSBSZW1vdGUgUGxheWJhY2sgQVBJLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvbWVkaWEvYWlycGxheS1hdXRvcGxheS5odG1sIGIvTGF5b3V0VGVzdHMvbWVk aWEvYWlycGxheS1hdXRvcGxheS5odG1sCmluZGV4IDEwNWMxNDgxODZlYmU3ZmJlMGQ2ZjgzNTAz NTU4NTk4MzkxNjEyOWYuLmQzZjRmNzgwNWRjMmZhODFhZDEyNmExNzgzNWYzMTc5YzQ3ODI1ZjUg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL2FpcnBsYXktYXV0b3BsYXkuaHRtbAorKysg Yi9MYXlvdXRUZXN0cy9tZWRpYS9haXJwbGF5LWF1dG9wbGF5Lmh0bWwKQEAgLTgsMTEgKzgsNiBA QAogCiAgICAgdmFyIHBoYXNlID0gJ3ZpZGVvLTEnOwogCi0gICAgaWYgKHdpbmRvdy5pbnRlcm5h bHMpIHsKLSAgICAgICAgaW50ZXJuYWxzLnNldE1vY2tNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2Vy RW5hYmxlZCh0cnVlKTsKLSAgICAgICAgaW50ZXJuYWxzLnNldE1vY2tNZWRpYVBsYXliYWNrVGFy Z2V0UGlja2VyU3RhdGUoJycsICdVbmtub3duJyk7Ci0gICAgfQotCiAgICAgZnVuY3Rpb24gc3Rh cnQoKSAKICAgICB7CiAgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKQEAgLTMxLDEwICsyNiw4 IEBACiAgICAgICAgIHJ1bldpdGhLZXlEb3duKGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgcnVu KGB2aWRlby53ZWJraXRTaG93UGxheWJhY2tUYXJnZXRQaWNrZXIoKWApOwogICAgICAgICAgICAg c2V0VGltZW91dChmdW5jdGlvbigpIHsKLSAgICAgICAgICAgICAgICBpZiAod2luZG93LmludGVy bmFscykgewotICAgICAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0TW9ja01lZGlhUGxheWJh Y2tUYXJnZXRQaWNrZXJFbmFibGVkKHRydWUpOworICAgICAgICAgICAgICAgIGlmICh3aW5kb3cu aW50ZXJuYWxzKQogICAgICAgICAgICAgICAgICAgICBpbnRlcm5hbHMuc2V0TW9ja01lZGlhUGxh eWJhY2tUYXJnZXRQaWNrZXJTdGF0ZSgnU2xlZXB5IFRWJywgJ0RldmljZUF2YWlsYWJsZScpOwot ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0sIDEwMCk7CiAgICAgICAgIH0pOwogICAg ICAgICB2aWRlby5jdXJyZW50VGltZSA9IHZpZGVvLmR1cmF0aW9uIC0gMTsKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYjdiMmEyMDllOTU3MGE0MWM0MTVj MTIzNjIyNDM4M2IzNmY2NjZhYi4uY2U1YmRiOWQzZWU5NjA5NTEwMjU0YTM1YjRlOTc0MzFjYWU4 ZmU4NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlv bnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTEx NTgsOSArMTE1OCw2IEBAIHdlYmtpdC5vcmcvYi8xNDE1MzQgWyBZb3NlbWl0ZSBdIG1lZGlhL3Zp ZGVvLWxvYWQtbmV0d29ya1N0YXRlLmh0bWwgWyBQYXNzIENyYXNoCiAjIFNlZSBhbHNvOiByZGFy Oi8vcHJvYmxlbS8yNzM1NjE0NAogd2Via2l0Lm9yZy9iLzE0MjcyNiBmYXN0L2ltYWdlcy9hbmlt YXRlZC1wbmcuaHRtbCBbIFNraXAgXQogCi0jIEZhaWxzIHdoZW4gYW4gYWN0dWFsIEFwcGxlVFYg aXMgbmVhcmJ5Lgotd2Via2l0Lm9yZy9iLzE0ODkxMiBbIEVsQ2FwaXRhbisgXSBtZWRpYS9jb250 cm9scy9haXJwbGF5LXBpY2tlci5odG1sIFsgUGFzcyBGYWlsdXJlIF0KLQogIyBPUyBYIDEwLjEw LjMrIGhhcyB0aGUgbmVjZXNzYXJ5IGdseXBocy4KIHdlYmtpdC5vcmcvYi8xNDI1NDggWyBZb3Nl bWl0ZSsgXSBlZGl0aW5nL3NlbGVjdGlvbi9leHRlbmQtYnktY2hhcmFjdGVyLTAwNy5odG1sIFsg UGFzcyBdCiAK