171715 2017-05-04 23:22:58 -0700 AX: Media Controls: Missing labels for the Time Labels. 2017-06-09 01:02:10 -0700 1 1 1 Unclassified WebKit Accessibility Safari 9 All All RESOLVED FIXED InRadar P2 Normal --- 1 aaron_chu aaron_chu aaron_chu cfleizach commit-queue graouts jcraig webkit-bug-importer oldest_to_newest 1305026 0 aaron_chu 2017-05-04 23:22:58 -0700 rdar://problem/32005192 1305027 1 webkit-bug-importer 2017-05-04 23:23:29 -0700 <rdar://problem/32009214> 1305684 2 309317 aaron_chu 2017-05-06 21:31:43 -0700 Created attachment 309317 Patch 1306157 3 309317 cfleizach 2017-05-08 17:07:37 -0700 Comment on attachment 309317 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=309317&action=review > Source/WebCore/ChangeLog:9 > + Added descriptive labels to elapsed nad remaining time labels in modern media controls. nad -> and > Source/WebCore/Modules/modern-media-controls/controls/time-label.js:37 > + this.element.setAttribute("aria-roledescription", timerDescription); is role-description appropriate here? I would have thought remaining/elapsed would be more appropriate as the labels 1306170 4 309317 aaron_chu 2017-05-08 17:30:10 -0700 Comment on attachment 309317 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=309317&action=review >> Source/WebCore/Modules/modern-media-controls/controls/time-label.js:37 >> + this.element.setAttribute("aria-roledescription", timerDescription); > > is role-description appropriate here? I would have thought remaining/elapsed would be more appropriate as the labels I think so, because the label would be the time itself, remaining/elapsed serve to describe the timer. 1306180 5 309450 aaron_chu 2017-05-08 18:00:03 -0700 Created attachment 309450 Patch 1306742 6 jcraig 2017-05-09 23:30:31 -0700 <rdar://problem/32005192> 1306748 7 309450 jcraig 2017-05-10 00:05:32 -0700 Comment on attachment 309450 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=309450&action=review > Source/WebCore/Modules/modern-media-controls/controls/time-label.js:37 > + this.element.setAttribute("aria-roledescription", timerDescription); Let's use aria-label rather than roledescription here. This seems like a solid attempt at reducing verbosity, but I believe it'd have some fallout. In a context where role description was unsupported (maybe Orca/Atk? or iTunes on Windows?), there would no way to distinguish the two timers. > Source/WebCore/Modules/modern-media-controls/controls/time-label.js:65 > + this.element.setAttribute("aria-label", formattedTime); I think this label would duplicate the contents, so you'd hear something like "0:23, 0:23" in some browser+screenreader combinations (timers should speak both their label and value) I believe the previous version used: <span role="timer" aria-label="Remaining">0:23</span> > LayoutTests/media/modern-media-controls/time-control/time-control.html:36 > +shouldBeEqualToString("timeControl.elapsedTimeLabel.element.getAttribute('aria-roledescription')", "Elapsed"); > +shouldBeEqualToString("timeControl.elapsedTimeLabel.element.getAttribute('role')", "timer"); > shouldBe("timeControl.children[1]", "timeControl.scrubber"); > shouldBe("timeControl.children[2]", "timeControl.remainingTimeLabel"); > +shouldBeEqualToString("timeControl.remainingTimeLabel.element.getAttribute('aria-roledescription')", "Remaining"); > +shouldBeEqualToString("timeControl.remainingTimeLabel.element.getAttribute('role')", "timer"); See if you can validate the accessible note properties here rather than the DOM attributes. 1316319 8 aaron_chu 2017-06-06 17:06:38 -0700 <rdar://problem/32537359 > 1316406 9 312166 aaron_chu 2017-06-07 01:14:35 -0700 Created attachment 312166 Patch 1316409 10 312166 graouts 2017-06-07 01:32:20 -0700 Comment on attachment 312166 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312166&action=review > Source/WebCore/Modules/modern-media-controls/controls/time-label.js:74 > + this.element.setAttribute("aria-label", `${ariaLabel}: ${timeAsString}`); You can use `const` for these two since they don't change. > LayoutTests/media/modern-media-controls/time-label/time-label.html:18 > +timeLabel.element.setAttribute("id", "elasped"); This is fine but you can shorten this to `timeLabel.element.id = "elapsed"`. > LayoutTests/media/modern-media-controls/time-label/time-label.html:27 > +remainingTimeLabel.element.setAttribute("id", "remaining"); Same here about using the "id" property directly. > LayoutTests/media/modern-media-controls/time-label/time-label.html:52 > + finishMediaControlsTest(); Please remove that extra white space. 1316732 11 312260 aaron_chu 2017-06-07 17:41:33 -0700 Created attachment 312260 Patch 1316901 12 312260 graouts 2017-06-08 06:58:52 -0700 Comment on attachment 312260 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312260&action=review > LayoutTests/media/modern-media-controls/time-label/time-label.html:51 > + Remove this extra white space when committing. 1316970 13 312319 aaron_chu 2017-06-08 10:42:46 -0700 Created attachment 312319 Patch 1317272 14 312319 commit-queue 2017-06-09 01:02:08 -0700 Comment on attachment 312319 Patch Clearing flags on attachment: 312319 Committed r217965: <http://trac.webkit.org/changeset/217965> 1317273 15 commit-queue 2017-06-09 01:02:10 -0700 All reviewed patches have been landed. Closing bug. 309317 2017-05-06 21:31:43 -0700 2017-05-08 18:00:01 -0700 Patch bug-171715-20170506213142.patch text/plain 8466 aaron_chu U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDY3ZDNlNTc0ZTVjOTc2 N2MwMThmNTEwYjI1NWQxNDdmNGJjOTU1Zi4uZmQyMTRmNGEyOTI1NmEyOTJkN2M4N2MyZTNiZTE1 MjY2MDA4ZWI3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTA1LTA2ICBBYXJv biBDaHUgIDxhYXJvbl9jaHVAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBNZWRpYSBDb250cm9s czogTWlzc2luZyBsYWJlbHMgZm9yIHRoZSBUaW1lIExhYmVscy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTcxNQorICAgICAgICA8cmRhcjovL3By b2JsZW0vMzIwMDkyMTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkZWQgZGVzY3JpcHRpdmUgbGFiZWxzIHRvIGVsYXBzZWQgbmFkIHJlbWFpbmlu ZyB0aW1lIGxhYmVscyBpbiBtb2Rlcm4gbWVkaWEgY29udHJvbHMuIAorCisgICAgICAgICogRW5n bGlzaC5scHJvai9tb2Rlcm4tbWVkaWEtY29udHJvbHMtbG9jYWxpemVkLXN0cmluZ3MuanM6Cisg ICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvdGltZS1jb250 cm9sLmpzOgorICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xz L3RpbWUtbGFiZWwuanM6CisgICAgICAgIChUaW1lTGFiZWwucHJvdG90eXBlLmNvbW1pdFByb3Bl cnR5KToKKwogMjAxNy0wNS0wMyAgWW9hdiBXZWlzcyAgPHlvYXZAeW9hdi53cz4KIAogICAgICAg ICBMaW5rIHByZWxvYWQgSFRNTFByZWxvYWRTY2FubmVyIHN1cHBvcnQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbW9kZXJuLW1lZGlhLWNvbnRyb2xzLWxvY2FsaXpl ZC1zdHJpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9tb2Rlcm4tbWVkaWEt Y29udHJvbHMtbG9jYWxpemVkLXN0cmluZ3MuanMKaW5kZXggMDNjODQ5MDc1Nzg0NmY3ZmE2NjM3 MTcxZDRkMWViY2I4ODFiNzk0Ny4uODVhNzYxYmNhZGQ5NDdiM2YwN2Q4ZTljYzQ3ZGI4NGFkOTll MDFkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9tb2Rlcm4tbWVk aWEtY29udHJvbHMtbG9jYWxpemVkLXN0cmluZ3MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvRW5n bGlzaC5scHJvai9tb2Rlcm4tbWVkaWEtY29udHJvbHMtbG9jYWxpemVkLXN0cmluZ3MuanMKQEAg LTMsOCArMyw5IEBAIGNvbnN0IFVJU3RyaW5ncyA9IHsKICAgICAiQXVkaW8iOiAiQXVkaW8iLAog ICAgICJFbnRlciBGdWxsIFNjcmVlbiI6ICJFbnRlciBGdWxsIFNjcmVlbiIsCiAgICAgIkVudGVy IFBpY3R1cmUgaW4gUGljdHVyZSI6ICJFbnRlciBQaWN0dXJlIGluIFBpY3R1cmUiLAotICAgICJF eGl0IEZ1bGwgU2NyZWVuIjogIkV4aXQgRnVsbCBTY3JlZW4iLAorICAgICJFbGFwc2VkIjogIkVs YXBzZWQiLAogICAgICJFcnJvciI6ICJFcnJvciIsCisgICAgIkV4aXQgRnVsbCBTY3JlZW4iOiAi RXhpdCBGdWxsIFNjcmVlbiIsCiAgICAgIkZvcndhcmQiOiAiRm9yd2FyZCIsCiAgICAgIkhvdXIi OiAiSG91ciIsCiAgICAgIkhvdXJzIjogIkhvdXJzIiwKQEAgLTE5LDYgKzIwLDcgQEAgY29uc3Qg VUlTdHJpbmdzID0gewogICAgICJQYXVzZSI6ICJQYXVzZSIsCiAgICAgIlBpY3R1cmUgaW4gUGlj dHVyZSI6ICJQaWN0dXJlIGluIFBpY3R1cmUiLAogICAgICJQbGF5IjogIlBsYXkiLAorICAgICJS ZW1haW5pbmciOiAiUmVtYWluaW5nIiwKICAgICAiUmV3aW5kIjogIlJld2luZCIsCiAgICAgIlNj YWxlIHRvIEZpbGwiOiAiU2NhbGUgdG8gRmlsbCIsCiAgICAgIlNjYWxlIHRvIEZpdCI6ICJTY2Fs ZSB0byBGaXQiLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVk aWEtY29udHJvbHMvY29udHJvbHMvdGltZS1jb250cm9sLmpzIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvdGltZS1jb250cm9sLmpzCmluZGV4 IGQ1YzJmYmMxNDA4OGNiMjQ4MWVjOGM2OTg1YmRiYzUyMWQ1OTg5YTUuLmZiZTdkOWIxZTRiNmRh MzE4ZjM1MjM5ZDdkODExZTQyZTFhYWVjODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3RpbWUtY29udHJvbC5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy90 aW1lLWNvbnRyb2wuanMKQEAgLTQzLDkgKzQzLDkgQEAgY2xhc3MgVGltZUNvbnRyb2wgZXh0ZW5k cyBMYXlvdXRJdGVtCiAKICAgICAgICAgdGhpcy5fdXNlU2l4RGlnaXRzRm9yVGltZUxhYmVscyA9 IGZhbHNlOwogCi0gICAgICAgIHRoaXMuZWxhcHNlZFRpbWVMYWJlbCA9IG5ldyBUaW1lTGFiZWwo dGhpcyk7CisgICAgICAgIHRoaXMuZWxhcHNlZFRpbWVMYWJlbCA9IG5ldyBUaW1lTGFiZWwodGhp cywgVUlTdHJpbmcoIkVsYXBzZWQiKSk7CiAgICAgICAgIHRoaXMuc2NydWJiZXIgPSBuZXcgU2Ny dWJiZXIobGF5b3V0RGVsZWdhdGUpOwotICAgICAgICB0aGlzLnJlbWFpbmluZ1RpbWVMYWJlbCA9 IG5ldyBUaW1lTGFiZWwodGhpcyk7CisgICAgICAgIHRoaXMucmVtYWluaW5nVGltZUxhYmVsID0g bmV3IFRpbWVMYWJlbCh0aGlzLCBVSVN0cmluZygiUmVtYWluaW5nIikpOwogCiAgICAgICAgIHRo aXMuY2hpbGRyZW4gPSBbdGhpcy5lbGFwc2VkVGltZUxhYmVsLCB0aGlzLnNjcnViYmVyLCB0aGlz LnJlbWFpbmluZ1RpbWVMYWJlbF07CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvdGltZS1sYWJlbC5qcyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3RpbWUt bGFiZWwuanMKaW5kZXggYmZjZmE1NjRlZmYxY2EyYjA2MjNkYzBkOWZkZjkyOTY1YmM1OTQ2OS4u MzFmYzRiMmE5YTUxNTQ4OGJlZjkwNDE1M2NjNGJlNGZlYWVkZjU2MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvdGltZS1s YWJlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9s cy9jb250cm9scy90aW1lLWxhYmVsLmpzCkBAIC0yNiwxMiArMjYsMTUgQEAKIGNsYXNzIFRpbWVM YWJlbCBleHRlbmRzIExheW91dE5vZGUKIHsKIAotICAgIGNvbnN0cnVjdG9yKHRpbWVDb250cm9s KQorICAgIGNvbnN0cnVjdG9yKHRpbWVDb250cm9sLCB0aW1lckRlc2NyaXB0aW9uKQogICAgIHsK LSAgICAgICAgc3VwZXIoYDxkaXYgY2xhc3M9InRpbWUtbGFiZWwiPjwvZGl2PmApOworICAgICAg ICBzdXBlcihgPGRpdiByb2xlPSJ0aW1lciIgY2xhc3M9InRpbWUtbGFiZWwiPjwvZGl2PmApOwog CiAgICAgICAgIHRoaXMudmFsdWUgPSAwOwogICAgICAgICB0aGlzLl90aW1lQ29udHJvbCA9IHRp bWVDb250cm9sOworCisgICAgICAgIGlmICh0aW1lckRlc2NyaXB0aW9uKQorICAgICAgICAgICAg dGhpcy5lbGVtZW50LnNldEF0dHJpYnV0ZSgiYXJpYS1yb2xlZGVzY3JpcHRpb24iLCB0aW1lckRl c2NyaXB0aW9uKTsgCiAgICAgfQogCiAgICAgLy8gUHVibGljCkBAIC01NSw5ICs1OCwxMyBAQCBj bGFzcyBUaW1lTGFiZWwgZXh0ZW5kcyBMYXlvdXROb2RlCiAgICAgY29tbWl0UHJvcGVydHkocHJv cGVydHlOYW1lKQogICAgIHsKICAgICAgICAgaWYgKHByb3BlcnR5TmFtZSA9PT0gInZhbHVlIikg ewotICAgICAgICAgICAgdGhpcy5lbGVtZW50LnRleHRDb250ZW50ID0gdGhpcy5fZm9ybWF0dGVk VGltZSgpOwotICAgICAgICAgICAgaWYgKHRoaXMuX3RpbWVDb250cm9sKQorICAgICAgICAgICAg bGV0IGZvcm1hdHRlZFRpbWUgPSB0aGlzLl9mb3JtYXR0ZWRUaW1lKCk7CisgICAgICAgICAgICB0 aGlzLmVsZW1lbnQudGV4dENvbnRlbnQgPSBmb3JtYXR0ZWRUaW1lOworICAgICAgICAgICAgaWYg KHRoaXMuX3RpbWVDb250cm9sKSB7CiAgICAgICAgICAgICAgICAgdGhpcy5fdGltZUNvbnRyb2wu dXBkYXRlU2NydWJiZXJMYWJlbCgpOworICAgICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5zZXRB dHRyaWJ1dGUoImFyaWEtbGFiZWwiLCBmb3JtYXR0ZWRUaW1lKTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICAKICAgICAgICAgfQogICAgICAgICBlbHNlCiAgICAgICAgICAgICBzdXBl ci5jb21taXRQcm9wZXJ0eShwcm9wZXJ0eU5hbWUpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDkzYmU3ZWM2ZDJiZmU3MzQ5 ZmIyNmEzYmMyZGJjMjY0YjlmODdiNTMuLjk4OTU5YWIxYmFlM2RmZjc1MmRjNzJmNWFmZWU5MTk1 NmFkODhjOWYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxNy0wNS0wNiAgQWFyb24gQ2h1ICA8 YWFyb25fY2h1QGFwcGxlLmNvbT4KKworICAgICAgICBBWDogTWVkaWEgQ29udHJvbHM6IE1pc3Np bmcgbGFiZWxzIGZvciB0aGUgVGltZSBMYWJlbHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzE3MTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMy MDA5MjE0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFVwZGF0ZWQgdGltZS1jb250cm9sIHRlc3QgdG8gdGVzdCBmb3IgZGVzY3JpcHRpdmUgbGFiZWxz IGZvciBlbGFwc2VkIGFuZCByZW1haW5pbmcgdGltZSBsYWJlbHMuCisKKyAgICAgICAgKiBtZWRp YS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdGltZS1jb250cm9sL3RpbWUtY29udHJvbC1leHBlY3Rl ZC50eHQ6CisgICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RpbWUtY29udHJv bC90aW1lLWNvbnRyb2wuaHRtbDoKKwogMjAxNy0wNS0wMyAgWW9hdiBXZWlzcyAgPHlvYXZAeW9h di53cz4KIAogICAgICAgICBMaW5rIHByZWxvYWQgSFRNTFByZWxvYWRTY2FubmVyIHN1cHBvcnQK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90aW1l LWNvbnRyb2wvdGltZS1jb250cm9sLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlhL21v ZGVybi1tZWRpYS1jb250cm9scy90aW1lLWNvbnRyb2wvdGltZS1jb250cm9sLWV4cGVjdGVkLnR4 dAppbmRleCA3MjJmZTJkYzFjY2VkMTE4MTYwOTMzZDRkODZmOWI3MDU3YTZhOGZkLi41OWI0YzNl YjYxMTBkN2NhOGRkOWE4NzYxZDAyYzUxY2JlZGE2ZTNmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdGltZS1jb250cm9sL3RpbWUtY29udHJvbC1l eHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L3RpbWUtY29udHJvbC90aW1lLWNvbnRyb2wtZXhwZWN0ZWQudHh0CkBAIC0xMiw4ICsxMiwxMiBA QCBQQVNTIHRpbWVDb250cm9sLnJlbWFpbmluZ1RpbWVMYWJlbCBpbnN0YW5jZW9mIFRpbWVMYWJl bCBpcyB0cnVlCiAKIFBBU1MgdGltZUNvbnRyb2wuY2hpbGRyZW4ubGVuZ3RoIGlzIDMKIFBBU1Mg dGltZUNvbnRyb2wuY2hpbGRyZW5bMF0gaXMgdGltZUNvbnRyb2wuZWxhcHNlZFRpbWVMYWJlbAor UEFTUyB0aW1lQ29udHJvbC5lbGFwc2VkVGltZUxhYmVsLmVsZW1lbnQuZ2V0QXR0cmlidXRlKCdh cmlhLXJvbGVkZXNjcmlwdGlvbicpIGlzICJFbGFwc2VkIgorUEFTUyB0aW1lQ29udHJvbC5lbGFw c2VkVGltZUxhYmVsLmVsZW1lbnQuZ2V0QXR0cmlidXRlKCdyb2xlJykgaXMgInRpbWVyIgogUEFT UyB0aW1lQ29udHJvbC5jaGlsZHJlblsxXSBpcyB0aW1lQ29udHJvbC5zY3J1YmJlcgogUEFTUyB0 aW1lQ29udHJvbC5jaGlsZHJlblsyXSBpcyB0aW1lQ29udHJvbC5yZW1haW5pbmdUaW1lTGFiZWwK K1BBU1MgdGltZUNvbnRyb2wucmVtYWluaW5nVGltZUxhYmVsLmVsZW1lbnQuZ2V0QXR0cmlidXRl KCdhcmlhLXJvbGVkZXNjcmlwdGlvbicpIGlzICJSZW1haW5pbmciCitQQVNTIHRpbWVDb250cm9s LnJlbWFpbmluZ1RpbWVMYWJlbC5lbGVtZW50LmdldEF0dHJpYnV0ZSgncm9sZScpIGlzICJ0aW1l ciIKIAogdGltZUNvbnRyb2wud2lkdGggPSA1MDA7CiBQQVNTIHRpbWVDb250cm9sLmVsYXBzZWRU aW1lTGFiZWwueCBpcyAtMgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL3RpbWUtY29udHJvbC90aW1lLWNvbnRyb2wuaHRtbCBiL0xheW91dFRlc3Rz L21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90aW1lLWNvbnRyb2wvdGltZS1jb250cm9sLmh0 bWwKaW5kZXggNDBhMjk0YTQ5OGI2ZDNmM2Q1YzQ4YmEwZDNmNDk0MmUxYzI0ZWU2Ny4uOGFkOTE4 ZDc1ZjY3NzgxYmUzNDI4ODlhMDQxYWQyMTQ0N2UyYTdhZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RpbWUtY29udHJvbC90aW1lLWNvbnRyb2wu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdGltZS1j b250cm9sL3RpbWUtY29udHJvbC5odG1sCkBAIC05LDYgKzksNyBAQAogPHNjcmlwdCBzcmM9Ii4u Ly4uLy4uLy4uL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2Nv bnRyb2xzL3NjcnViYmVyLmpzIiB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPjwvc2NyaXB0PgogPHNj cmlwdCBzcmM9Ii4uLy4uLy4uLy4uL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL2NvbnRyb2xzL3RpbWUtbGFiZWwuanMiIHR5cGU9InRleHQvamF2YXNjcmlwdCI+ PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vLi4vU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvdGltZS1jb250cm9sLmpzIiB0eXBlPSJ0 ZXh0L2phdmFzY3JpcHQiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uLy4uL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21haW4uanMiIHR5cGU9InRl eHQvamF2YXNjcmlwdCI+PC9zY3JpcHQ+CiA8Ym9keT4KIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZh c2NyaXB0Ij4KIApAQCAtMjcsOCArMjgsMTIgQEAgc2hvdWxkQmVUcnVlKCJ0aW1lQ29udHJvbC5y ZW1haW5pbmdUaW1lTGFiZWwgaW5zdGFuY2VvZiBUaW1lTGFiZWwiKTsKIGRlYnVnKCIiKTsKIHNo b3VsZEJlKCJ0aW1lQ29udHJvbC5jaGlsZHJlbi5sZW5ndGgiLCAiMyIpOwogc2hvdWxkQmUoInRp bWVDb250cm9sLmNoaWxkcmVuWzBdIiwgInRpbWVDb250cm9sLmVsYXBzZWRUaW1lTGFiZWwiKTsK K3Nob3VsZEJlRXF1YWxUb1N0cmluZygidGltZUNvbnRyb2wuZWxhcHNlZFRpbWVMYWJlbC5lbGVt ZW50LmdldEF0dHJpYnV0ZSgnYXJpYS1yb2xlZGVzY3JpcHRpb24nKSIsICJFbGFwc2VkIik7Citz aG91bGRCZUVxdWFsVG9TdHJpbmcoInRpbWVDb250cm9sLmVsYXBzZWRUaW1lTGFiZWwuZWxlbWVu dC5nZXRBdHRyaWJ1dGUoJ3JvbGUnKSIsICJ0aW1lciIpOwogc2hvdWxkQmUoInRpbWVDb250cm9s LmNoaWxkcmVuWzFdIiwgInRpbWVDb250cm9sLnNjcnViYmVyIik7CiBzaG91bGRCZSgidGltZUNv bnRyb2wuY2hpbGRyZW5bMl0iLCAidGltZUNvbnRyb2wucmVtYWluaW5nVGltZUxhYmVsIik7Citz aG91bGRCZUVxdWFsVG9TdHJpbmcoInRpbWVDb250cm9sLnJlbWFpbmluZ1RpbWVMYWJlbC5lbGVt ZW50LmdldEF0dHJpYnV0ZSgnYXJpYS1yb2xlZGVzY3JpcHRpb24nKSIsICJSZW1haW5pbmciKTsK K3Nob3VsZEJlRXF1YWxUb1N0cmluZygidGltZUNvbnRyb2wucmVtYWluaW5nVGltZUxhYmVsLmVs ZW1lbnQuZ2V0QXR0cmlidXRlKCdyb2xlJykiLCAidGltZXIiKTsKIAogZGVidWcoIiIpOwogZGVi dWcoInRpbWVDb250cm9sLndpZHRoID0gNTAwOyIpOwpAQCAtNDQsNiArNDksMTAgQEAgZGVidWco InRpbWVDb250cm9sLndpZHRoID0gMjYxOyIpOwogdGltZUNvbnRyb2wud2lkdGggPSAyNjE7CiBz aG91bGRCZUZhbHNlKCJ0aW1lQ29udHJvbC5pc1N1ZmZpY2llbnRseVdpZGUiKTsKIAorCit0aW1l Q29udHJvbC5lbGFwc2VkVGltZUxhYmVsLmVsZW1lbnQuaWQgPSAidGVzdC1lbGFzcGVkIjsKK3Rp bWVDb250cm9sLnJlbWFpbmluZ1RpbWVMYWJlbC5lbGVtZW50LmlkID0gInRlc3QtcmVtYWluaW5n IjsKKwogZGVidWcoIiIpOwogCiA8L3NjcmlwdD4K 309450 2017-05-08 18:00:03 -0700 2017-06-07 01:14:33 -0700 Patch bug-171715-20170508180002.patch text/plain 8465 aaron_chu U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDY3ZDNlNTc0ZTVjOTc2 N2MwMThmNTEwYjI1NWQxNDdmNGJjOTU1Zi4uN2RjNjE4ZWYxOGY4Y2Q4MzViYzJjZTRhMWRlNTcx MWI1OGE2MDAwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTA1LTA4ICBBYXJv biBDaHUgIDxhYXJvbl9jaHVAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBNZWRpYSBDb250cm9s czogTWlzc2luZyBsYWJlbHMgZm9yIHRoZSBUaW1lIExhYmVscy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTcxNQorICAgICAgICA8cmRhcjovL3By b2JsZW0vMzIwMDkyMTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkZWQgZGVzY3JpcHRpdmUgbGFiZWxzIHRvIGVsYXBzZWQgYW5kIHJlbWFpbmlu ZyB0aW1lIGxhYmVscyBpbiBtb2Rlcm4gbWVkaWEgY29udHJvbHMuCisKKyAgICAgICAgKiBFbmds aXNoLmxwcm9qL21vZGVybi1tZWRpYS1jb250cm9scy1sb2NhbGl6ZWQtc3RyaW5ncy5qczoKKyAg ICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy90aW1lLWNvbnRy b2wuanM6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMv dGltZS1sYWJlbC5qczoKKyAgICAgICAgKFRpbWVMYWJlbC5wcm90b3R5cGUuY29tbWl0UHJvcGVy dHkpOgorCiAyMDE3LTA1LTAzICBZb2F2IFdlaXNzICA8eW9hdkB5b2F2LndzPgogCiAgICAgICAg IExpbmsgcHJlbG9hZCBIVE1MUHJlbG9hZFNjYW5uZXIgc3VwcG9ydApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9tb2Rlcm4tbWVkaWEtY29udHJvbHMtbG9jYWxpemVk LXN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL21vZGVybi1tZWRpYS1j b250cm9scy1sb2NhbGl6ZWQtc3RyaW5ncy5qcwppbmRleCAwM2M4NDkwNzU3ODQ2ZjdmYTY2Mzcx NzFkNGQxZWJjYjg4MWI3OTQ3Li44NWE3NjFiY2FkZDk0N2IzZjA3ZDhlOWNjNDdkYjg0YWQ5OWUw MWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL21vZGVybi1tZWRp YS1jb250cm9scy1sb2NhbGl6ZWQtc3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Fbmds aXNoLmxwcm9qL21vZGVybi1tZWRpYS1jb250cm9scy1sb2NhbGl6ZWQtc3RyaW5ncy5qcwpAQCAt Myw4ICszLDkgQEAgY29uc3QgVUlTdHJpbmdzID0gewogICAgICJBdWRpbyI6ICJBdWRpbyIsCiAg ICAgIkVudGVyIEZ1bGwgU2NyZWVuIjogIkVudGVyIEZ1bGwgU2NyZWVuIiwKICAgICAiRW50ZXIg UGljdHVyZSBpbiBQaWN0dXJlIjogIkVudGVyIFBpY3R1cmUgaW4gUGljdHVyZSIsCi0gICAgIkV4 aXQgRnVsbCBTY3JlZW4iOiAiRXhpdCBGdWxsIFNjcmVlbiIsCisgICAgIkVsYXBzZWQiOiAiRWxh cHNlZCIsCiAgICAgIkVycm9yIjogIkVycm9yIiwKKyAgICAiRXhpdCBGdWxsIFNjcmVlbiI6ICJF eGl0IEZ1bGwgU2NyZWVuIiwKICAgICAiRm9yd2FyZCI6ICJGb3J3YXJkIiwKICAgICAiSG91ciI6 ICJIb3VyIiwKICAgICAiSG91cnMiOiAiSG91cnMiLApAQCAtMTksNiArMjAsNyBAQCBjb25zdCBV SVN0cmluZ3MgPSB7CiAgICAgIlBhdXNlIjogIlBhdXNlIiwKICAgICAiUGljdHVyZSBpbiBQaWN0 dXJlIjogIlBpY3R1cmUgaW4gUGljdHVyZSIsCiAgICAgIlBsYXkiOiAiUGxheSIsCisgICAgIlJl bWFpbmluZyI6ICJSZW1haW5pbmciLAogICAgICJSZXdpbmQiOiAiUmV3aW5kIiwKICAgICAiU2Nh bGUgdG8gRmlsbCI6ICJTY2FsZSB0byBGaWxsIiwKICAgICAiU2NhbGUgdG8gRml0IjogIlNjYWxl IHRvIEZpdCIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRp YS1jb250cm9scy9jb250cm9scy90aW1lLWNvbnRyb2wuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy90aW1lLWNvbnRyb2wuanMKaW5kZXgg ZDVjMmZiYzE0MDg4Y2IyNDgxZWM4YzY5ODViZGJjNTIxZDU5ODlhNS4uZmJlN2Q5YjFlNGI2ZGEz MThmMzUyMzlkN2Q4MTFlNDJlMWFhZWM4MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvdGltZS1jb250cm9sLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3Rp bWUtY29udHJvbC5qcwpAQCAtNDMsOSArNDMsOSBAQCBjbGFzcyBUaW1lQ29udHJvbCBleHRlbmRz IExheW91dEl0ZW0KIAogICAgICAgICB0aGlzLl91c2VTaXhEaWdpdHNGb3JUaW1lTGFiZWxzID0g ZmFsc2U7CiAKLSAgICAgICAgdGhpcy5lbGFwc2VkVGltZUxhYmVsID0gbmV3IFRpbWVMYWJlbCh0 aGlzKTsKKyAgICAgICAgdGhpcy5lbGFwc2VkVGltZUxhYmVsID0gbmV3IFRpbWVMYWJlbCh0aGlz LCBVSVN0cmluZygiRWxhcHNlZCIpKTsKICAgICAgICAgdGhpcy5zY3J1YmJlciA9IG5ldyBTY3J1 YmJlcihsYXlvdXREZWxlZ2F0ZSk7Ci0gICAgICAgIHRoaXMucmVtYWluaW5nVGltZUxhYmVsID0g bmV3IFRpbWVMYWJlbCh0aGlzKTsKKyAgICAgICAgdGhpcy5yZW1haW5pbmdUaW1lTGFiZWwgPSBu ZXcgVGltZUxhYmVsKHRoaXMsIFVJU3RyaW5nKCJSZW1haW5pbmciKSk7CiAKICAgICAgICAgdGhp cy5jaGlsZHJlbiA9IFt0aGlzLmVsYXBzZWRUaW1lTGFiZWwsIHRoaXMuc2NydWJiZXIsIHRoaXMu cmVtYWluaW5nVGltZUxhYmVsXTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy90aW1lLWxhYmVsLmpzIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvdGltZS1s YWJlbC5qcwppbmRleCBiZmNmYTU2NGVmZjFjYTJiMDYyM2RjMGQ5ZmRmOTI5NjViYzU5NDY5Li4z MWZjNGIyYTlhNTE1NDg4YmVmOTA0MTUzY2M0YmU0ZmVhZWRmNTYwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy90aW1lLWxh YmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L2NvbnRyb2xzL3RpbWUtbGFiZWwuanMKQEAgLTI2LDEyICsyNiwxNSBAQAogY2xhc3MgVGltZUxh YmVsIGV4dGVuZHMgTGF5b3V0Tm9kZQogewogCi0gICAgY29uc3RydWN0b3IodGltZUNvbnRyb2wp CisgICAgY29uc3RydWN0b3IodGltZUNvbnRyb2wsIHRpbWVyRGVzY3JpcHRpb24pCiAgICAgewot ICAgICAgICBzdXBlcihgPGRpdiBjbGFzcz0idGltZS1sYWJlbCI+PC9kaXY+YCk7CisgICAgICAg IHN1cGVyKGA8ZGl2IHJvbGU9InRpbWVyIiBjbGFzcz0idGltZS1sYWJlbCI+PC9kaXY+YCk7CiAK ICAgICAgICAgdGhpcy52YWx1ZSA9IDA7CiAgICAgICAgIHRoaXMuX3RpbWVDb250cm9sID0gdGlt ZUNvbnRyb2w7CisKKyAgICAgICAgaWYgKHRpbWVyRGVzY3JpcHRpb24pCisgICAgICAgICAgICB0 aGlzLmVsZW1lbnQuc2V0QXR0cmlidXRlKCJhcmlhLXJvbGVkZXNjcmlwdGlvbiIsIHRpbWVyRGVz Y3JpcHRpb24pOyAKICAgICB9CiAKICAgICAvLyBQdWJsaWMKQEAgLTU1LDkgKzU4LDEzIEBAIGNs YXNzIFRpbWVMYWJlbCBleHRlbmRzIExheW91dE5vZGUKICAgICBjb21taXRQcm9wZXJ0eShwcm9w ZXJ0eU5hbWUpCiAgICAgewogICAgICAgICBpZiAocHJvcGVydHlOYW1lID09PSAidmFsdWUiKSB7 Ci0gICAgICAgICAgICB0aGlzLmVsZW1lbnQudGV4dENvbnRlbnQgPSB0aGlzLl9mb3JtYXR0ZWRU aW1lKCk7Ci0gICAgICAgICAgICBpZiAodGhpcy5fdGltZUNvbnRyb2wpCisgICAgICAgICAgICBs ZXQgZm9ybWF0dGVkVGltZSA9IHRoaXMuX2Zvcm1hdHRlZFRpbWUoKTsKKyAgICAgICAgICAgIHRo aXMuZWxlbWVudC50ZXh0Q29udGVudCA9IGZvcm1hdHRlZFRpbWU7CisgICAgICAgICAgICBpZiAo dGhpcy5fdGltZUNvbnRyb2wpIHsKICAgICAgICAgICAgICAgICB0aGlzLl90aW1lQ29udHJvbC51 cGRhdGVTY3J1YmJlckxhYmVsKCk7CisgICAgICAgICAgICAgICAgdGhpcy5lbGVtZW50LnNldEF0 dHJpYnV0ZSgiYXJpYS1sYWJlbCIsIGZvcm1hdHRlZFRpbWUpOworICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgIAogICAgICAgICB9CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHN1cGVy LmNvbW1pdFByb3BlcnR5KHByb3BlcnR5TmFtZSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOTNiZTdlYzZkMmJmZTczNDlm YjI2YTNiYzJkYmMyNjRiOWY4N2I1My4uNWNhZDc2MzlkMTIyMWZjYmRkYzAwYmNiOGU3Yzc4ZDBl YjNhYWY3NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTA1LTA4ICBBYXJvbiBDaHUgIDxh YXJvbl9jaHVAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBNZWRpYSBDb250cm9sczogTWlzc2lu ZyBsYWJlbHMgZm9yIHRoZSBUaW1lIExhYmVscy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTcxNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzIw MDkyMTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VXBkYXRlZCB0aW1lLWNvbnRyb2wgdGVzdCB0byB0ZXN0IGZvciBkZXNjcmlwdGl2ZSBsYWJlbHMg Zm9yIGVsYXBzZWQgYW5kIHJlbWFpbmluZyB0aW1lIGxhYmVscy4KKworICAgICAgICAqIG1lZGlh L21vZGVybi1tZWRpYS1jb250cm9scy90aW1lLWNvbnRyb2wvdGltZS1jb250cm9sLWV4cGVjdGVk LnR4dDoKKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdGltZS1jb250cm9s L3RpbWUtY29udHJvbC5odG1sOgorCiAyMDE3LTA1LTAzICBZb2F2IFdlaXNzICA8eW9hdkB5b2F2 LndzPgogCiAgICAgICAgIExpbmsgcHJlbG9hZCBIVE1MUHJlbG9hZFNjYW5uZXIgc3VwcG9ydApk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RpbWUt Y29udHJvbC90aW1lLWNvbnRyb2wtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL3RpbWUtY29udHJvbC90aW1lLWNvbnRyb2wtZXhwZWN0ZWQudHh0 CmluZGV4IDcyMmZlMmRjMWNjZWQxMTgxNjA5MzNkNGQ4NmY5YjcwNTdhNmE4ZmQuLjU5YjRjM2Vi NjExMGQ3Y2E4ZGQ5YTg3NjFkMDJjNTFjYmVkYTZlM2YgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90aW1lLWNvbnRyb2wvdGltZS1jb250cm9sLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMv dGltZS1jb250cm9sL3RpbWUtY29udHJvbC1leHBlY3RlZC50eHQKQEAgLTEyLDggKzEyLDEyIEBA IFBBU1MgdGltZUNvbnRyb2wucmVtYWluaW5nVGltZUxhYmVsIGluc3RhbmNlb2YgVGltZUxhYmVs IGlzIHRydWUKIAogUEFTUyB0aW1lQ29udHJvbC5jaGlsZHJlbi5sZW5ndGggaXMgMwogUEFTUyB0 aW1lQ29udHJvbC5jaGlsZHJlblswXSBpcyB0aW1lQ29udHJvbC5lbGFwc2VkVGltZUxhYmVsCitQ QVNTIHRpbWVDb250cm9sLmVsYXBzZWRUaW1lTGFiZWwuZWxlbWVudC5nZXRBdHRyaWJ1dGUoJ2Fy aWEtcm9sZWRlc2NyaXB0aW9uJykgaXMgIkVsYXBzZWQiCitQQVNTIHRpbWVDb250cm9sLmVsYXBz ZWRUaW1lTGFiZWwuZWxlbWVudC5nZXRBdHRyaWJ1dGUoJ3JvbGUnKSBpcyAidGltZXIiCiBQQVNT IHRpbWVDb250cm9sLmNoaWxkcmVuWzFdIGlzIHRpbWVDb250cm9sLnNjcnViYmVyCiBQQVNTIHRp bWVDb250cm9sLmNoaWxkcmVuWzJdIGlzIHRpbWVDb250cm9sLnJlbWFpbmluZ1RpbWVMYWJlbAor UEFTUyB0aW1lQ29udHJvbC5yZW1haW5pbmdUaW1lTGFiZWwuZWxlbWVudC5nZXRBdHRyaWJ1dGUo J2FyaWEtcm9sZWRlc2NyaXB0aW9uJykgaXMgIlJlbWFpbmluZyIKK1BBU1MgdGltZUNvbnRyb2wu cmVtYWluaW5nVGltZUxhYmVsLmVsZW1lbnQuZ2V0QXR0cmlidXRlKCdyb2xlJykgaXMgInRpbWVy IgogCiB0aW1lQ29udHJvbC53aWR0aCA9IDUwMDsKIFBBU1MgdGltZUNvbnRyb2wuZWxhcHNlZFRp bWVMYWJlbC54IGlzIC0yCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVk aWEtY29udHJvbHMvdGltZS1jb250cm9sL3RpbWUtY29udHJvbC5odG1sIGIvTGF5b3V0VGVzdHMv bWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RpbWUtY29udHJvbC90aW1lLWNvbnRyb2wuaHRt bAppbmRleCA0MGEyOTRhNDk4YjZkM2YzZDVjNDhiYTBkM2Y0OTQyZTFjMjRlZTY3Li44YWQ5MThk NzVmNjc3ODFiZTM0Mjg4OWEwNDFhZDIxNDQ3ZTJhN2FmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdGltZS1jb250cm9sL3RpbWUtY29udHJvbC5o dG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90aW1lLWNv bnRyb2wvdGltZS1jb250cm9sLmh0bWwKQEAgLTksNiArOSw3IEBACiA8c2NyaXB0IHNyYz0iLi4v Li4vLi4vLi4vU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29u dHJvbHMvc2NydWJiZXIuanMiIHR5cGU9InRleHQvamF2YXNjcmlwdCI+PC9zY3JpcHQ+CiA8c2Ny aXB0IHNyYz0iLi4vLi4vLi4vLi4vU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvY29udHJvbHMvdGltZS1sYWJlbC5qcyIgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij48 L3NjcmlwdD4KIDxzY3JpcHQgc3JjPSIuLi8uLi8uLi8uLi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy90aW1lLWNvbnRyb2wuanMiIHR5cGU9InRl eHQvamF2YXNjcmlwdCI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vLi4vU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWFpbi5qcyIgdHlwZT0idGV4 dC9qYXZhc2NyaXB0Ij48L3NjcmlwdD4KIDxib2R5PgogPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFz Y3JpcHQiPgogCkBAIC0yNyw4ICsyOCwxMiBAQCBzaG91bGRCZVRydWUoInRpbWVDb250cm9sLnJl bWFpbmluZ1RpbWVMYWJlbCBpbnN0YW5jZW9mIFRpbWVMYWJlbCIpOwogZGVidWcoIiIpOwogc2hv dWxkQmUoInRpbWVDb250cm9sLmNoaWxkcmVuLmxlbmd0aCIsICIzIik7CiBzaG91bGRCZSgidGlt ZUNvbnRyb2wuY2hpbGRyZW5bMF0iLCAidGltZUNvbnRyb2wuZWxhcHNlZFRpbWVMYWJlbCIpOwor c2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJ0aW1lQ29udHJvbC5lbGFwc2VkVGltZUxhYmVsLmVsZW1l bnQuZ2V0QXR0cmlidXRlKCdhcmlhLXJvbGVkZXNjcmlwdGlvbicpIiwgIkVsYXBzZWQiKTsKK3No b3VsZEJlRXF1YWxUb1N0cmluZygidGltZUNvbnRyb2wuZWxhcHNlZFRpbWVMYWJlbC5lbGVtZW50 LmdldEF0dHJpYnV0ZSgncm9sZScpIiwgInRpbWVyIik7CiBzaG91bGRCZSgidGltZUNvbnRyb2wu Y2hpbGRyZW5bMV0iLCAidGltZUNvbnRyb2wuc2NydWJiZXIiKTsKIHNob3VsZEJlKCJ0aW1lQ29u dHJvbC5jaGlsZHJlblsyXSIsICJ0aW1lQ29udHJvbC5yZW1haW5pbmdUaW1lTGFiZWwiKTsKK3No b3VsZEJlRXF1YWxUb1N0cmluZygidGltZUNvbnRyb2wucmVtYWluaW5nVGltZUxhYmVsLmVsZW1l bnQuZ2V0QXR0cmlidXRlKCdhcmlhLXJvbGVkZXNjcmlwdGlvbicpIiwgIlJlbWFpbmluZyIpOwor c2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJ0aW1lQ29udHJvbC5yZW1haW5pbmdUaW1lTGFiZWwuZWxl bWVudC5nZXRBdHRyaWJ1dGUoJ3JvbGUnKSIsICJ0aW1lciIpOwogCiBkZWJ1ZygiIik7CiBkZWJ1 ZygidGltZUNvbnRyb2wud2lkdGggPSA1MDA7Iik7CkBAIC00NCw2ICs0OSwxMCBAQCBkZWJ1Zygi dGltZUNvbnRyb2wud2lkdGggPSAyNjE7Iik7CiB0aW1lQ29udHJvbC53aWR0aCA9IDI2MTsKIHNo b3VsZEJlRmFsc2UoInRpbWVDb250cm9sLmlzU3VmZmljaWVudGx5V2lkZSIpOwogCisKK3RpbWVD b250cm9sLmVsYXBzZWRUaW1lTGFiZWwuZWxlbWVudC5pZCA9ICJ0ZXN0LWVsYXNwZWQiOwordGlt ZUNvbnRyb2wucmVtYWluaW5nVGltZUxhYmVsLmVsZW1lbnQuaWQgPSAidGVzdC1yZW1haW5pbmci OworCiBkZWJ1ZygiIik7CiAKIDwvc2NyaXB0Pgo= 312166 2017-06-07 01:14:35 -0700 2017-06-07 17:41:32 -0700 Patch bug-171715-20170607011527.patch text/plain 6833 aaron_chu U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc0M2E3MTk2NDgwZjhj ZmFmNGZjZTVlYmE2MDY5YTViOTQ2MjdlOC4uZjM0Mjk5ZTI5NWRkZGYwMzczMDgzMjQ1MzVkMWVh ZTNkZjlmMzRjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA2LTA3ICBBYXJv biBDaHUgIDxhYXJvbl9jaHVAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBNZWRpYSBDb250cm9s czogTWlzc2luZyBsYWJlbHMgZm9yIHRoZSBUaW1lIExhYmVscy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTcxNQorICAgICAgICA8cmRhcjovL3By b2JsZW0vMzIwMDkyMTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkZWQgYXJpYS1sYWJlbCB0byBkZXNjcmliZSB0aW1lIGxhYmVscyBpbiBtZWRp YSBjb250cm9scy4KKworICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2Nv bnRyb2xzL3NsaWRlci5qczoKKyAgICAgICAgKFNsaWRlci5wcm90b3R5cGUuc2V0IGlucHV0QWNj ZXNzaWJsZUxhYmVsKToKKyAgICAgICAgKFNsaWRlci5wcm90b3R5cGUuX2Zvcm1hdFRpbWUpOiBE ZWxldGVkLgorICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xz L3RpbWUtbGFiZWwuanM6CisgICAgICAgIChUaW1lTGFiZWwucHJvdG90eXBlLmNvbW1pdFByb3Bl cnR5KToKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tYWluLmpzOgor ICAgICAgICAoZm9ybWF0VGltZVRvU3RyaW5nKToKKwogMjAxNy0wNi0wNiAgQWRyaWFuIFBlcmV6 IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dheWxhbmRd IERvIG5vdCBwYXNzIHZhbHVlIG9mICRESVNQTEFZIHRvIHdsX2Rpc3BsYXlfY29ubmVjdCgpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9j b250cm9scy9zbGlkZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1j b250cm9scy9jb250cm9scy9zbGlkZXIuanMKaW5kZXggMjNkNDA0NDY1ZTgyOTM2NTU4YzYyMGIz Nzg3OGVkYmQxOWUxZWM4My4uNjFlY2EwM2RjZjE2YzQ1YTQzZWRiZGYyOWQ0YjJlNWMxZGRiYjg5 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvY29udHJvbHMvc2xpZGVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJu LW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3NsaWRlci5qcwpAQCAtNTYsNyArNTYsNyBAQCBjbGFz cyBTbGlkZXIgZXh0ZW5kcyBMYXlvdXROb2RlCiAKICAgICBzZXQgaW5wdXRBY2Nlc3NpYmxlTGFi ZWwodGltZVZhbHVlKQogICAgIHsKLSAgICAgICAgdGhpcy5faW5wdXQuZWxlbWVudC5zZXRBdHRy aWJ1dGUoImFyaWEtdmFsdWV0ZXh0IiwgdGhpcy5fZm9ybWF0VGltZSh0aW1lVmFsdWUpKTsKKyAg ICAgICAgdGhpcy5faW5wdXQuZWxlbWVudC5zZXRBdHRyaWJ1dGUoImFyaWEtdmFsdWV0ZXh0Iiwg Zm9ybWF0VGltZVRvU3RyaW5nKHRpbWVWYWx1ZSkpOwogICAgIH0KIAogICAgIGdldCBkaXNhYmxl ZCgpCkBAIC0xMDYsMTYgKzEwNiw2IEBAIGNsYXNzIFNsaWRlciBleHRlbmRzIExheW91dE5vZGUK IAogICAgIC8vIFByb3RlY3RlZAogCi0gICAgX2Zvcm1hdFRpbWUodGltZUluU2Vjb25kcykKLSAg ICB7Ci0gICAgICAgIGNvbnN0IHRpbWUgPSBmb3JtYXRUaW1lQnlVbml0KHRpbWVJblNlY29uZHMp OwotICAgICAgICBjb25zdCB0aW1lU3RyaW5ncyA9IFt1bml0aXplVGltZSh0aW1lLm1pbnV0ZXMs ICJNaW51dGUiKSwgdW5pdGl6ZVRpbWUodGltZS5zZWNvbmRzLCAiU2Vjb25kIildOwotICAgICAg ICBpZiAodGltZS5ob3VycyA+IDApCi0gICAgICAgICAgICB0aW1lU3RyaW5ncy51bnNoaWZ0KHVu aXRpemVUaW1lKHRpbWUuaG91cnMsICJIb3VyIikpOwotCi0gICAgICAgIHJldHVybiB0aW1lU3Ry aW5ncy5qb2luKCIgIik7Ci0gICAgfQotCiAgICAgaGFuZGxlRXZlbnQoZXZlbnQpCiAgICAgewog ICAgICAgICBzd2l0Y2ggKGV2ZW50LnR5cGUpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3RpbWUtbGFiZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy90aW1l LWxhYmVsLmpzCmluZGV4IDU0YmQxMzYwNmExN2E5ODEzYjlkMWNmZGMzN2QzY2QxYWI1MGJiYTUu LjNiZjkzNzJmZjkyZTA1OWY3M2E5N2UyNWM0OTZhMjFhNTdhM2VjMmYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3RpbWUt bGFiZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvY29udHJvbHMvdGltZS1sYWJlbC5qcwpAQCAtNjksNiArNjksOSBAQCBjbGFzcyBUaW1lTGFi ZWwgZXh0ZW5kcyBMYXlvdXROb2RlCiAgICAgewogICAgICAgICBpZiAocHJvcGVydHlOYW1lID09 PSAidmFsdWUiKSB7CiAgICAgICAgICAgICB0aGlzLmVsZW1lbnQudGV4dENvbnRlbnQgPSB0aGlz Ll9mb3JtYXR0ZWRUaW1lKCk7CisgICAgICAgICAgICBsZXQgdGltZUFzU3RyaW5nID0gZm9ybWF0 VGltZVRvU3RyaW5nKHRoaXMudmFsdWUpOworICAgICAgICAgICAgbGV0IGFyaWFMYWJlbCA9ICh0 aGlzLl90eXBlID09PSBUaW1lTGFiZWwuVHlwZXMuUmVtYWluaW5nKSA/IFVJU3RyaW5nKCJSZW1h aW5pbmciKSA6IFVJU3RyaW5nKCJFbGFwc2VkIik7CisgICAgICAgICAgICB0aGlzLmVsZW1lbnQu c2V0QXR0cmlidXRlKCJhcmlhLWxhYmVsIiwgYCR7YXJpYUxhYmVsfTogJHt0aW1lQXNTdHJpbmd9 YCk7CiAgICAgICAgICAgICBpZiAodGhpcy5wYXJlbnQgaW5zdGFuY2VvZiBUaW1lQ29udHJvbCkK ICAgICAgICAgICAgICAgICB0aGlzLnBhcmVudC51cGRhdGVTY3J1YmJlckxhYmVsKCk7CiAgICAg ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL21haW4uanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250 cm9scy9tYWluLmpzCmluZGV4IGZhMzlmOTgwOTQwN2ZlNGNjY2U4N2ZjODc0NmUzODIyYzdjODEw MmYuLjljODlhODUxYzczOGU1NTVjYTg5OTBiNGUzYjNlMDAzZWEwYmQ1ZTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21haW4uanMKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWFpbi5qcwpA QCAtNjYsMyArNjYsMTMgQEAgZnVuY3Rpb24gdW5pdGl6ZVRpbWUodmFsdWUsIHVuaXQpCiAKICAg ICByZXR1cm4gYCR7dmFsdWV9ICR7cmV0dXJuZWRVbml0fWA7CiB9CisKK2Z1bmN0aW9uIGZvcm1h dFRpbWVUb1N0cmluZyh0aW1lSW5TZWNvbmRzKQoreworICAgIGNvbnN0IHRpbWUgPSBmb3JtYXRU aW1lQnlVbml0KHRpbWVJblNlY29uZHMpOworICAgIGNvbnN0IHRpbWVTdHJpbmdzID0gW3VuaXRp emVUaW1lKHRpbWUubWludXRlcywgIk1pbnV0ZSIpLCB1bml0aXplVGltZSh0aW1lLnNlY29uZHMs ICJTZWNvbmQiKV07CisgICAgaWYgKHRpbWUuaG91cnMgPiAwKQorICAgICAgICB0aW1lU3RyaW5n cy51bnNoaWZ0KHVuaXRpemVUaW1lKHRpbWUuaG91cnMsICJIb3VyIikpOworCisgICAgcmV0dXJu IHRpbWVTdHJpbmdzLmpvaW4oIiAiKTsKK30KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkZTRmYWY4ZWNjMjdhZDg1YjU4OTAz MWZjMTk3ZTA4NGUzYTk1NzIyLi4wMDY5YjVhMGVjOTMzZDhkZmQ1YWJkNTAyZjQwMzA3NjMyMGU4 YzJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTctMDYtMDcgIEFhcm9uIENodSAgPGFhcm9u X2NodUBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IE1lZGlhIENvbnRyb2xzOiBNaXNzaW5nIGxh YmVscyBmb3IgdGhlIFRpbWUgTGFiZWxzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTcxNzE1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjAwOTIx ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb2Rp ZmllZCBleGlzdGluZyB0ZXN0IGNhc2UgdG8gYWNjb21tb2RhdGUgdGVzdGluZyBmb3IgdGltZSBs YWJlbCBkZXNjcmlwdGlvbi4KKworICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy90aW1lLWxhYmVsL3RpbWUtbGFiZWwuaHRtbDoKKwogMjAxNy0wNi0wNiAgQW50b2luZSBRdWlu dCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAgIFJlYmFzZWxpbmUgYW5kIGVuYWJsZSBt ZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvYXVkaW8KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90aW1lLWxhYmVsL3RpbWUtbGFiZWwuaHRtbCBi L0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90aW1lLWxhYmVsL3RpbWUt bGFiZWwuaHRtbAppbmRleCBkY2RmMzY2MTYyNTUyZmFhYjk2NjAxZTBjMWUwYjIzOWQ3NjJhYWJj Li5mNjlhNmQ3MzE3MWFhYWFhYzZmMzY5MTJiYmI2YmVhODdlMDA5ZGJhIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdGltZS1sYWJlbC90aW1lLWxh YmVsLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3Rp bWUtbGFiZWwvdGltZS1sYWJlbC5odG1sCkBAIC0xNSw2ICsxNSw3IEBAIHNob3VsZEJlRXF1YWxU b1N0cmluZygidGltZUxhYmVsLmVsZW1lbnQubG9jYWxOYW1lIiwgImRpdiIpOwogc2hvdWxkQmVF cXVhbFRvU3RyaW5nKCJ0aW1lTGFiZWwuZWxlbWVudC5jbGFzc05hbWUiLCAidGltZS1sYWJlbCIp OwogCiB0aW1lTGFiZWwudmFsdWUgPSAxOwordGltZUxhYmVsLmVsZW1lbnQuc2V0QXR0cmlidXRl KCJpZCIsICJlbGFzcGVkIik7CiAKIGNvbnN0IHRpbWVMYWJlbFdpdGhOZWdhdGl2ZVZhbHVlID0g bmV3IFRpbWVMYWJlbDsKIHRpbWVMYWJlbFdpdGhOZWdhdGl2ZVZhbHVlLnZhbHVlID0gLTYxOwpA QCAtMjIsMjMgKzIzLDMzIEBAIHRpbWVMYWJlbFdpdGhOZWdhdGl2ZVZhbHVlLnZhbHVlID0gLTYx OwogY29uc3QgdGltZUxhYmVsV2l0aEhvdXJzID0gbmV3IFRpbWVMYWJlbDsKIHRpbWVMYWJlbFdp dGhIb3Vycy52YWx1ZSA9IDM2NjE7CiAKK2NvbnN0IHJlbWFpbmluZ1RpbWVMYWJlbCA9IG5ldyBU aW1lTGFiZWwoVGltZUxhYmVsLlR5cGVzLlJlbWFpbmluZyk7CityZW1haW5pbmdUaW1lTGFiZWwu ZWxlbWVudC5zZXRBdHRyaWJ1dGUoImlkIiwgInJlbWFpbmluZyIpOworCiBsZXQgc3R5bGU7Cits ZXQgZWxhc3BlZExhYmVsOworbGV0IHJlbWFpbmluZ0xhYmVsOwogc2NoZWR1bGVyLmZyYW1lRGlk RmlyZSA9IGZ1bmN0aW9uKCkKIHsKICAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHRpbWVM YWJlbC5lbGVtZW50KTsKKyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHJlbWFpbmluZ1Rp bWVMYWJlbC5lbGVtZW50KTsKICAgICBzdHlsZSA9IHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKHRp bWVMYWJlbC5lbGVtZW50KTsKIAogICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygic3R5bGUucG9z aXRpb24iLCAiYWJzb2x1dGUiKTsKICAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoInN0eWxlLmZv bnRGYW1pbHkiLCAiLWFwcGxlLXN5c3RlbS1tb25vc3BhY2VkLW51bWJlcnMiKTsKICAgICBzaG91 bGRCZUVxdWFsVG9TdHJpbmcoInN0eWxlLmZvbnRTaXplIiwgIjE0cHgiKTsKIAorICAgIGVsYXNw ZWRMYWJlbCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgn ZWxhc3BlZCcpLmRlc2NyaXB0aW9uLnNwbGl0KCI6ICIpWzFdOworICAgIHJlbWFpbmluZ0xhYmVs ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCdyZW1haW5p bmcnKS5kZXNjcmlwdGlvbi5zcGxpdCgiOiAiKVsxXTsKKyAgICBzaG91bGRCZUVxdWFsVG9TdHJp bmcoImVsYXNwZWRMYWJlbCIsICJFbGFwc2VkIik7CisgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5n KCJyZW1haW5pbmdMYWJlbCIsICJSZW1haW5pbmciKTsKICAgICB0aW1lTGFiZWwuZWxlbWVudC5y ZW1vdmUoKTsKIAogICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygidGltZUxhYmVsLmVsZW1lbnQu dGV4dENvbnRlbnQiLCAiMDA6MDEiKTsKICAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoInRpbWVM YWJlbFdpdGhOZWdhdGl2ZVZhbHVlLmVsZW1lbnQudGV4dENvbnRlbnQiLCAiLTAxOjAxIik7CiAg ICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJ0aW1lTGFiZWxXaXRoSG91cnMuZWxlbWVudC50ZXh0 Q29udGVudCIsICIwMTowMTowMSIpOwogCi0gICAgZmluaXNoTWVkaWFDb250cm9sc1Rlc3QoKTsK KyAgICBmaW5pc2hNZWRpYUNvbnRyb2xzVGVzdCgpOyAKIH07CiAKIDwvc2NyaXB0Pgo= 312260 2017-06-07 17:41:33 -0700 2017-06-08 10:42:44 -0700 Patch bug-171715-20170607174229.patch text/plain 6769 aaron_chu U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc0M2E3MTk2NDgwZjhj ZmFmNGZjZTVlYmE2MDY5YTViOTQ2MjdlOC4uZjM0Mjk5ZTI5NWRkZGYwMzczMDgzMjQ1MzVkMWVh ZTNkZjlmMzRjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA2LTA3ICBBYXJv biBDaHUgIDxhYXJvbl9jaHVAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBNZWRpYSBDb250cm9s czogTWlzc2luZyBsYWJlbHMgZm9yIHRoZSBUaW1lIExhYmVscy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTcxNQorICAgICAgICA8cmRhcjovL3By b2JsZW0vMzIwMDkyMTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkZWQgYXJpYS1sYWJlbCB0byBkZXNjcmliZSB0aW1lIGxhYmVscyBpbiBtZWRp YSBjb250cm9scy4KKworICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2Nv bnRyb2xzL3NsaWRlci5qczoKKyAgICAgICAgKFNsaWRlci5wcm90b3R5cGUuc2V0IGlucHV0QWNj ZXNzaWJsZUxhYmVsKToKKyAgICAgICAgKFNsaWRlci5wcm90b3R5cGUuX2Zvcm1hdFRpbWUpOiBE ZWxldGVkLgorICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xz L3RpbWUtbGFiZWwuanM6CisgICAgICAgIChUaW1lTGFiZWwucHJvdG90eXBlLmNvbW1pdFByb3Bl cnR5KToKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tYWluLmpzOgor ICAgICAgICAoZm9ybWF0VGltZVRvU3RyaW5nKToKKwogMjAxNy0wNi0wNiAgQWRyaWFuIFBlcmV6 IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dheWxhbmRd IERvIG5vdCBwYXNzIHZhbHVlIG9mICRESVNQTEFZIHRvIHdsX2Rpc3BsYXlfY29ubmVjdCgpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9j b250cm9scy9zbGlkZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1j b250cm9scy9jb250cm9scy9zbGlkZXIuanMKaW5kZXggMjNkNDA0NDY1ZTgyOTM2NTU4YzYyMGIz Nzg3OGVkYmQxOWUxZWM4My4uNjFlY2EwM2RjZjE2YzQ1YTQzZWRiZGYyOWQ0YjJlNWMxZGRiYjg5 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvY29udHJvbHMvc2xpZGVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJu LW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3NsaWRlci5qcwpAQCAtNTYsNyArNTYsNyBAQCBjbGFz cyBTbGlkZXIgZXh0ZW5kcyBMYXlvdXROb2RlCiAKICAgICBzZXQgaW5wdXRBY2Nlc3NpYmxlTGFi ZWwodGltZVZhbHVlKQogICAgIHsKLSAgICAgICAgdGhpcy5faW5wdXQuZWxlbWVudC5zZXRBdHRy aWJ1dGUoImFyaWEtdmFsdWV0ZXh0IiwgdGhpcy5fZm9ybWF0VGltZSh0aW1lVmFsdWUpKTsKKyAg ICAgICAgdGhpcy5faW5wdXQuZWxlbWVudC5zZXRBdHRyaWJ1dGUoImFyaWEtdmFsdWV0ZXh0Iiwg Zm9ybWF0VGltZVRvU3RyaW5nKHRpbWVWYWx1ZSkpOwogICAgIH0KIAogICAgIGdldCBkaXNhYmxl ZCgpCkBAIC0xMDYsMTYgKzEwNiw2IEBAIGNsYXNzIFNsaWRlciBleHRlbmRzIExheW91dE5vZGUK IAogICAgIC8vIFByb3RlY3RlZAogCi0gICAgX2Zvcm1hdFRpbWUodGltZUluU2Vjb25kcykKLSAg ICB7Ci0gICAgICAgIGNvbnN0IHRpbWUgPSBmb3JtYXRUaW1lQnlVbml0KHRpbWVJblNlY29uZHMp OwotICAgICAgICBjb25zdCB0aW1lU3RyaW5ncyA9IFt1bml0aXplVGltZSh0aW1lLm1pbnV0ZXMs ICJNaW51dGUiKSwgdW5pdGl6ZVRpbWUodGltZS5zZWNvbmRzLCAiU2Vjb25kIildOwotICAgICAg ICBpZiAodGltZS5ob3VycyA+IDApCi0gICAgICAgICAgICB0aW1lU3RyaW5ncy51bnNoaWZ0KHVu aXRpemVUaW1lKHRpbWUuaG91cnMsICJIb3VyIikpOwotCi0gICAgICAgIHJldHVybiB0aW1lU3Ry aW5ncy5qb2luKCIgIik7Ci0gICAgfQotCiAgICAgaGFuZGxlRXZlbnQoZXZlbnQpCiAgICAgewog ICAgICAgICBzd2l0Y2ggKGV2ZW50LnR5cGUpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3RpbWUtbGFiZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy90aW1l LWxhYmVsLmpzCmluZGV4IDU0YmQxMzYwNmExN2E5ODEzYjlkMWNmZGMzN2QzY2QxYWI1MGJiYTUu LjZhYzU2MjRkYTdlNTYzZTdmMjUzYjAyZDY2NDVkMDYzM2FhMmE3NjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3RpbWUt bGFiZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvY29udHJvbHMvdGltZS1sYWJlbC5qcwpAQCAtNjksNiArNjksOSBAQCBjbGFzcyBUaW1lTGFi ZWwgZXh0ZW5kcyBMYXlvdXROb2RlCiAgICAgewogICAgICAgICBpZiAocHJvcGVydHlOYW1lID09 PSAidmFsdWUiKSB7CiAgICAgICAgICAgICB0aGlzLmVsZW1lbnQudGV4dENvbnRlbnQgPSB0aGlz Ll9mb3JtYXR0ZWRUaW1lKCk7CisgICAgICAgICAgICBjb25zdCB0aW1lQXNTdHJpbmcgPSBmb3Jt YXRUaW1lVG9TdHJpbmcodGhpcy52YWx1ZSk7CisgICAgICAgICAgICBjb25zdCBhcmlhTGFiZWwg PSAodGhpcy5fdHlwZSA9PT0gVGltZUxhYmVsLlR5cGVzLlJlbWFpbmluZykgPyBVSVN0cmluZygi UmVtYWluaW5nIikgOiBVSVN0cmluZygiRWxhcHNlZCIpOworICAgICAgICAgICAgdGhpcy5lbGVt ZW50LnNldEF0dHJpYnV0ZSgiYXJpYS1sYWJlbCIsIGAke2FyaWFMYWJlbH06ICR7dGltZUFzU3Ry aW5nfWApOwogICAgICAgICAgICAgaWYgKHRoaXMucGFyZW50IGluc3RhbmNlb2YgVGltZUNvbnRy b2wpCiAgICAgICAgICAgICAgICAgdGhpcy5wYXJlbnQudXBkYXRlU2NydWJiZXJMYWJlbCgpOwog ICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRp YS1jb250cm9scy9tYWluLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvbWFpbi5qcwppbmRleCBmYTM5Zjk4MDk0MDdmZTRjY2NlODdmYzg3NDZlMzgyMmM3 YzgxMDJmLi45Yzg5YTg1MWM3MzhlNTU1Y2E4OTkwYjRlM2IzZTAwM2VhMGJkNWUzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tYWluLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21haW4u anMKQEAgLTY2LDMgKzY2LDEzIEBAIGZ1bmN0aW9uIHVuaXRpemVUaW1lKHZhbHVlLCB1bml0KQog CiAgICAgcmV0dXJuIGAke3ZhbHVlfSAke3JldHVybmVkVW5pdH1gOwogfQorCitmdW5jdGlvbiBm b3JtYXRUaW1lVG9TdHJpbmcodGltZUluU2Vjb25kcykKK3sKKyAgICBjb25zdCB0aW1lID0gZm9y bWF0VGltZUJ5VW5pdCh0aW1lSW5TZWNvbmRzKTsKKyAgICBjb25zdCB0aW1lU3RyaW5ncyA9IFt1 bml0aXplVGltZSh0aW1lLm1pbnV0ZXMsICJNaW51dGUiKSwgdW5pdGl6ZVRpbWUodGltZS5zZWNv bmRzLCAiU2Vjb25kIildOworICAgIGlmICh0aW1lLmhvdXJzID4gMCkKKyAgICAgICAgdGltZVN0 cmluZ3MudW5zaGlmdCh1bml0aXplVGltZSh0aW1lLmhvdXJzLCAiSG91ciIpKTsKKworICAgIHJl dHVybiB0aW1lU3RyaW5ncy5qb2luKCIgIik7Cit9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZGU0ZmFmOGVjYzI3YWQ4NWI1 ODkwMzFmYzE5N2UwODRlM2E5NTcyMi4uMDA2OWI1YTBlYzkzM2Q4ZGZkNWFiZDUwMmY0MDMwNzYz MjBlOGMyZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA2LTA3ICBBYXJvbiBDaHUgIDxh YXJvbl9jaHVAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBNZWRpYSBDb250cm9sczogTWlzc2lu ZyBsYWJlbHMgZm9yIHRoZSBUaW1lIExhYmVscy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTcxNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzIw MDkyMTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TW9kaWZpZWQgZXhpc3RpbmcgdGVzdCBjYXNlIHRvIGFjY29tbW9kYXRlIHRlc3RpbmcgZm9yIHRp bWUgbGFiZWwgZGVzY3JpcHRpb24uCisKKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvdGltZS1sYWJlbC90aW1lLWxhYmVsLmh0bWw6CisKIDIwMTctMDYtMDYgIEFudG9pbmUg UXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWJhc2VsaW5lIGFuZCBlbmFi bGUgbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2F1ZGlvCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdGltZS1sYWJlbC90aW1lLWxhYmVsLmh0 bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdGltZS1sYWJlbC90 aW1lLWxhYmVsLmh0bWwKaW5kZXggZGNkZjM2NjE2MjU1MmZhYWI5NjYwMWUwYzFlMGIyMzlkNzYy YWFiYy4uMGE2YjgzODlhMjljOGU4ODI0ZTdkMjZmNWY1ZDJhZDkxMDZhYjdmMCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RpbWUtbGFiZWwvdGlt ZS1sYWJlbC5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy90aW1lLWxhYmVsL3RpbWUtbGFiZWwuaHRtbApAQCAtMTUsNiArMTUsNyBAQCBzaG91bGRCZUVx dWFsVG9TdHJpbmcoInRpbWVMYWJlbC5lbGVtZW50LmxvY2FsTmFtZSIsICJkaXYiKTsKIHNob3Vs ZEJlRXF1YWxUb1N0cmluZygidGltZUxhYmVsLmVsZW1lbnQuY2xhc3NOYW1lIiwgInRpbWUtbGFi ZWwiKTsKIAogdGltZUxhYmVsLnZhbHVlID0gMTsKK3RpbWVMYWJlbC5lbGVtZW50LmlkID0gImVs YXNwZWQiOwogCiBjb25zdCB0aW1lTGFiZWxXaXRoTmVnYXRpdmVWYWx1ZSA9IG5ldyBUaW1lTGFi ZWw7CiB0aW1lTGFiZWxXaXRoTmVnYXRpdmVWYWx1ZS52YWx1ZSA9IC02MTsKQEAgLTIyLDIyICsy MywzMiBAQCB0aW1lTGFiZWxXaXRoTmVnYXRpdmVWYWx1ZS52YWx1ZSA9IC02MTsKIGNvbnN0IHRp bWVMYWJlbFdpdGhIb3VycyA9IG5ldyBUaW1lTGFiZWw7CiB0aW1lTGFiZWxXaXRoSG91cnMudmFs dWUgPSAzNjYxOwogCitjb25zdCByZW1haW5pbmdUaW1lTGFiZWwgPSBuZXcgVGltZUxhYmVsKFRp bWVMYWJlbC5UeXBlcy5SZW1haW5pbmcpOworcmVtYWluaW5nVGltZUxhYmVsLmVsZW1lbnQuaWQg PSAicmVtYWluaW5nIjsKKwogbGV0IHN0eWxlOworbGV0IGVsYXNwZWRMYWJlbDsKK2xldCByZW1h aW5pbmdMYWJlbDsKIHNjaGVkdWxlci5mcmFtZURpZEZpcmUgPSBmdW5jdGlvbigpCiB7CiAgICAg ZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZCh0aW1lTGFiZWwuZWxlbWVudCk7CisgICAgZG9jdW1l bnQuYm9keS5hcHBlbmRDaGlsZChyZW1haW5pbmdUaW1lTGFiZWwuZWxlbWVudCk7CiAgICAgc3R5 bGUgPSB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0aW1lTGFiZWwuZWxlbWVudCk7CiAKICAgICBz aG91bGRCZUVxdWFsVG9TdHJpbmcoInN0eWxlLnBvc2l0aW9uIiwgImFic29sdXRlIik7CiAgICAg c2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJzdHlsZS5mb250RmFtaWx5IiwgIi1hcHBsZS1zeXN0ZW0t bW9ub3NwYWNlZC1udW1iZXJzIik7CiAgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJzdHlsZS5m b250U2l6ZSIsICIxNHB4Iik7CiAKKyAgICBlbGFzcGVkTGFiZWwgPSBhY2Nlc3NpYmlsaXR5Q29u dHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoJ2VsYXNwZWQnKS5kZXNjcmlwdGlvbi5zcGxp dCgiOiAiKVsxXTsKKyAgICByZW1haW5pbmdMYWJlbCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVy LmFjY2Vzc2libGVFbGVtZW50QnlJZCgncmVtYWluaW5nJykuZGVzY3JpcHRpb24uc3BsaXQoIjog IilbMV07CisgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJlbGFzcGVkTGFiZWwiLCAiRWxhcHNl ZCIpOworICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygicmVtYWluaW5nTGFiZWwiLCAiUmVtYWlu aW5nIik7CiAgICAgdGltZUxhYmVsLmVsZW1lbnQucmVtb3ZlKCk7CiAKICAgICBzaG91bGRCZUVx dWFsVG9TdHJpbmcoInRpbWVMYWJlbC5lbGVtZW50LnRleHRDb250ZW50IiwgIjAwOjAxIik7CiAg ICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJ0aW1lTGFiZWxXaXRoTmVnYXRpdmVWYWx1ZS5lbGVt ZW50LnRleHRDb250ZW50IiwgIi0wMTowMSIpOwogICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygi dGltZUxhYmVsV2l0aEhvdXJzLmVsZW1lbnQudGV4dENvbnRlbnQiLCAiMDE6MDE6MDEiKTsKLQor ICAgIAogICAgIGZpbmlzaE1lZGlhQ29udHJvbHNUZXN0KCk7CiB9OwogCg== 312319 2017-06-08 10:42:46 -0700 2017-06-09 01:02:08 -0700 Patch bug-171715-20170608104344.patch text/plain 6553 aaron_chu U3VidmVyc2lvbiBSZXZpc2lvbjogMjE3ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc0M2E3MTk2NDgwZjhj ZmFmNGZjZTVlYmE2MDY5YTViOTQ2MjdlOC4uY2QwOWZlOGEwODQ4ZWFiMWQ4ZDA0OTQwNDE4NDky MjBmYjg5MmZjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA2LTA4ICBBYXJv biBDaHUgIDxhYXJvbl9jaHVAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBNZWRpYSBDb250cm9s czogTWlzc2luZyBsYWJlbHMgZm9yIHRoZSBUaW1lIExhYmVscy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTcxNQorICAgICAgICA8cmRhcjovL3By b2JsZW0vMzIwMDkyMTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkZWQgYXJpYS1sYWJlbCB0byBkZXNjcmliZSB0aW1lIGxhYmVscyBpbiBtZWRp YSBjb250cm9scy4KKworICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2Nv bnRyb2xzL3NsaWRlci5qczoKKyAgICAgICAgKFNsaWRlci5wcm90b3R5cGUuc2V0IGlucHV0QWNj ZXNzaWJsZUxhYmVsKToKKyAgICAgICAgKFNsaWRlci5wcm90b3R5cGUuX2Zvcm1hdFRpbWUpOiBE ZWxldGVkLgorICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xz L3RpbWUtbGFiZWwuanM6CisgICAgICAgIChUaW1lTGFiZWwucHJvdG90eXBlLmNvbW1pdFByb3Bl cnR5KToKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tYWluLmpzOgor ICAgICAgICAoZm9ybWF0VGltZVRvU3RyaW5nKToKKwogMjAxNy0wNi0wNiAgQWRyaWFuIFBlcmV6 IGRlIENhc3RybyAgPGFwZXJlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dheWxhbmRd IERvIG5vdCBwYXNzIHZhbHVlIG9mICRESVNQTEFZIHRvIHdsX2Rpc3BsYXlfY29ubmVjdCgpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9j b250cm9scy9zbGlkZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1j b250cm9scy9jb250cm9scy9zbGlkZXIuanMKaW5kZXggMjNkNDA0NDY1ZTgyOTM2NTU4YzYyMGIz Nzg3OGVkYmQxOWUxZWM4My4uNjFlY2EwM2RjZjE2YzQ1YTQzZWRiZGYyOWQ0YjJlNWMxZGRiYjg5 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvY29udHJvbHMvc2xpZGVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJu LW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3NsaWRlci5qcwpAQCAtNTYsNyArNTYsNyBAQCBjbGFz cyBTbGlkZXIgZXh0ZW5kcyBMYXlvdXROb2RlCiAKICAgICBzZXQgaW5wdXRBY2Nlc3NpYmxlTGFi ZWwodGltZVZhbHVlKQogICAgIHsKLSAgICAgICAgdGhpcy5faW5wdXQuZWxlbWVudC5zZXRBdHRy aWJ1dGUoImFyaWEtdmFsdWV0ZXh0IiwgdGhpcy5fZm9ybWF0VGltZSh0aW1lVmFsdWUpKTsKKyAg ICAgICAgdGhpcy5faW5wdXQuZWxlbWVudC5zZXRBdHRyaWJ1dGUoImFyaWEtdmFsdWV0ZXh0Iiwg Zm9ybWF0VGltZVRvU3RyaW5nKHRpbWVWYWx1ZSkpOwogICAgIH0KIAogICAgIGdldCBkaXNhYmxl ZCgpCkBAIC0xMDYsMTYgKzEwNiw2IEBAIGNsYXNzIFNsaWRlciBleHRlbmRzIExheW91dE5vZGUK IAogICAgIC8vIFByb3RlY3RlZAogCi0gICAgX2Zvcm1hdFRpbWUodGltZUluU2Vjb25kcykKLSAg ICB7Ci0gICAgICAgIGNvbnN0IHRpbWUgPSBmb3JtYXRUaW1lQnlVbml0KHRpbWVJblNlY29uZHMp OwotICAgICAgICBjb25zdCB0aW1lU3RyaW5ncyA9IFt1bml0aXplVGltZSh0aW1lLm1pbnV0ZXMs ICJNaW51dGUiKSwgdW5pdGl6ZVRpbWUodGltZS5zZWNvbmRzLCAiU2Vjb25kIildOwotICAgICAg ICBpZiAodGltZS5ob3VycyA+IDApCi0gICAgICAgICAgICB0aW1lU3RyaW5ncy51bnNoaWZ0KHVu aXRpemVUaW1lKHRpbWUuaG91cnMsICJIb3VyIikpOwotCi0gICAgICAgIHJldHVybiB0aW1lU3Ry aW5ncy5qb2luKCIgIik7Ci0gICAgfQotCiAgICAgaGFuZGxlRXZlbnQoZXZlbnQpCiAgICAgewog ICAgICAgICBzd2l0Y2ggKGV2ZW50LnR5cGUpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3RpbWUtbGFiZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy90aW1l LWxhYmVsLmpzCmluZGV4IDU0YmQxMzYwNmExN2E5ODEzYjlkMWNmZGMzN2QzY2QxYWI1MGJiYTUu LjZhYzU2MjRkYTdlNTYzZTdmMjUzYjAyZDY2NDVkMDYzM2FhMmE3NjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL3RpbWUt bGFiZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvY29udHJvbHMvdGltZS1sYWJlbC5qcwpAQCAtNjksNiArNjksOSBAQCBjbGFzcyBUaW1lTGFi ZWwgZXh0ZW5kcyBMYXlvdXROb2RlCiAgICAgewogICAgICAgICBpZiAocHJvcGVydHlOYW1lID09 PSAidmFsdWUiKSB7CiAgICAgICAgICAgICB0aGlzLmVsZW1lbnQudGV4dENvbnRlbnQgPSB0aGlz Ll9mb3JtYXR0ZWRUaW1lKCk7CisgICAgICAgICAgICBjb25zdCB0aW1lQXNTdHJpbmcgPSBmb3Jt YXRUaW1lVG9TdHJpbmcodGhpcy52YWx1ZSk7CisgICAgICAgICAgICBjb25zdCBhcmlhTGFiZWwg PSAodGhpcy5fdHlwZSA9PT0gVGltZUxhYmVsLlR5cGVzLlJlbWFpbmluZykgPyBVSVN0cmluZygi UmVtYWluaW5nIikgOiBVSVN0cmluZygiRWxhcHNlZCIpOworICAgICAgICAgICAgdGhpcy5lbGVt ZW50LnNldEF0dHJpYnV0ZSgiYXJpYS1sYWJlbCIsIGAke2FyaWFMYWJlbH06ICR7dGltZUFzU3Ry aW5nfWApOwogICAgICAgICAgICAgaWYgKHRoaXMucGFyZW50IGluc3RhbmNlb2YgVGltZUNvbnRy b2wpCiAgICAgICAgICAgICAgICAgdGhpcy5wYXJlbnQudXBkYXRlU2NydWJiZXJMYWJlbCgpOwog ICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRp YS1jb250cm9scy9tYWluLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvbWFpbi5qcwppbmRleCBmYTM5Zjk4MDk0MDdmZTRjY2NlODdmYzg3NDZlMzgyMmM3 YzgxMDJmLi45Yzg5YTg1MWM3MzhlNTU1Y2E4OTkwYjRlM2IzZTAwM2VhMGJkNWUzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tYWluLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21haW4u anMKQEAgLTY2LDMgKzY2LDEzIEBAIGZ1bmN0aW9uIHVuaXRpemVUaW1lKHZhbHVlLCB1bml0KQog CiAgICAgcmV0dXJuIGAke3ZhbHVlfSAke3JldHVybmVkVW5pdH1gOwogfQorCitmdW5jdGlvbiBm b3JtYXRUaW1lVG9TdHJpbmcodGltZUluU2Vjb25kcykKK3sKKyAgICBjb25zdCB0aW1lID0gZm9y bWF0VGltZUJ5VW5pdCh0aW1lSW5TZWNvbmRzKTsKKyAgICBjb25zdCB0aW1lU3RyaW5ncyA9IFt1 bml0aXplVGltZSh0aW1lLm1pbnV0ZXMsICJNaW51dGUiKSwgdW5pdGl6ZVRpbWUodGltZS5zZWNv bmRzLCAiU2Vjb25kIildOworICAgIGlmICh0aW1lLmhvdXJzID4gMCkKKyAgICAgICAgdGltZVN0 cmluZ3MudW5zaGlmdCh1bml0aXplVGltZSh0aW1lLmhvdXJzLCAiSG91ciIpKTsKKworICAgIHJl dHVybiB0aW1lU3RyaW5ncy5qb2luKCIgIik7Cit9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZGU0ZmFmOGVjYzI3YWQ4NWI1 ODkwMzFmYzE5N2UwODRlM2E5NTcyMi4uZmU1NTA1MjMxZGU4YmUyNzM3MGM5ODhmZmUyNDU1YWNh YThiMTEyZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA2LTA4ICBBYXJvbiBDaHUgIDxh YXJvbl9jaHVAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBNZWRpYSBDb250cm9sczogTWlzc2lu ZyBsYWJlbHMgZm9yIHRoZSBUaW1lIExhYmVscy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTcxNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzIw MDkyMTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TW9kaWZpZWQgZXhpc3RpbmcgdGVzdCBjYXNlIHRvIGFjY29tbW9kYXRlIHRlc3RpbmcgZm9yIHRp bWUgbGFiZWwgZGVzY3JpcHRpb24uCisKKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvdGltZS1sYWJlbC90aW1lLWxhYmVsLmh0bWw6CisKIDIwMTctMDYtMDYgIEFudG9pbmUg UXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWJhc2VsaW5lIGFuZCBlbmFi bGUgbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2F1ZGlvCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdGltZS1sYWJlbC90aW1lLWxhYmVsLmh0 bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdGltZS1sYWJlbC90 aW1lLWxhYmVsLmh0bWwKaW5kZXggZGNkZjM2NjE2MjU1MmZhYWI5NjYwMWUwYzFlMGIyMzlkNzYy YWFiYy4uMjU5YzMyZmM4Mzk5ZmMxZGQ5NTk4YWRlMmVmMmVkNzI4ZjJiMWQyOSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RpbWUtbGFiZWwvdGlt ZS1sYWJlbC5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy90aW1lLWxhYmVsL3RpbWUtbGFiZWwuaHRtbApAQCAtMTUsNiArMTUsNyBAQCBzaG91bGRCZUVx dWFsVG9TdHJpbmcoInRpbWVMYWJlbC5lbGVtZW50LmxvY2FsTmFtZSIsICJkaXYiKTsKIHNob3Vs ZEJlRXF1YWxUb1N0cmluZygidGltZUxhYmVsLmVsZW1lbnQuY2xhc3NOYW1lIiwgInRpbWUtbGFi ZWwiKTsKIAogdGltZUxhYmVsLnZhbHVlID0gMTsKK3RpbWVMYWJlbC5lbGVtZW50LmlkID0gImVs YXNwZWQiOwogCiBjb25zdCB0aW1lTGFiZWxXaXRoTmVnYXRpdmVWYWx1ZSA9IG5ldyBUaW1lTGFi ZWw7CiB0aW1lTGFiZWxXaXRoTmVnYXRpdmVWYWx1ZS52YWx1ZSA9IC02MTsKQEAgLTIyLDE2ICsy MywyNiBAQCB0aW1lTGFiZWxXaXRoTmVnYXRpdmVWYWx1ZS52YWx1ZSA9IC02MTsKIGNvbnN0IHRp bWVMYWJlbFdpdGhIb3VycyA9IG5ldyBUaW1lTGFiZWw7CiB0aW1lTGFiZWxXaXRoSG91cnMudmFs dWUgPSAzNjYxOwogCitjb25zdCByZW1haW5pbmdUaW1lTGFiZWwgPSBuZXcgVGltZUxhYmVsKFRp bWVMYWJlbC5UeXBlcy5SZW1haW5pbmcpOworcmVtYWluaW5nVGltZUxhYmVsLmVsZW1lbnQuaWQg PSAicmVtYWluaW5nIjsKKwogbGV0IHN0eWxlOworbGV0IGVsYXNwZWRMYWJlbDsKK2xldCByZW1h aW5pbmdMYWJlbDsKIHNjaGVkdWxlci5mcmFtZURpZEZpcmUgPSBmdW5jdGlvbigpCiB7CiAgICAg ZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZCh0aW1lTGFiZWwuZWxlbWVudCk7CisgICAgZG9jdW1l bnQuYm9keS5hcHBlbmRDaGlsZChyZW1haW5pbmdUaW1lTGFiZWwuZWxlbWVudCk7CiAgICAgc3R5 bGUgPSB3aW5kb3cuZ2V0Q29tcHV0ZWRTdHlsZSh0aW1lTGFiZWwuZWxlbWVudCk7CiAKICAgICBz aG91bGRCZUVxdWFsVG9TdHJpbmcoInN0eWxlLnBvc2l0aW9uIiwgImFic29sdXRlIik7CiAgICAg c2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJzdHlsZS5mb250RmFtaWx5IiwgIi1hcHBsZS1zeXN0ZW0t bW9ub3NwYWNlZC1udW1iZXJzIik7CiAgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJzdHlsZS5m b250U2l6ZSIsICIxNHB4Iik7CiAKKyAgICBlbGFzcGVkTGFiZWwgPSBhY2Nlc3NpYmlsaXR5Q29u dHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoJ2VsYXNwZWQnKS5kZXNjcmlwdGlvbi5zcGxp dCgiOiAiKVsxXTsKKyAgICByZW1haW5pbmdMYWJlbCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVy LmFjY2Vzc2libGVFbGVtZW50QnlJZCgncmVtYWluaW5nJykuZGVzY3JpcHRpb24uc3BsaXQoIjog IilbMV07CisgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJlbGFzcGVkTGFiZWwiLCAiRWxhcHNl ZCIpOworICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygicmVtYWluaW5nTGFiZWwiLCAiUmVtYWlu aW5nIik7CiAgICAgdGltZUxhYmVsLmVsZW1lbnQucmVtb3ZlKCk7CiAKICAgICBzaG91bGRCZUVx dWFsVG9TdHJpbmcoInRpbWVMYWJlbC5lbGVtZW50LnRleHRDb250ZW50IiwgIjAwOjAxIik7Cg==