82476 2012-03-28 10:05:10 -0700 Extra display logic for the media control panel element 2012-04-24 15:50:45 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 82150 82124 1 vcarbune vcarbune annacc eric.carlson feature-media-reviews fischman silviapfeiffer1 webkit.review.bot oldest_to_newest 590071 0 vcarbune 2012-03-28 10:05:10 -0700 In order to have the media control panel element toggle the display:none property when the fadeout transition ends, we need to ensure that the property isn't removed when the default controls should not be displayed. 597335 1 136017 vcarbune 2012-04-06 07:02:33 -0700 Created attachment 136017 Fixed display bug and removed timer 597393 2 136017 vcarbune 2012-04-06 08:59:16 -0700 Comment on attachment 136017 Fixed display bug and removed timer It seems that this method doesn't actually work, because dispatchEvent is called only when a listener exists. I got tricked by the fact that the test passes (because it has waitForEvent). The only way to do this is using a timer - I will add a simpler patch just adding the extra variable. 598559 3 136291 vcarbune 2012-04-09 13:22:06 -0700 Created attachment 136291 Simple patch 598562 4 136293 vcarbune 2012-04-09 13:26:15 -0700 Created attachment 136293 Updated test expected output 598875 5 136293 dbates 2012-04-09 19:00:07 -0700 Comment on attachment 136293 Updated test expected output View in context: https://bugs.webkit.org/attachment.cgi?id=136293&action=review I'm r-ing this patch because it doesn't have a properly formatted change log entry. In particular, it's missing a "Reviewed by" line in the WebCore/ChangeLog file. > Source/WebCore/ChangeLog:7 > + This patch fixes a bug which caused the controls to be displayed > + when they should remain hidden. Added an extra variable to the > + panel elements which properly keeps the state of the panel (visible or not). > + > + https://bugs.webkit.org/show_bug.cgi?id=82476 This change log entry doesn't conform to the format we use for change log entries. In particular, it's missing a bug title and a "Reviewed by" line. The top portion of a change log entry has the following lines (in order): data/author's full name/author's email address, bug title, bug URL, Reviewed by line, and change description. See <http://www.webkit.org/coding/contributing.html#changelogs> for more details, which references an example entry. Another example of a change log entry that conforms to the aforementioned format is <http://trac.webkit.org/changeset/103692/trunk/Source/WebCore/ChangeLog>. > LayoutTests/ChangeLog:8 > + Added test to ensure that controls are not displayed when > + the controls attribute is not set. > + > + https://bugs.webkit.org/show_bug.cgi?id=82476 > + > + Reviewed by NOBODY (OOPS!). Similarly, this change log entry doesn't conform to the format we use for a change log entry. 599268 6 136458 vcarbune 2012-04-10 07:43:43 -0700 Created attachment 136458 Fixed ChangeLog entries 599271 7 vcarbune 2012-04-10 07:46:02 -0700 (In reply to comment #5) > (From update of attachment 136293 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=136293&action=review > > I'm r-ing this patch because it doesn't have a properly formatted change log entry. In particular, it's missing a "Reviewed by" line in the WebCore/ChangeLog file. I have changed both ChangeLogs, I wasn't aware how strict the rules are. Thank you for pointing this out. Thanks for taking the time to review this. 599364 8 136458 eric.carlson 2012-04-10 10:08:18 -0700 Comment on attachment 136458 Fixed ChangeLog entries View in context: https://bugs.webkit.org/attachment.cgi?id=136458&action=review > LayoutTests/media/video-controls-toggling.html:11 > + var fadeoutTime = 1000; This is a very long pause for a layout test. The controls fade actually out in 0.3 seconds, can we make this somewhat smaller without making the test flakey? Could it work to set the timeout to 0.3 and have continueTest() set another timeout (only one time) if the panel is still visible? 599414 9 136489 vcarbune 2012-04-10 10:54:25 -0700 Created attachment 136489 Updated test. 599425 10 vcarbune 2012-04-10 11:06:57 -0700 (In reply to comment #8) > (From update of attachment 136458 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=136458&action=review > > > LayoutTests/media/video-controls-toggling.html:11 > > + var fadeoutTime = 1000; > > This is a very long pause for a layout test. The controls fade actually out in 0.3 seconds, can we make this somewhat smaller without making the test flakey? > > Could it work to set the timeout to 0.3 and have continueTest() set another timeout (only one time) if the panel is still visible? Your solution works good on my machine and I hope it won't be flaky (unfortunately I can't think of any other way of testing this, besides using setTimeout) 599434 11 136489 eric.carlson 2012-04-10 11:15:30 -0700 Comment on attachment 136489 Updated test. View in context: https://bugs.webkit.org/attachment.cgi?id=136489&action=review > LayoutTests/media/video-controls-toggling.html:58 > + if (panel.style['display'] != 'none') { > + setTimeout(continueTest, fadeoutTime); > + return; > + } The only problem with this is that it will set the timer again and again until the test is killed, so it might be better to only do this once. On the other hand, the test will timeout eventually so this might be OK. Your call. 599670 12 vcarbune 2012-04-10 14:52:03 -0700 (In reply to comment #11) > (From update of attachment 136489 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=136489&action=review > > > LayoutTests/media/video-controls-toggling.html:58 > > + if (panel.style['display'] != 'none') { > > + setTimeout(continueTest, fadeoutTime); > > + return; > > + } > > The only problem with this is that it will set the timer again and again until the test is killed, so it might be better to only do this once. On the other hand, the test will timeout eventually so this might be OK. Your call. I think that rather than dealing with flaky tests because of slightly different observed fadeout times on various platforms, we are better off with a timeout, meaning that the test really is failing. 605658 13 eric.carlson 2012-04-19 10:10:00 -0700 Victor, please mark this cq? if it is ready to land. 605869 14 vcarbune 2012-04-19 14:11:14 -0700 (In reply to comment #13) > Victor, please mark this cq? if it is ready to land. This patch enables toggling display:none on the controls and depends on the volume slider rendering fix before it can be marked with cq. 608568 15 138540 vcarbune 2012-04-24 05:24:08 -0700 Created attachment 138540 Rebased 609174 16 138540 webkit.review.bot 2012-04-24 15:50:25 -0700 Comment on attachment 138540 Rebased Clearing flags on attachment: 138540 Committed r115125: <http://trac.webkit.org/changeset/115125> 609175 17 webkit.review.bot 2012-04-24 15:50:45 -0700 All reviewed patches have been landed. Closing bug. 136017 2012-04-06 07:02:33 -0700 2012-04-06 08:59:16 -0700 Fixed display bug and removed timer bug-82476-20120406170231.patch text/plain 14271 vcarbune U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE1NTNkMjZkNDA1NGE4 NDk5ZGE0Y2JiMzRiMjdkOGFhMzY2ZTRhNy4uMTEzOWZhMzQ1NWQ1ZGNmNzFkY2JhOWUyNzIyZTcx YjU3ZjMxNjM1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEyLTA0LTA2ICBWaWN0 b3IgQ2FyYnVuZSAgPHZjYXJidW5lQGFkb2JlLmNvbT4KKworICAgICAgICBUaGUgbWVkaWEgY29u dHJvbHMgcGFuZWwgbmVlZHMgc2hvdWxkIHRvZ2dsZSB0aGUgZGlzcGxheTpub25lIHByb3BlcnR5 CisgICAgICAgIGNvcnJlY3RseSBhbmQgZWZmaWNpZW50bHkgd2hlbiB0aGUgZmFkZSB0cmFuc2l0 aW9uIGVuZHMuCisKKyAgICAgICAgVGhlIHRpbWVyIGhhcyBiZWVuIHJlbW92ZWQgYW5kIHRoZSBk aXNwYXRjaEV2ZW50IG1ldGhvZCBpcyB1c2VkCisgICAgICAgIGluIG9yZGVyIHRvIGNhdGNoIHRo ZSB0cmFuc2l0aW9uIGVuZCBldmVudC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODI0NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUZXN0OiBtZWRpYS92aWRlby1jb250cm9scy10b2dnbGluZy5odG1s CisKKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6Ok1lZGlhQ29udHJvbFBhbmVs RWxlbWVudCk6CisgICAgICAgIFJlbW92ZWQgdGltZXIuCisgICAgICAgIChXZWJDb3JlOjpNZWRp YUNvbnRyb2xQYW5lbEVsZW1lbnQ6Om1ha2VPcGFxdWUpOiBVc2VkIGJvb2xlYW4gdmFyaWFibGUK KyAgICAgICAgYmVmb3JlIGNhbGxpbmcgc2hvdyBvbiB0aGUgcGFuZWwgZWxlbWVudC4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6bWFrZVRyYW5zcGFyZW50KTog UmVtb3ZlZCB0aGUgdXNlIG9mCisgICAgICAgIGEgdGltZXIuCisgICAgICAgIChXZWJDb3JlKToK KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6c2V0RGlzcGxheWVk KTogTWV0aG9kIHVzZWQgdG8KKyAgICAgICAgaW5mb3JtIHRoZSBwYW5lbCBlbGVtZW50IHdoZXRo ZXIgaXQgc2hvdWxkIGV2ZXIgYmUgZGlzcGxheWVkIG9yIG5vdC4KKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6ZGlzcGF0Y2hFdmVudCk6IE92ZXJyaWRpbmcgZGlz cGF0Y2hFdmVudAorICAgICAgICBtZXRob2QgaW4gb3JkZXIgdG8gaGlkZSB0aGUgcGFuZWwgZWxl bWVudCB3aGVuIHRyYW5zaXRpb24gZW5kIGV2ZW50IGlzIGZpcmVkLgorICAgICAgICAqIGh0bWwv c2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmg6CisgICAgICAgIChNZWRpYUNvbnRyb2xQYW5l bEVsZW1lbnQpOiBSZW1vdmVkIHRpbWVyIGZ1bmN0aW9ucy4KKyAgICAgICAgKiBodG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xSb290RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNv bnRyb2xSb290RWxlbWVudDo6c2hvdyk6IEluZm9ybSB0aGUgcGFuZWwgdGhhdCBpdCBpcyB2aXNp YmxlLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUm9vdEVsZW1lbnQ6OmhpZGUpOiBJ bmZvcm0gdGhlIHBhbmVsIHRoYXQgaXQgaXMgbm90IHZpc2libGUuCisgICAgICAgICogaHRtbC9z aGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpzaG93KTogU2FtZS4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW06OmhpZGUpOiBTYW1l LgorCiAyMDEyLTA0LTA1ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBhYmlsaXR5IHRvIGNvcHkgcmVzb3VyY2UgVVJM IGZyb20gd2ViIGluc3BlY3RvcidzIHJlc291cmNlcyBwYWdlLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwIGIvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCmluZGV4IDBmMzQ1Mzg4 MDhkYmI3Y2RkNTQ5ZWVjODMxMjE5ZWY5NGM5YTUwNTguLmM0ZjJkMmQ2MTNiNTZjOTNkMGZiMTAw ZmQzYTI0ZTEwZjI1YzQ0M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93 L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKQEAgLTU0LDYgKzU0LDcgQEAKICNpbmNsdWRlICJT Y3JpcHRDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJUZXh0 LmgiCisjaW5jbHVkZSAiV2ViS2l0VHJhbnNpdGlvbkV2ZW50LmgiCiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIApAQCAtMTA5LDcgKzExMCw3IEBAIGlubGluZSBNZWRpYUNvbnRyb2xQYW5lbEVsZW1l bnQ6Ok1lZGlhQ29udHJvbFBhbmVsRWxlbWVudChEb2N1bWVudCogZG9jdW1lbnQpCiAgICAgLCBt X2NhbkJlRHJhZ2dlZChmYWxzZSkKICAgICAsIG1faXNCZWluZ0RyYWdnZWQoZmFsc2UpCiAgICAg LCBtX29wYXF1ZSh0cnVlKQotICAgICwgbV90cmFuc2l0aW9uVGltZXIodGhpcywgJk1lZGlhQ29u dHJvbFBhbmVsRWxlbWVudDo6dHJhbnNpdGlvblRpbWVyRmlyZWQpCisgICAgLCBtX2Rpc3BsYXll ZChmYWxzZSkKIHsKIH0KIApAQCAtMTc2LDMyICsxNzcsNiBAQCB2b2lkIE1lZGlhQ29udHJvbFBh bmVsRWxlbWVudDo6ZW5kRHJhZygpCiAgICAgZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5zZXRDYXB0 dXJpbmdNb3VzZUV2ZW50c05vZGUoMCk7CiB9CiAKLXZvaWQgTWVkaWFDb250cm9sUGFuZWxFbGVt ZW50OjpzdGFydFRpbWVyKCkKLXsKLSAgICBzdG9wVGltZXIoKTsKLQotICAgIC8vIFRoZSB0aW1l ciBpcyByZXF1aXJlZCB0byBzZXQgdGhlIHByb3BlcnR5IGRpc3BsYXk6J25vbmUnIG9uIHRoZSBw YW5lbCwKLSAgICAvLyBzdWNoIHRoYXQgY2FwdGlvbnMgYXJlIGNvcnJlY3RseSBkaXNwbGF5ZWQg YXQgdGhlIGJvdHRvbSBvZiB0aGUgdmlkZW8KLSAgICAvLyBhdCB0aGUgZW5kIG9mIHRoZSBmYWRl b3V0IHRyYW5zaXRpb24uCi0gICAgZG91YmxlIGR1cmF0aW9uID0gZG9jdW1lbnQoKS0+cGFnZSgp ID8gZG9jdW1lbnQoKS0+cGFnZSgpLT50aGVtZSgpLT5tZWRpYUNvbnRyb2xzRmFkZU91dER1cmF0 aW9uKCkgOiAwOwotICAgIG1fdHJhbnNpdGlvblRpbWVyLnN0YXJ0T25lU2hvdChkdXJhdGlvbik7 Ci19Ci0KLXZvaWQgTWVkaWFDb250cm9sUGFuZWxFbGVtZW50OjpzdG9wVGltZXIoKQotewotICAg IGlmIChtX3RyYW5zaXRpb25UaW1lci5pc0FjdGl2ZSgpKQotICAgICAgICBtX3RyYW5zaXRpb25U aW1lci5zdG9wKCk7Ci19Ci0KLQotdm9pZCBNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6OnRyYW5z aXRpb25UaW1lckZpcmVkKFRpbWVyPE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudD4qKQotewotICAg IGlmICghbV9vcGFxdWUpCi0gICAgICAgIGhpZGUoKTsKLQotICAgIHN0b3BUaW1lcigpOwotfQot CiB2b2lkIE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6c2V0UG9zaXRpb24oY29uc3QgTGF5b3V0 UG9pbnQmIHBvc2l0aW9uKQogewogICAgIGRvdWJsZSBsZWZ0ID0gcG9zaXRpb24ueCgpOwpAQCAt MjQyLDkgKzIxNyw4IEBAIHZvaWQgTWVkaWFDb250cm9sUGFuZWxFbGVtZW50OjptYWtlT3BhcXVl KCkKIAogICAgIG1fb3BhcXVlID0gdHJ1ZTsKIAotICAgIC8vIEZJWE1FKEJVRyA3OTM0Nyk6IFRo ZSBkaXNwbGF5Om5vbmUgcHJvcGVydHkgc2hvdWxkIGJlIHRvZ2dsZWQgYmVsb3cgb25seQotICAg IC8vIHdoZW4gZGlzcGxheSBsb2dpYyBpcyBpbnRyb2R1Y2VkLgotICAgIC8vIHNob3coKTsKKyAg ICBpZiAobV9kaXNwbGF5ZWQpCisgICAgICAgIHNob3coKTsKIH0KIAogdm9pZCBNZWRpYUNvbnRy b2xQYW5lbEVsZW1lbnQ6Om1ha2VUcmFuc3BhcmVudCgpCkBAIC0yNTcsMTAgKzIzMSwyMyBAQCB2 b2lkIE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6bWFrZVRyYW5zcGFyZW50KCkKICAgICBzZXRJ bmxpbmVTdHlsZVByb3BlcnR5KENTU1Byb3BlcnR5T3BhY2l0eSwgMC4wLCBDU1NQcmltaXRpdmVW YWx1ZTo6Q1NTX05VTUJFUik7CiAKICAgICBtX29wYXF1ZSA9IGZhbHNlOworfQorCit2b2lkIE1l ZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6c2V0RGlzcGxheWVkKGJvb2wgZGlzcGxheWVkKQorewor ICAgIG1fZGlzcGxheWVkID0gZGlzcGxheWVkOworfQorCitib29sIE1lZGlhQ29udHJvbFBhbmVs RWxlbWVudDo6ZGlzcGF0Y2hFdmVudChQYXNzUmVmUHRyPEV2ZW50PiBldmVudCkKK3sKKyAgICBp ZiAoZXZlbnQtPnR5cGUoKSAhPSBldmVudE5hbWVzKCkud2Via2l0VHJhbnNpdGlvbkVuZEV2ZW50 KQorICAgICAgICByZXR1cm4gSFRNTERpdkVsZW1lbnQ6OmRpc3BhdGNoRXZlbnQoZXZlbnQpOwor CisgICAgV2ViS2l0VHJhbnNpdGlvbkV2ZW50KiB0cmFuc2l0aW9uRXZlbnQgPSBzdGF0aWNfY2Fz dDxXZWJLaXRUcmFuc2l0aW9uRXZlbnQqPihldmVudC5nZXQoKSk7CisgICAgaWYgKCFtX29wYXF1 ZSAmJiB0cmFuc2l0aW9uRXZlbnQtPnByb3BlcnR5TmFtZSgpID09IGdldFByb3BlcnR5TmFtZShD U1NQcm9wZXJ0eU9wYWNpdHkpKQorICAgICAgICBoaWRlKCk7CiAKLSAgICAvLyBGSVhNRShCVUcg NzkzNDcpOiBUaGUgZGlzcGxheTpub25lIHByb3BlcnR5IHNob3VsZCBiZSB0b2dnbGVkIGJlbG93 Ci0gICAgLy8gKHRocm91Z2ggdGhlIHRpbWVyIHN0YXJ0KSB3aGVuIGRpc3BsYXkgbG9naWMgaXMg aW50cm9kdWNlZC4KLSAgICAvLyBzdGFydFRpbWVyKCk7CisgICAgcmV0dXJuIEhUTUxEaXZFbGVt ZW50OjpkaXNwYXRjaEV2ZW50KGV2ZW50KTsKIH0KIAogdm9pZCBNZWRpYUNvbnRyb2xQYW5lbEVs ZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuaCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmgKaW5kZXggZWZhNjlhNThj NWE2ZTJhZmM2NmJiMTVhMjNiMzM4NTcxZWFlZTQ5Ny4uYzVkOTg4ZjRhZTQ3NjgwMjk5ZDQ0NzQy MThmNDBlZDE5NTNjYzNmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv TWVkaWFDb250cm9sRWxlbWVudHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9N ZWRpYUNvbnRyb2xFbGVtZW50cy5oCkBAIC0xMTIsNiArMTEyLDkgQEAgcHVibGljOgogICAgIHZv aWQgcmVzZXRQb3NpdGlvbigpOwogICAgIHZvaWQgbWFrZU9wYXF1ZSgpOwogICAgIHZvaWQgbWFr ZVRyYW5zcGFyZW50KCk7CisgICAgdm9pZCBzZXREaXNwbGF5ZWQoYm9vbCk7CisKKyAgICB2aXJ0 dWFsIGJvb2wgZGlzcGF0Y2hFdmVudChQYXNzUmVmUHRyPEV2ZW50Pik7CiAKIHByaXZhdGU6CiAg ICAgTWVkaWFDb250cm9sUGFuZWxFbGVtZW50KERvY3VtZW50Kik7CkBAIC0xMjMsMTkgKzEyNiwx NCBAQCBwcml2YXRlOgogICAgIHZvaWQgY29udGludWVEcmFnKGNvbnN0IExheW91dFBvaW50JiBl dmVudExvY2F0aW9uKTsKICAgICB2b2lkIGVuZERyYWcoKTsKIAotICAgIHZvaWQgc3RhcnRUaW1l cigpOwotICAgIHZvaWQgc3RvcFRpbWVyKCk7Ci0gICAgdm9pZCB0cmFuc2l0aW9uVGltZXJGaXJl ZChUaW1lcjxNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ+Kik7Ci0KICAgICB2b2lkIHNldFBvc2l0 aW9uKGNvbnN0IExheW91dFBvaW50Jik7CiAKICAgICBib29sIG1fY2FuQmVEcmFnZ2VkOwogICAg IGJvb2wgbV9pc0JlaW5nRHJhZ2dlZDsKICAgICBib29sIG1fb3BhcXVlOworICAgIGJvb2wgbV9k aXNwbGF5ZWQ7CiAgICAgTGF5b3V0UG9pbnQgbV9kcmFnU3RhcnRQb3NpdGlvbjsKICAgICBMYXlv dXRQb2ludCBtX2RyYWdTdGFydEV2ZW50TG9jYXRpb247Ci0KLSAgICBUaW1lcjxNZWRpYUNvbnRy b2xQYW5lbEVsZW1lbnQ+IG1fdHJhbnNpdGlvblRpbWVyOwogfTsKIAogLy8gLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv TWVkaWFDb250cm9sUm9vdEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv TWVkaWFDb250cm9sUm9vdEVsZW1lbnQuY3BwCmluZGV4IDQ1MDVmZGU4MGU5NGFiMjNhZjM4YTkx MThiZDE3ZjNjOTc2MjFkMzQuLmFkNWY0Nzc0NjcwYThmMTQyMTgwYTVkMmFjNTdlY2IyYjkzZWI0 MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJv b3RFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRy b2xSb290RWxlbWVudC5jcHAKQEAgLTI4MiwxMSArMjgyLDEzIEBAIHZvaWQgTWVkaWFDb250cm9s Um9vdEVsZW1lbnQ6OnNldE1lZGlhQ29udHJvbGxlcihNZWRpYUNvbnRyb2xsZXJJbnRlcmZhY2Uq IGNvbnRyCiAKIHZvaWQgTWVkaWFDb250cm9sUm9vdEVsZW1lbnQ6OnNob3coKQogeworICAgIG1f cGFuZWwtPnNldERpc3BsYXllZCh0cnVlKTsKICAgICBtX3BhbmVsLT5zaG93KCk7CiB9CiAKIHZv aWQgTWVkaWFDb250cm9sUm9vdEVsZW1lbnQ6OmhpZGUoKQogeworICAgIG1fcGFuZWwtPnNldERp c3BsYXllZChmYWxzZSk7CiAgICAgbV9wYW5lbC0+aGlkZSgpOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVt LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50 Q2hyb21pdW0uY3BwCmluZGV4IGJlZDJhYmI4NTEzZGUzZjMyOTc3YzNiYWZmZGM2OGY4ZTY5MGFl OGQuLjM5MGVmYWNhNWU3YWE2NTg2MzZjMjk5N2FmYjM2ZWI1N2Y1MDAzNTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21p dW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RF bGVtZW50Q2hyb21pdW0uY3BwCkBAIC0xNjQsMTEgKzE2NCwxMyBAQCB2b2lkIE1lZGlhQ29udHJv bFJvb3RFbGVtZW50Q2hyb21pdW06OnNldE1lZGlhQ29udHJvbGxlcihNZWRpYUNvbnRyb2xsZXJJ bnRlcmZhYwogCiB2b2lkIE1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW06OnNob3coKQog eworICAgIG1fcGFuZWwtPnNldERpc3BsYXllZCh0cnVlKTsKICAgICBtX3BhbmVsLT5zaG93KCk7 CiB9CiAKIHZvaWQgTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6aGlkZSgpCiB7Cisg ICAgbV9wYW5lbC0+c2V0RGlzcGxheWVkKGZhbHNlKTsKICAgICBtX3BhbmVsLT5oaWRlKCk7CiB9 CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCBmMDgzYzg5YjNiMmE0N2ZmYmU0MmUyNjA2MGVkYzk5MDIyYTMyN2NhLi41MDdm ODgwZjc1NDkzZDRiYzFlZTRkYWIyZDYzMWNiODBlMzBjNmMxIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMDQtMDYgIFZpY3RvciBDYXJidW5lICA8dmNhcmJ1bmVAYWRvYmUuY29tPgorCisg ICAgICAgIEFkZGVkIHRlc3QgdG8gZW5zdXJlIHRoYXQgY29udHJvbHMgYXJlIG5vdCBkaXNwbGF5 ZWQgd2hlbgorICAgICAgICB0aGUgY29udHJvbHMgYXR0cmlidXRlIGlzIG5vdCBzZXQuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyNDc2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBtZWRpYS92aWRl by1jb250cm9scy10b2dnbGluZy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlh L3ZpZGVvLWNvbnRyb2xzLXRvZ2dsaW5nLmh0bWw6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL3Zp ZGVvLXRlc3QuanM6IE1pbm9yIGNoYW5nZSB0byB0aGUgd2FpdEZvckV2ZW50IG1ldGhvZAorICAg ICAgICBpbiBvcmRlciB0byBiZSBhYmxlIHdhaXQgZm9yIGV2ZW50cyBvbiBvdGhlciBlbGVtZW50 cyB0aGFuIHRoZSBtZWRpYQorICAgICAgICBlbGVtZW50IGFzIHdlbGwuCisgICAgICAgICh3YWl0 Rm9yRXZlbnQuX2V2ZW50Q2FsbGJhY2spOgorICAgICAgICAod2FpdEZvckV2ZW50KToKKwogMjAx Mi0wNC0wNSAgWm9sdGFuIEFydmFpICA8emFydmFpQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAg ICBbUXRdW1dLMl0gU2tpcCB0ZXN0cyB0aGF0IHN0aWxsIGZhaWxpbmcgYWZ0ZXIgaW1wbGVtZW50 aW5nIGxheW91dFRlc3RDb250cm9sbGVyLnNldFBhZ2VWaXNpYmlsaXR5KCkKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRyb2xzLXRvZ2dsaW5nLWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRyb2xzLXRvZ2dsaW5nLWV4cGVjdGVkLnR4dApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi5hNzYyNDhlODBlN2U3ZTA1MTAxNTQ1MWNkMTJjZWNlNjNiZDRlYzVhCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtdG9nZ2xpbmct ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjkgQEAKK1Rlc3RzIHRoYXQgc2hvd2luZyAvIGhpZGlu ZyB2aWRlbyBjb250cm9scyB1c2VzIHRoZSBzZXRzIHRoZSBkaXNwbGF5Om5vbmUgcHJvcGVydHkK KworKiogUGxheWluZyB0aGUgdmlkZW8gKioKK1JVTih2aWRlby5wbGF5KCkpCisKKyoqIE1vdmUg bW91c2Ugc29tZXdoZXJlIG92ZXIgdGhlIHBhbmVsICoqCitSVU4oZXZlbnRTZW5kZXIubW91c2VN b3ZlVG8obXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzBdLCBtdXRlQnV0dG9uQ29vcmRpbmF0ZXNbMV0p KQorCisqKiBUZXN0IHRoYXQgY29udHJvbHMgYXJlIHNob3duIHdoZW4gY29udHJvbHMgYXR0cmli dXRlIGlzIHByZXNlbnQgKioKK0VYUEVDVEVEIChwYW5lbC5zdHlsZVsnZGlzcGxheSddICE9ICdu b25lJykgT0sKKworKiogTW92ZSBtb3VzZSBvdXRzaWRlIHRoZSB2aWRlbyAqKgorUlVOKGV2ZW50 U2VuZGVyLm1vdXNlTW92ZVRvKHZpZGVvLm9mZnNldExlZnQsIHZpZGVvLm9mZnNldFRvcCArIDIg KiB2aWRlby5vZmZzZXRIZWlnaHQpKQorRVZFTlQod2Via2l0VHJhbnNpdGlvbkVuZCkKKworKiog VGhlIGNvbnRyb2xzIHNob3VsZCBoYXZlIHRoZSBkaXNwbGF5IHByb3BlcnR5IHNldCB0byBub25l CitFWFBFQ1RFRCAocGFuZWwuc3R5bGVbJ2Rpc3BsYXknXSA9PSAnbm9uZScpIE9LCisKKyoqIFJl bW92ZSBjb250cm9scyBhdHRyaWJ1dGUqKgorUlVOKHZpZGVvLnJlbW92ZUF0dHJpYnV0ZSgnY29u dHJvbHMnKSkKKworKiogTW92ZSBtb3VzZSBiYWNrIG92ZXIgdGhlIHBhbmVsICoqCitSVU4oZXZl bnRTZW5kZXIubW91c2VNb3ZlVG8obXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzBdLCBtdXRlQnV0dG9u Q29vcmRpbmF0ZXNbMV0pKQorCisqKiBWaWRlbyBjb250cm9scyBzaG91bGQgbm90IGJlIHNob3du ICoqCitFWFBFQ1RFRCAocGFuZWwuc3R5bGVbJ2Rpc3BsYXknXSA9PSAnbm9uZScpIE9LCisKK0VO RCBPRiBURVNUCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRyb2xz LXRvZ2dsaW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy10b2dnbGlu Zy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLmJhNjAwNGZmNjIxYzQ5YjU2NTMzN2RmNjkwMWEzZWI4ZWI3ZTky MmUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy10 b2dnbGluZy5odG1sCkBAIC0wLDAgKzEsODEgQEAKKzxodG1sPgorPGhlYWQ+CisgICAgPHRpdGxl PlRlc3QgcmVuZGVyaW5nIG9mIHZvbHVtZSBzbGlkZXIgb2YgdmlkZW8gdGFnPC90aXRsZT4KKyAg ICA8c2NyaXB0IHNyYz1tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPW1l ZGlhLWNvbnRyb2xzLmpzPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPXZpZGVvLXRlc3QuanM+ PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICAgICAgdmFyIHZpZGVvOworICAgICAgICB2YXIg cGFuZWw7CisgICAgICAgIHZhciBtdXRlQnV0dG9uQ29vcmRpbmF0ZXM7CisKKyAgICAgICAgZnVu Y3Rpb24gaW5pdCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIHZpZGVvID0gZG9jdW1lbnQuZ2V0 RWxlbWVudHNCeVRhZ05hbWUoInZpZGVvIilbMF07CisgICAgICAgICAgICB2aWRlby5zcmMgPSBm aW5kTWVkaWFGaWxlKCJ2aWRlbyIsICJjb250ZW50L3Rlc3QiKTsKKworICAgICAgICAgICAgY29u c29sZVdyaXRlKCIiKTsKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiKiogUGxheWluZyB0aGUg dmlkZW8gKioiKTsKKyAgICAgICAgICAgIHJ1bigidmlkZW8ucGxheSgpIik7CisgICAgICAgIH0K KworICAgICAgICBmdW5jdGlvbiB0ZXN0KCkKKyAgICAgICAgeworICAgICAgICAgICAgcGFuZWwg PSBtZWRpYUNvbnRyb2xzRWxlbWVudChpbnRlcm5hbHMuc2hhZG93Um9vdCh2aWRlbykuZmlyc3RD aGlsZCwgIi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwiKTsKKworICAgICAgICAgICAgaWYg KHdpbmRvdy5ldmVudFNlbmRlcikgeworICAgICAgICAgICAgICAgIHRyeSB7CisgICAgICAgICAg ICAgICAgICAgIG11dGVCdXR0b25Db29yZGluYXRlcyA9IG1lZGlhQ29udHJvbHNCdXR0b25Db29y ZGluYXRlcyh2aWRlbywgIm11dGUtYnV0dG9uIik7CisgICAgICAgICAgICAgICAgfSBjYXRjaCAo ZXhjZXB0aW9uKSB7CisgICAgICAgICAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5v dGlmeURvbmUoKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAg IH0KKworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICAgICAg Y29uc29sZVdyaXRlKCIqKiBNb3ZlIG1vdXNlIHNvbWV3aGVyZSBvdmVyIHRoZSBwYW5lbCAqKiIp OworICAgICAgICAgICAgICAgIHJ1bigiZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8obXV0ZUJ1dHRv bkNvb3JkaW5hdGVzWzBdLCBtdXRlQnV0dG9uQ29vcmRpbmF0ZXNbMV0pIik7CisgICAgICAgICAg ICB9CisKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICBjb25zb2xl V3JpdGUoIioqIFRlc3QgdGhhdCBjb250cm9scyBhcmUgc2hvd24gd2hlbiBjb250cm9scyBhdHRy aWJ1dGUgaXMgcHJlc2VudCAqKiIpOworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJwYW5lbC5z dHlsZVsnZGlzcGxheSddIiwgJ25vbmUnLCAiIT0iKTsKKworICAgICAgICAgICAgaWYgKHdpbmRv dy5ldmVudFNlbmRlcikgeworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAg ICAgICAgICAgICAgY29uc29sZVdyaXRlKCIqKiBNb3ZlIG1vdXNlIG91dHNpZGUgdGhlIHZpZGVv ICoqIik7CisgICAgICAgICAgICAgICAgcnVuKCJldmVudFNlbmRlci5tb3VzZU1vdmVUbyh2aWRl by5vZmZzZXRMZWZ0LCB2aWRlby5vZmZzZXRUb3AgKyAyICogdmlkZW8ub2Zmc2V0SGVpZ2h0KSIp OworICAgICAgICAgICAgfQorCisgICAgICAgICAgICB3YWl0Rm9yRXZlbnQoIndlYmtpdFRyYW5z aXRpb25FbmQiLCBjb250aW51ZVRlc3QsIGZhbHNlLCB0cnVlLCBwYW5lbCk7CisgICAgICAgIH0K KworICAgICAgICBmdW5jdGlvbiBjb250aW51ZVRlc3QoKQorICAgICAgICB7CisgICAgICAgICAg ICBjb25zb2xlV3JpdGUoIiIpOworICAgICAgICAgICAgY29uc29sZVdyaXRlKCIqKiBUaGUgY29u dHJvbHMgc2hvdWxkIGhhdmUgdGhlIGRpc3BsYXkgcHJvcGVydHkgc2V0IHRvIG5vbmUiKTsKKyAg ICAgICAgICAgIHRlc3RFeHBlY3RlZCgicGFuZWwuc3R5bGVbJ2Rpc3BsYXknXSIsICdub25lJywg Ij09Iik7CisKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICBjb25z b2xlV3JpdGUoIioqIFJlbW92ZSBjb250cm9scyBhdHRyaWJ1dGUqKiIpOworICAgICAgICAgICAg cnVuKCJ2aWRlby5yZW1vdmVBdHRyaWJ1dGUoJ2NvbnRyb2xzJykiKTsKKworICAgICAgICAgICAg Y29uc29sZVdyaXRlKCIiKTsKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiKiogTW92ZSBtb3Vz ZSBiYWNrIG92ZXIgdGhlIHBhbmVsICoqIik7CisgICAgICAgICAgICBydW4oImV2ZW50U2VuZGVy Lm1vdXNlTW92ZVRvKG11dGVCdXR0b25Db29yZGluYXRlc1swXSwgbXV0ZUJ1dHRvbkNvb3JkaW5h dGVzWzFdKSIpOworCisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAgICAgICAgICAg Y29uc29sZVdyaXRlKCIqKiBWaWRlbyBjb250cm9scyBzaG91bGQgbm90IGJlIHNob3duICoqIik7 CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInBhbmVsLnN0eWxlWydkaXNwbGF5J10iLCAnbm9u ZScsICI9PSIpOworCisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworCisgICAgICAgICAg ICBlbmRUZXN0KCk7CisgICAgICAgIH0KKworICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkg b25sb2FkPSJpbml0KCkiPgorICAgIFRlc3RzIHRoYXQgc2hvd2luZyAvIGhpZGluZyB2aWRlbyBj b250cm9scyB1c2VzIHRoZSBzZXRzIHRoZSBkaXNwbGF5Om5vbmUgcHJvcGVydHk8YnI+CisgICAg PHZpZGVvIG9ucGxheT0idGVzdCgpIiBjb250cm9scz48L3ZpZGVvPgorPC9ib2R5PgorPC9odG1s PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tdGVzdC5qcyBiL0xheW91dFRl c3RzL21lZGlhL3ZpZGVvLXRlc3QuanMKaW5kZXggZWJmMGY0MzU0MDA4MDQ1N2ViMzRlNzA1MjM1 NjQ4YjkyMzUyNzFhMS4uMDM3OTVmMWVkNDIzMDgxY2MxMzUyMmQzNzEwMjhiMzMyYjEyMzRiMyAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tdGVzdC5qcworKysgYi9MYXlvdXRU ZXN0cy9tZWRpYS92aWRlby10ZXN0LmpzCkBAIC0xMzcsMTIgKzEzNywxNSBAQCBmdW5jdGlvbiB3 YWl0Rm9yRXZlbnRBbmRFbmQoZXZlbnROYW1lLCBmdW5jU3RyaW5nKQogICAgIHdhaXRGb3JFdmVu dChldmVudE5hbWUsIGZ1bmNTdHJpbmcsIHRydWUpCiB9CiAKLWZ1bmN0aW9uIHdhaXRGb3JFdmVu dChldmVudE5hbWUsIGZ1bmMsIGVuZGl0LCBvbmVUaW1lT25seSkKK2Z1bmN0aW9uIHdhaXRGb3JF dmVudChldmVudE5hbWUsIGZ1bmMsIGVuZGl0LCBvbmVUaW1lT25seSwgZWxlbWVudCkKIHsKICAg ICBmdW5jdGlvbiBfZXZlbnRDYWxsYmFjayhldmVudCkKICAgICB7CisgICAgICAgIGlmICghZWxl bWVudCkKKyAgICAgICAgICAgIGVsZW1lbnQgPSBtZWRpYUVsZW1lbnQ7CisKICAgICAgICAgaWYg KG9uZVRpbWVPbmx5KQotICAgICAgICAgICAgbWVkaWFFbGVtZW50LnJlbW92ZUV2ZW50TGlzdGVu ZXIoZXZlbnROYW1lLCBfZXZlbnRDYWxsYmFjaywgdHJ1ZSk7CisgICAgICAgICAgICBlbGVtZW50 LnJlbW92ZUV2ZW50TGlzdGVuZXIoZXZlbnROYW1lLCBfZXZlbnRDYWxsYmFjaywgdHJ1ZSk7CiAK ICAgICAgICAgY29uc29sZVdyaXRlKCJFVkVOVCgiICsgZXZlbnROYW1lICsgIikiKTsKIApAQCAt MTUzLDcgKzE1Niw3IEBAIGZ1bmN0aW9uIHdhaXRGb3JFdmVudChldmVudE5hbWUsIGZ1bmMsIGVu ZGl0LCBvbmVUaW1lT25seSkKICAgICAgICAgICAgIGVuZFRlc3QoKTsKICAgICB9CiAKLSAgICBt ZWRpYUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcihldmVudE5hbWUsIF9ldmVudENhbGxiYWNrLCB0 cnVlKTsKKyAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoZXZlbnROYW1lLCBfZXZlbnRDYWxs YmFjaywgdHJ1ZSk7CiB9CiAKIGZ1bmN0aW9uIHdhaXRGb3JFdmVudFRlc3RBbmRFbmQoZXZlbnRO YW1lLCB0ZXN0RnVuY1N0cmluZykK 136291 2012-04-09 13:22:06 -0700 2012-04-09 13:26:07 -0700 Simple patch bug-82476-20120409232204.patch text/plain 11032 vcarbune U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE1NTNkMjZkNDA1NGE4 NDk5ZGE0Y2JiMzRiMjdkOGFhMzY2ZTRhNy4uNjAyYTRkYzhmNTI3ZjdmNjVkYTlhMmNjODhiNDc1 Yzg5ZTFiMmU1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA0LTA5ICBWaWN0 b3IgQ2FyYnVuZSAgPHZjYXJidW5lQGFkb2JlLmNvbT4KKworICAgICAgICBUaGlzIHBhdGNoIGZp eGVzIGEgYnVnIHdoaWNoIGNhdXNlZCB0aGUgY29udHJvbHMgdG8gYmUgZGlzcGxheWVkCisgICAg ICAgIHdoZW4gdGhleSBzaG91bGQgcmVtYWluIGhpZGRlbi4gQWRkZWQgYW4gZXh0cmEgdmFyaWFi bGUgdG8gdGhlCisgICAgICAgIHBhbmVsIGVsZW1lbnRzIHdoaWNoIHByb3Blcmx5IGtlZXBzIHRo ZSBzdGF0ZSBvZiB0aGUgcGFuZWwgKHZpc2libGUgb3Igbm90KS4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI0NzYKKworICAgICAgICBUZXN0OiBt ZWRpYS92aWRlby1jb250cm9scy10b2dnbGluZy5odG1sCisKKyAgICAgICAgKiBodG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRy b2xQYW5lbEVsZW1lbnQ6Ok1lZGlhQ29udHJvbFBhbmVsRWxlbWVudCk6IEFkZGVkIHRoZQorICAg ICAgICB2YXJpYWJsZSBtX2lzRGlzcGxheWVkIHRvIGhvbGQgdGhlIHN0YXRlIHdoZXRoZXIgdGhl IHBhbmVsIGlzIHZpc2libGUgb3Igbm90LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9s UGFuZWxFbGVtZW50OjptYWtlT3BhcXVlKTogU2hvd2luZyB0aGUgcGFuZWwgb25seSBpZiBpdAor ICAgICAgICBpcyB2aXNpYmxlLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUGFuZWxF bGVtZW50OjptYWtlVHJhbnNwYXJlbnQpOiBFbmFibGVkIHRoZSB0cmFuc2l0aW9uCisgICAgICAg IHRpbWVyIHdoaWNoIHNldHMgdGhlIGRpc3BsYXk6bm9uZSBwcm9wZXJ0eSBvbiB0aGUgY29udHJv bHMuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6OnNldElzRGlz cGxheWVkKTogU2V0dGVyIGZvciB0aGUgc3RhdGUgdmFyaWFibGUuCisgICAgICAgIChXZWJDb3Jl KToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oOgorICAgICAg ICAoTWVkaWFDb250cm9sUGFuZWxFbGVtZW50KToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRp YUNvbnRyb2xSb290RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xS b290RWxlbWVudDo6c2hvdyk6IFVwZGF0ZWQgdGhlIHBhbmVsIHZpc2liaWxpdHkgc3RhdGUuCisg ICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudDo6aGlkZSk6IFVwZGF0ZWQg dGhlIHBhbmVsIHZpc2liaWxpdHkgc3RhdGUuCisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFD b250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNv bnRyb2xSb290RWxlbWVudENocm9taXVtOjpzaG93KTogVXBkYXRlZCB0aGUgcGFuZWwgdmlzaWJp bGl0eSBzdGF0ZS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hy b21pdW06OmhpZGUpOiBVcGRhdGVkIHRoZSBwYW5lbCB2aXNpYmlsaXR5IHN0YXRlLgorCiAyMDEy LTA0LTA1ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IGFkZCBhYmlsaXR5IHRvIGNvcHkgcmVzb3VyY2UgVVJMIGZyb20gd2Vi IGluc3BlY3RvcidzIHJlc291cmNlcyBwYWdlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCmluZGV4IDBmMzQ1Mzg4MDhkYmI3Y2Rk NTQ5ZWVjODMxMjE5ZWY5NGM5YTUwNTguLmM3NTgwZmE4YTRmODZmYjYwYjJmZjNmMTdiZDljYjJk ZjMzMjBkMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29u dHJvbEVsZW1lbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNv bnRyb2xFbGVtZW50cy5jcHAKQEAgLTEwOCw2ICsxMDgsNyBAQCBpbmxpbmUgTWVkaWFDb250cm9s UGFuZWxFbGVtZW50OjpNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQoRG9jdW1lbnQqIGRvY3VtZW50 KQogICAgIDogTWVkaWFDb250cm9sRWxlbWVudChkb2N1bWVudCkKICAgICAsIG1fY2FuQmVEcmFn Z2VkKGZhbHNlKQogICAgICwgbV9pc0JlaW5nRHJhZ2dlZChmYWxzZSkKKyAgICAsIG1faXNEaXNw bGF5ZWQoZmFsc2UpCiAgICAgLCBtX29wYXF1ZSh0cnVlKQogICAgICwgbV90cmFuc2l0aW9uVGlt ZXIodGhpcywgJk1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6dHJhbnNpdGlvblRpbWVyRmlyZWQp CiB7CkBAIC0yNDIsOSArMjQzLDggQEAgdm9pZCBNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6Om1h a2VPcGFxdWUoKQogCiAgICAgbV9vcGFxdWUgPSB0cnVlOwogCi0gICAgLy8gRklYTUUoQlVHIDc5 MzQ3KTogVGhlIGRpc3BsYXk6bm9uZSBwcm9wZXJ0eSBzaG91bGQgYmUgdG9nZ2xlZCBiZWxvdyBv bmx5Ci0gICAgLy8gd2hlbiBkaXNwbGF5IGxvZ2ljIGlzIGludHJvZHVjZWQuCi0gICAgLy8gc2hv dygpOworICAgIGlmIChtX2lzRGlzcGxheWVkKQorICAgICAgICBzaG93KCk7CiB9CiAKIHZvaWQg TWVkaWFDb250cm9sUGFuZWxFbGVtZW50OjptYWtlVHJhbnNwYXJlbnQoKQpAQCAtMjU4LDkgKzI1 OCw3IEBAIHZvaWQgTWVkaWFDb250cm9sUGFuZWxFbGVtZW50OjptYWtlVHJhbnNwYXJlbnQoKQog CiAgICAgbV9vcGFxdWUgPSBmYWxzZTsKIAotICAgIC8vIEZJWE1FKEJVRyA3OTM0Nyk6IFRoZSBk aXNwbGF5Om5vbmUgcHJvcGVydHkgc2hvdWxkIGJlIHRvZ2dsZWQgYmVsb3cKLSAgICAvLyAodGhy b3VnaCB0aGUgdGltZXIgc3RhcnQpIHdoZW4gZGlzcGxheSBsb2dpYyBpcyBpbnRyb2R1Y2VkLgot ICAgIC8vIHN0YXJ0VGltZXIoKTsKKyAgICBzdGFydFRpbWVyKCk7CiB9CiAKIHZvaWQgTWVkaWFD b250cm9sUGFuZWxFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKQEAg LTI5Myw2ICsyOTEsMTEgQEAgdm9pZCBNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6OnNldENhbkJl RHJhZ2dlZChib29sIGNhbkJlRHJhZ2dlZCkKICAgICAgICAgZW5kRHJhZygpOwogfQogCit2b2lk IE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6c2V0SXNEaXNwbGF5ZWQoYm9vbCBpc0Rpc3BsYXll ZCkKK3sKKyAgICBtX2lzRGlzcGxheWVkID0gaXNEaXNwbGF5ZWQ7Cit9CisKIC8vIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogaW5saW5lIE1lZGlhQ29udHJvbFRpbWVsaW5lQ29udGFp bmVyRWxlbWVudDo6TWVkaWFDb250cm9sVGltZWxpbmVDb250YWluZXJFbGVtZW50KERvY3VtZW50 KiBkb2N1bWVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlh Q29udHJvbEVsZW1lbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRy b2xFbGVtZW50cy5oCmluZGV4IGVmYTY5YTU4YzVhNmUyYWZjNjZiYjE1YTIzYjMzODU3MWVhZWU0 OTcuLjFiZGIwMWRkOGE0ZWY1MDE0Y2E0YThlMzIwNzRmOWRjNTJmYTcwNGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmgKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuaApAQCAtMTA5 LDYgKzEwOSw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xQ YW5lbEVsZW1lbnQ+IGNyZWF0ZShEb2N1bWVudCopOwogCiAgICAgdm9pZCBzZXRDYW5CZURyYWdn ZWQoYm9vbCk7CisgICAgdm9pZCBzZXRJc0Rpc3BsYXllZChib29sKTsKKwogICAgIHZvaWQgcmVz ZXRQb3NpdGlvbigpOwogICAgIHZvaWQgbWFrZU9wYXF1ZSgpOwogICAgIHZvaWQgbWFrZVRyYW5z cGFyZW50KCk7CkBAIC0xMzEsNiArMTMzLDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgbV9jYW5C ZURyYWdnZWQ7CiAgICAgYm9vbCBtX2lzQmVpbmdEcmFnZ2VkOworICAgIGJvb2wgbV9pc0Rpc3Bs YXllZDsKICAgICBib29sIG1fb3BhcXVlOwogICAgIExheW91dFBvaW50IG1fZHJhZ1N0YXJ0UG9z aXRpb247CiAgICAgTGF5b3V0UG9pbnQgbV9kcmFnU3RhcnRFdmVudExvY2F0aW9uOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnQu Y3BwCmluZGV4IDQ1MDVmZGU4MGU5NGFiMjNhZjM4YTkxMThiZDE3ZjNjOTc2MjFkMzQuLmE5ZWY4 NmIyNDg3OWIxNTFkNGY5MTI1MGZkMDU0MTM3MzFlN2I3NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudC5jcHAKQEAgLTI4 MiwxMSArMjgyLDEzIEBAIHZvaWQgTWVkaWFDb250cm9sUm9vdEVsZW1lbnQ6OnNldE1lZGlhQ29u dHJvbGxlcihNZWRpYUNvbnRyb2xsZXJJbnRlcmZhY2UqIGNvbnRyCiAKIHZvaWQgTWVkaWFDb250 cm9sUm9vdEVsZW1lbnQ6OnNob3coKQogeworICAgIG1fcGFuZWwtPnNldElzRGlzcGxheWVkKHRy dWUpOwogICAgIG1fcGFuZWwtPnNob3coKTsKIH0KIAogdm9pZCBNZWRpYUNvbnRyb2xSb290RWxl bWVudDo6aGlkZSgpCiB7CisgICAgbV9wYW5lbC0+c2V0SXNEaXNwbGF5ZWQoZmFsc2UpOwogICAg IG1fcGFuZWwtPmhpZGUoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcAppbmRleCBi ZWQyYWJiODUxM2RlM2YzMjk3N2MzYmFmZmRjNjhmOGU2OTBhZThkLi44NmVhNDg5YjViZThhNGFk YTZhOGMyOWVlZGQyYTllZGRjMWYzYTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcApA QCAtMTY0LDExICsxNjQsMTMgQEAgdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVt OjpzZXRNZWRpYUNvbnRyb2xsZXIoTWVkaWFDb250cm9sbGVySW50ZXJmYWMKIAogdm9pZCBNZWRp YUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpzaG93KCkKIHsKKyAgICBtX3BhbmVsLT5zZXRJ c0Rpc3BsYXllZCh0cnVlKTsKICAgICBtX3BhbmVsLT5zaG93KCk7CiB9CiAKIHZvaWQgTWVkaWFD b250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6aGlkZSgpCiB7CisgICAgbV9wYW5lbC0+c2V0SXNE aXNwbGF5ZWQoZmFsc2UpOwogICAgIG1fcGFuZWwtPmhpZGUoKTsKIH0KIApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGYwODNj ODliM2IyYTQ3ZmZiZTQyZTI2MDYwZWRjOTkwMjJhMzI3Y2EuLjg2NGI1ZGRmMmRjZDNiZmRmZjYz NjE0NTZhY2RlMGNlNjYzYjMzNWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wNC0wOSAg VmljdG9yIENhcmJ1bmUgIDx2Y2FyYnVuZUBhZG9iZS5jb20+CisKKyAgICAgICAgQWRkZWQgdGVz dCB0byBlbnN1cmUgdGhhdCBjb250cm9scyBhcmUgbm90IGRpc3BsYXllZCB3aGVuCisgICAgICAg IHRoZSBjb250cm9scyBhdHRyaWJ1dGUgaXMgbm90IHNldC4KKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI0NzYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1lZGlhL3ZpZGVvLWNvbnRyb2xzLXRvZ2ds aW5nLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbWVkaWEvdmlkZW8tY29udHJvbHMt dG9nZ2xpbmcuaHRtbDogQWRkZWQuCisKIDIwMTItMDQtMDUgIFpvbHRhbiBBcnZhaSAgPHphcnZh aUBpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgW1F0XVtXSzJdIFNraXAgdGVzdHMgdGhhdCBz dGlsbCBmYWlsaW5nIGFmdGVyIGltcGxlbWVudGluZyBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRQ YWdlVmlzaWJpbGl0eSgpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250 cm9scy10b2dnbGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250 cm9scy10b2dnbGluZy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTc2MjQ4ZTgwZTdlN2UwNTEw MTU0NTFjZDEyY2VjZTYzYmQ0ZWM1YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21l ZGlhL3ZpZGVvLWNvbnRyb2xzLXRvZ2dsaW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI5IEBA CitUZXN0cyB0aGF0IHNob3dpbmcgLyBoaWRpbmcgdmlkZW8gY29udHJvbHMgdXNlcyB0aGUgc2V0 cyB0aGUgZGlzcGxheTpub25lIHByb3BlcnR5CisKKyoqIFBsYXlpbmcgdGhlIHZpZGVvICoqCitS VU4odmlkZW8ucGxheSgpKQorCisqKiBNb3ZlIG1vdXNlIHNvbWV3aGVyZSBvdmVyIHRoZSBwYW5l bCAqKgorUlVOKGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKG11dGVCdXR0b25Db29yZGluYXRlc1sw XSwgbXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzFdKSkKKworKiogVGVzdCB0aGF0IGNvbnRyb2xzIGFy ZSBzaG93biB3aGVuIGNvbnRyb2xzIGF0dHJpYnV0ZSBpcyBwcmVzZW50ICoqCitFWFBFQ1RFRCAo cGFuZWwuc3R5bGVbJ2Rpc3BsYXknXSAhPSAnbm9uZScpIE9LCisKKyoqIE1vdmUgbW91c2Ugb3V0 c2lkZSB0aGUgdmlkZW8gKioKK1JVTihldmVudFNlbmRlci5tb3VzZU1vdmVUbyh2aWRlby5vZmZz ZXRMZWZ0LCB2aWRlby5vZmZzZXRUb3AgKyAyICogdmlkZW8ub2Zmc2V0SGVpZ2h0KSkKK0VWRU5U KHdlYmtpdFRyYW5zaXRpb25FbmQpCisKKyoqIFRoZSBjb250cm9scyBzaG91bGQgaGF2ZSB0aGUg ZGlzcGxheSBwcm9wZXJ0eSBzZXQgdG8gbm9uZQorRVhQRUNURUQgKHBhbmVsLnN0eWxlWydkaXNw bGF5J10gPT0gJ25vbmUnKSBPSworCisqKiBSZW1vdmUgY29udHJvbHMgYXR0cmlidXRlKioKK1JV Tih2aWRlby5yZW1vdmVBdHRyaWJ1dGUoJ2NvbnRyb2xzJykpCisKKyoqIE1vdmUgbW91c2UgYmFj ayBvdmVyIHRoZSBwYW5lbCAqKgorUlVOKGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKG11dGVCdXR0 b25Db29yZGluYXRlc1swXSwgbXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzFdKSkKKworKiogVmlkZW8g Y29udHJvbHMgc2hvdWxkIG5vdCBiZSBzaG93biAqKgorRVhQRUNURUQgKHBhbmVsLnN0eWxlWydk aXNwbGF5J10gPT0gJ25vbmUnKSBPSworCitFTkQgT0YgVEVTVAorCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy10b2dnbGluZy5odG1sIGIvTGF5b3V0VGVzdHMv bWVkaWEvdmlkZW8tY29udHJvbHMtdG9nZ2xpbmcuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zYzIyMDYwMDgy YzIzNWY4ODFlOGVhZjBlZjdkMGE1NjJkYWRlMTNmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtdG9nZ2xpbmcuaHRtbApAQCAtMCwwICsxLDgyIEBA Cis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5UZXN0IHJlbmRlcmluZyBvZiB2b2x1bWUgc2xp ZGVyIG9mIHZpZGVvIHRhZzwvdGl0bGU+CisgICAgPHNjcmlwdCBzcmM9bWVkaWEtZmlsZS5qcz48 L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz1tZWRpYS1jb250cm9scy5qcz48L3NjcmlwdD4KKyAg ICA8c2NyaXB0IHNyYz12aWRlby10ZXN0LmpzPjwvc2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAg ICAgIHZhciB2aWRlbzsKKyAgICAgICAgdmFyIHBhbmVsOworICAgICAgICB2YXIgbXV0ZUJ1dHRv bkNvb3JkaW5hdGVzOworICAgICAgICB2YXIgZmFkZW91dFRpbWUgPSAxMDAwOworCisgICAgICAg IGZ1bmN0aW9uIGluaXQoKQorICAgICAgICB7CisgICAgICAgICAgICB2aWRlbyA9IGRvY3VtZW50 LmdldEVsZW1lbnRzQnlUYWdOYW1lKCJ2aWRlbyIpWzBdOworICAgICAgICAgICAgdmlkZW8uc3Jj ID0gZmluZE1lZGlhRmlsZSgidmlkZW8iLCAiY29udGVudC90ZXN0Iik7CisKKyAgICAgICAgICAg IGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIioqIFBsYXlpbmcg dGhlIHZpZGVvICoqIik7CisgICAgICAgICAgICBydW4oInZpZGVvLnBsYXkoKSIpOworICAgICAg ICB9CisKKyAgICAgICAgZnVuY3Rpb24gdGVzdCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIHBh bmVsID0gbWVkaWFDb250cm9sc0VsZW1lbnQoaW50ZXJuYWxzLnNoYWRvd1Jvb3QodmlkZW8pLmZp cnN0Q2hpbGQsICItd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsIik7CisKKyAgICAgICAgICAg IGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsKKyAgICAgICAgICAgICAgICB0cnkgeworICAgICAg ICAgICAgICAgICAgICBtdXRlQnV0dG9uQ29vcmRpbmF0ZXMgPSBtZWRpYUNvbnRyb2xzQnV0dG9u Q29vcmRpbmF0ZXModmlkZW8sICJtdXRlLWJ1dHRvbiIpOworICAgICAgICAgICAgICAgIH0gY2F0 Y2ggKGV4Y2VwdGlvbikgeworICAgICAgICAgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxl ci5ub3RpZnlEb25lKCk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAg ICAgICB9CisKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAgICAgICAgICAg ICAgIGNvbnNvbGVXcml0ZSgiKiogTW92ZSBtb3VzZSBzb21ld2hlcmUgb3ZlciB0aGUgcGFuZWwg KioiKTsKKyAgICAgICAgICAgICAgICBydW4oImV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKG11dGVC dXR0b25Db29yZGluYXRlc1swXSwgbXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzFdKSIpOworICAgICAg ICAgICAgfQorCisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAgICAgICAgICAgY29u c29sZVdyaXRlKCIqKiBUZXN0IHRoYXQgY29udHJvbHMgYXJlIHNob3duIHdoZW4gY29udHJvbHMg YXR0cmlidXRlIGlzIHByZXNlbnQgKioiKTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgicGFu ZWwuc3R5bGVbJ2Rpc3BsYXknXSIsICdub25lJywgIiE9Iik7CisKKyAgICAgICAgICAgIGlmICh3 aW5kb3cuZXZlbnRTZW5kZXIpIHsKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwor ICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiKiogTW92ZSBtb3VzZSBvdXRzaWRlIHRoZSB2 aWRlbyAqKiIpOworICAgICAgICAgICAgICAgIHJ1bigiZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8o dmlkZW8ub2Zmc2V0TGVmdCwgdmlkZW8ub2Zmc2V0VG9wICsgMiAqIHZpZGVvLm9mZnNldEhlaWdo dCkiKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgc2V0VGltZW91dChjb250aW51ZVRl c3QsIGZhZGVvdXRUaW1lKTsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIGNvbnRpbnVl VGVzdCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAg ICAgICBjb25zb2xlV3JpdGUoIioqIFRoZSBjb250cm9scyBzaG91bGQgaGF2ZSB0aGUgZGlzcGxh eSBwcm9wZXJ0eSBzZXQgdG8gbm9uZSIpOworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJwYW5l bC5zdHlsZVsnZGlzcGxheSddIiwgJ25vbmUnLCAiPT0iKTsKKworICAgICAgICAgICAgY29uc29s ZVdyaXRlKCIiKTsKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiKiogUmVtb3ZlIGNvbnRyb2xz IGF0dHJpYnV0ZSoqIik7CisgICAgICAgICAgICBydW4oInZpZGVvLnJlbW92ZUF0dHJpYnV0ZSgn Y29udHJvbHMnKSIpOworCisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAgICAgICAg ICAgY29uc29sZVdyaXRlKCIqKiBNb3ZlIG1vdXNlIGJhY2sgb3ZlciB0aGUgcGFuZWwgKioiKTsK KyAgICAgICAgICAgIHJ1bigiZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8obXV0ZUJ1dHRvbkNvb3Jk aW5hdGVzWzBdLCBtdXRlQnV0dG9uQ29vcmRpbmF0ZXNbMV0pIik7CisKKyAgICAgICAgICAgIGNv bnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIioqIFZpZGVvIGNvbnRy b2xzIHNob3VsZCBub3QgYmUgc2hvd24gKioiKTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgi cGFuZWwuc3R5bGVbJ2Rpc3BsYXknXSIsICdub25lJywgIj09Iik7CisKKyAgICAgICAgICAgIGNv bnNvbGVXcml0ZSgiIik7CisKKyAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgfQorCisg ICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9ImluaXQoKSI+CisgICAgVGVzdHMg dGhhdCBzaG93aW5nIC8gaGlkaW5nIHZpZGVvIGNvbnRyb2xzIHVzZXMgdGhlIHNldHMgdGhlIGRp c3BsYXk6bm9uZSBwcm9wZXJ0eTxicj4KKyAgICA8dmlkZW8gb25wbGF5PSJ0ZXN0KCkiIGNvbnRy b2xzPjwvdmlkZW8+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 136293 2012-04-09 13:26:15 -0700 2012-04-10 07:43:35 -0700 Updated test expected output bug-82476-20120409232613.patch text/plain 11004 vcarbune U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE1NTNkMjZkNDA1NGE4 NDk5ZGE0Y2JiMzRiMjdkOGFhMzY2ZTRhNy4uNjAyYTRkYzhmNTI3ZjdmNjVkYTlhMmNjODhiNDc1 Yzg5ZTFiMmU1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA0LTA5ICBWaWN0 b3IgQ2FyYnVuZSAgPHZjYXJidW5lQGFkb2JlLmNvbT4KKworICAgICAgICBUaGlzIHBhdGNoIGZp eGVzIGEgYnVnIHdoaWNoIGNhdXNlZCB0aGUgY29udHJvbHMgdG8gYmUgZGlzcGxheWVkCisgICAg ICAgIHdoZW4gdGhleSBzaG91bGQgcmVtYWluIGhpZGRlbi4gQWRkZWQgYW4gZXh0cmEgdmFyaWFi bGUgdG8gdGhlCisgICAgICAgIHBhbmVsIGVsZW1lbnRzIHdoaWNoIHByb3Blcmx5IGtlZXBzIHRo ZSBzdGF0ZSBvZiB0aGUgcGFuZWwgKHZpc2libGUgb3Igbm90KS4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI0NzYKKworICAgICAgICBUZXN0OiBt ZWRpYS92aWRlby1jb250cm9scy10b2dnbGluZy5odG1sCisKKyAgICAgICAgKiBodG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRy b2xQYW5lbEVsZW1lbnQ6Ok1lZGlhQ29udHJvbFBhbmVsRWxlbWVudCk6IEFkZGVkIHRoZQorICAg ICAgICB2YXJpYWJsZSBtX2lzRGlzcGxheWVkIHRvIGhvbGQgdGhlIHN0YXRlIHdoZXRoZXIgdGhl IHBhbmVsIGlzIHZpc2libGUgb3Igbm90LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9s UGFuZWxFbGVtZW50OjptYWtlT3BhcXVlKTogU2hvd2luZyB0aGUgcGFuZWwgb25seSBpZiBpdAor ICAgICAgICBpcyB2aXNpYmxlLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUGFuZWxF bGVtZW50OjptYWtlVHJhbnNwYXJlbnQpOiBFbmFibGVkIHRoZSB0cmFuc2l0aW9uCisgICAgICAg IHRpbWVyIHdoaWNoIHNldHMgdGhlIGRpc3BsYXk6bm9uZSBwcm9wZXJ0eSBvbiB0aGUgY29udHJv bHMuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6OnNldElzRGlz cGxheWVkKTogU2V0dGVyIGZvciB0aGUgc3RhdGUgdmFyaWFibGUuCisgICAgICAgIChXZWJDb3Jl KToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oOgorICAgICAg ICAoTWVkaWFDb250cm9sUGFuZWxFbGVtZW50KToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRp YUNvbnRyb2xSb290RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xS b290RWxlbWVudDo6c2hvdyk6IFVwZGF0ZWQgdGhlIHBhbmVsIHZpc2liaWxpdHkgc3RhdGUuCisg ICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xSb290RWxlbWVudDo6aGlkZSk6IFVwZGF0ZWQg dGhlIHBhbmVsIHZpc2liaWxpdHkgc3RhdGUuCisgICAgICAgICogaHRtbC9zaGFkb3cvTWVkaWFD b250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNv bnRyb2xSb290RWxlbWVudENocm9taXVtOjpzaG93KTogVXBkYXRlZCB0aGUgcGFuZWwgdmlzaWJp bGl0eSBzdGF0ZS4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hy b21pdW06OmhpZGUpOiBVcGRhdGVkIHRoZSBwYW5lbCB2aXNpYmlsaXR5IHN0YXRlLgorCiAyMDEy LTA0LTA1ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IGFkZCBhYmlsaXR5IHRvIGNvcHkgcmVzb3VyY2UgVVJMIGZyb20gd2Vi IGluc3BlY3RvcidzIHJlc291cmNlcyBwYWdlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCmluZGV4IDBmMzQ1Mzg4MDhkYmI3Y2Rk NTQ5ZWVjODMxMjE5ZWY5NGM5YTUwNTguLmM3NTgwZmE4YTRmODZmYjYwYjJmZjNmMTdiZDljYjJk ZjMzMjBkMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29u dHJvbEVsZW1lbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNv bnRyb2xFbGVtZW50cy5jcHAKQEAgLTEwOCw2ICsxMDgsNyBAQCBpbmxpbmUgTWVkaWFDb250cm9s UGFuZWxFbGVtZW50OjpNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQoRG9jdW1lbnQqIGRvY3VtZW50 KQogICAgIDogTWVkaWFDb250cm9sRWxlbWVudChkb2N1bWVudCkKICAgICAsIG1fY2FuQmVEcmFn Z2VkKGZhbHNlKQogICAgICwgbV9pc0JlaW5nRHJhZ2dlZChmYWxzZSkKKyAgICAsIG1faXNEaXNw bGF5ZWQoZmFsc2UpCiAgICAgLCBtX29wYXF1ZSh0cnVlKQogICAgICwgbV90cmFuc2l0aW9uVGlt ZXIodGhpcywgJk1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6dHJhbnNpdGlvblRpbWVyRmlyZWQp CiB7CkBAIC0yNDIsOSArMjQzLDggQEAgdm9pZCBNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6Om1h a2VPcGFxdWUoKQogCiAgICAgbV9vcGFxdWUgPSB0cnVlOwogCi0gICAgLy8gRklYTUUoQlVHIDc5 MzQ3KTogVGhlIGRpc3BsYXk6bm9uZSBwcm9wZXJ0eSBzaG91bGQgYmUgdG9nZ2xlZCBiZWxvdyBv bmx5Ci0gICAgLy8gd2hlbiBkaXNwbGF5IGxvZ2ljIGlzIGludHJvZHVjZWQuCi0gICAgLy8gc2hv dygpOworICAgIGlmIChtX2lzRGlzcGxheWVkKQorICAgICAgICBzaG93KCk7CiB9CiAKIHZvaWQg TWVkaWFDb250cm9sUGFuZWxFbGVtZW50OjptYWtlVHJhbnNwYXJlbnQoKQpAQCAtMjU4LDkgKzI1 OCw3IEBAIHZvaWQgTWVkaWFDb250cm9sUGFuZWxFbGVtZW50OjptYWtlVHJhbnNwYXJlbnQoKQog CiAgICAgbV9vcGFxdWUgPSBmYWxzZTsKIAotICAgIC8vIEZJWE1FKEJVRyA3OTM0Nyk6IFRoZSBk aXNwbGF5Om5vbmUgcHJvcGVydHkgc2hvdWxkIGJlIHRvZ2dsZWQgYmVsb3cKLSAgICAvLyAodGhy b3VnaCB0aGUgdGltZXIgc3RhcnQpIHdoZW4gZGlzcGxheSBsb2dpYyBpcyBpbnRyb2R1Y2VkLgot ICAgIC8vIHN0YXJ0VGltZXIoKTsKKyAgICBzdGFydFRpbWVyKCk7CiB9CiAKIHZvaWQgTWVkaWFD b250cm9sUGFuZWxFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKQEAg LTI5Myw2ICsyOTEsMTEgQEAgdm9pZCBNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6OnNldENhbkJl RHJhZ2dlZChib29sIGNhbkJlRHJhZ2dlZCkKICAgICAgICAgZW5kRHJhZygpOwogfQogCit2b2lk IE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6c2V0SXNEaXNwbGF5ZWQoYm9vbCBpc0Rpc3BsYXll ZCkKK3sKKyAgICBtX2lzRGlzcGxheWVkID0gaXNEaXNwbGF5ZWQ7Cit9CisKIC8vIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIAogaW5saW5lIE1lZGlhQ29udHJvbFRpbWVsaW5lQ29udGFp bmVyRWxlbWVudDo6TWVkaWFDb250cm9sVGltZWxpbmVDb250YWluZXJFbGVtZW50KERvY3VtZW50 KiBkb2N1bWVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlh Q29udHJvbEVsZW1lbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRy b2xFbGVtZW50cy5oCmluZGV4IGVmYTY5YTU4YzVhNmUyYWZjNjZiYjE1YTIzYjMzODU3MWVhZWU0 OTcuLjFiZGIwMWRkOGE0ZWY1MDE0Y2E0YThlMzIwNzRmOWRjNTJmYTcwNGQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmgKKysrIGIv U291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuaApAQCAtMTA5 LDYgKzEwOSw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xQ YW5lbEVsZW1lbnQ+IGNyZWF0ZShEb2N1bWVudCopOwogCiAgICAgdm9pZCBzZXRDYW5CZURyYWdn ZWQoYm9vbCk7CisgICAgdm9pZCBzZXRJc0Rpc3BsYXllZChib29sKTsKKwogICAgIHZvaWQgcmVz ZXRQb3NpdGlvbigpOwogICAgIHZvaWQgbWFrZU9wYXF1ZSgpOwogICAgIHZvaWQgbWFrZVRyYW5z cGFyZW50KCk7CkBAIC0xMzEsNiArMTMzLDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgbV9jYW5C ZURyYWdnZWQ7CiAgICAgYm9vbCBtX2lzQmVpbmdEcmFnZ2VkOworICAgIGJvb2wgbV9pc0Rpc3Bs YXllZDsKICAgICBib29sIG1fb3BhcXVlOwogICAgIExheW91dFBvaW50IG1fZHJhZ1N0YXJ0UG9z aXRpb247CiAgICAgTGF5b3V0UG9pbnQgbV9kcmFnU3RhcnRFdmVudExvY2F0aW9uOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnQu Y3BwCmluZGV4IDQ1MDVmZGU4MGU5NGFiMjNhZjM4YTkxMThiZDE3ZjNjOTc2MjFkMzQuLmE5ZWY4 NmIyNDg3OWIxNTFkNGY5MTI1MGZkMDU0MTM3MzFlN2I3NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudC5jcHAKQEAgLTI4 MiwxMSArMjgyLDEzIEBAIHZvaWQgTWVkaWFDb250cm9sUm9vdEVsZW1lbnQ6OnNldE1lZGlhQ29u dHJvbGxlcihNZWRpYUNvbnRyb2xsZXJJbnRlcmZhY2UqIGNvbnRyCiAKIHZvaWQgTWVkaWFDb250 cm9sUm9vdEVsZW1lbnQ6OnNob3coKQogeworICAgIG1fcGFuZWwtPnNldElzRGlzcGxheWVkKHRy dWUpOwogICAgIG1fcGFuZWwtPnNob3coKTsKIH0KIAogdm9pZCBNZWRpYUNvbnRyb2xSb290RWxl bWVudDo6aGlkZSgpCiB7CisgICAgbV9wYW5lbC0+c2V0SXNEaXNwbGF5ZWQoZmFsc2UpOwogICAg IG1fcGFuZWwtPmhpZGUoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcAppbmRleCBi ZWQyYWJiODUxM2RlM2YzMjk3N2MzYmFmZmRjNjhmOGU2OTBhZThkLi44NmVhNDg5YjViZThhNGFk YTZhOGMyOWVlZGQyYTllZGRjMWYzYTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcApA QCAtMTY0LDExICsxNjQsMTMgQEAgdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVt OjpzZXRNZWRpYUNvbnRyb2xsZXIoTWVkaWFDb250cm9sbGVySW50ZXJmYWMKIAogdm9pZCBNZWRp YUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpzaG93KCkKIHsKKyAgICBtX3BhbmVsLT5zZXRJ c0Rpc3BsYXllZCh0cnVlKTsKICAgICBtX3BhbmVsLT5zaG93KCk7CiB9CiAKIHZvaWQgTWVkaWFD b250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6aGlkZSgpCiB7CisgICAgbV9wYW5lbC0+c2V0SXNE aXNwbGF5ZWQoZmFsc2UpOwogICAgIG1fcGFuZWwtPmhpZGUoKTsKIH0KIApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGYwODNj ODliM2IyYTQ3ZmZiZTQyZTI2MDYwZWRjOTkwMjJhMzI3Y2EuLjg2NGI1ZGRmMmRjZDNiZmRmZjYz NjE0NTZhY2RlMGNlNjYzYjMzNWIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wNC0wOSAg VmljdG9yIENhcmJ1bmUgIDx2Y2FyYnVuZUBhZG9iZS5jb20+CisKKyAgICAgICAgQWRkZWQgdGVz dCB0byBlbnN1cmUgdGhhdCBjb250cm9scyBhcmUgbm90IGRpc3BsYXllZCB3aGVuCisgICAgICAg IHRoZSBjb250cm9scyBhdHRyaWJ1dGUgaXMgbm90IHNldC4KKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI0NzYKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1lZGlhL3ZpZGVvLWNvbnRyb2xzLXRvZ2ds aW5nLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbWVkaWEvdmlkZW8tY29udHJvbHMt dG9nZ2xpbmcuaHRtbDogQWRkZWQuCisKIDIwMTItMDQtMDUgIFpvbHRhbiBBcnZhaSAgPHphcnZh aUBpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgW1F0XVtXSzJdIFNraXAgdGVzdHMgdGhhdCBz dGlsbCBmYWlsaW5nIGFmdGVyIGltcGxlbWVudGluZyBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRQ YWdlVmlzaWJpbGl0eSgpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250 cm9scy10b2dnbGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250 cm9scy10b2dnbGluZy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZWM5NTBmN2U0YmM0NzQzMDY4 ZGY4YjAxZmNjMmNjMDFkOGZmMTNmMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21l ZGlhL3ZpZGVvLWNvbnRyb2xzLXRvZ2dsaW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI4IEBA CitUZXN0cyB0aGF0IHNob3dpbmcgLyBoaWRpbmcgdmlkZW8gY29udHJvbHMgdXNlcyB0aGUgc2V0 cyB0aGUgZGlzcGxheTpub25lIHByb3BlcnR5CisKKyoqIFBsYXlpbmcgdGhlIHZpZGVvICoqCitS VU4odmlkZW8ucGxheSgpKQorCisqKiBNb3ZlIG1vdXNlIHNvbWV3aGVyZSBvdmVyIHRoZSBwYW5l bCAqKgorUlVOKGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKG11dGVCdXR0b25Db29yZGluYXRlc1sw XSwgbXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzFdKSkKKworKiogVGVzdCB0aGF0IGNvbnRyb2xzIGFy ZSBzaG93biB3aGVuIGNvbnRyb2xzIGF0dHJpYnV0ZSBpcyBwcmVzZW50ICoqCitFWFBFQ1RFRCAo cGFuZWwuc3R5bGVbJ2Rpc3BsYXknXSAhPSAnbm9uZScpIE9LCisKKyoqIE1vdmUgbW91c2Ugb3V0 c2lkZSB0aGUgdmlkZW8gKioKK1JVTihldmVudFNlbmRlci5tb3VzZU1vdmVUbyh2aWRlby5vZmZz ZXRMZWZ0LCB2aWRlby5vZmZzZXRUb3AgKyAyICogdmlkZW8ub2Zmc2V0SGVpZ2h0KSkKKworKiog VGhlIGNvbnRyb2xzIHNob3VsZCBoYXZlIHRoZSBkaXNwbGF5IHByb3BlcnR5IHNldCB0byBub25l CitFWFBFQ1RFRCAocGFuZWwuc3R5bGVbJ2Rpc3BsYXknXSA9PSAnbm9uZScpIE9LCisKKyoqIFJl bW92ZSBjb250cm9scyBhdHRyaWJ1dGUqKgorUlVOKHZpZGVvLnJlbW92ZUF0dHJpYnV0ZSgnY29u dHJvbHMnKSkKKworKiogTW92ZSBtb3VzZSBiYWNrIG92ZXIgdGhlIHBhbmVsICoqCitSVU4oZXZl bnRTZW5kZXIubW91c2VNb3ZlVG8obXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzBdLCBtdXRlQnV0dG9u Q29vcmRpbmF0ZXNbMV0pKQorCisqKiBWaWRlbyBjb250cm9scyBzaG91bGQgbm90IGJlIHNob3du ICoqCitFWFBFQ1RFRCAocGFuZWwuc3R5bGVbJ2Rpc3BsYXknXSA9PSAnbm9uZScpIE9LCisKK0VO RCBPRiBURVNUCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRyb2xz LXRvZ2dsaW5nLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy10b2dnbGlu Zy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjNjMjIwNjAwODJjMjM1Zjg4MWU4ZWFmMGVmN2QwYTU2MmRhZGUx M2YKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy10 b2dnbGluZy5odG1sCkBAIC0wLDAgKzEsODIgQEAKKzxodG1sPgorPGhlYWQ+CisgICAgPHRpdGxl PlRlc3QgcmVuZGVyaW5nIG9mIHZvbHVtZSBzbGlkZXIgb2YgdmlkZW8gdGFnPC90aXRsZT4KKyAg ICA8c2NyaXB0IHNyYz1tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPW1l ZGlhLWNvbnRyb2xzLmpzPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPXZpZGVvLXRlc3QuanM+ PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICAgICAgdmFyIHZpZGVvOworICAgICAgICB2YXIg cGFuZWw7CisgICAgICAgIHZhciBtdXRlQnV0dG9uQ29vcmRpbmF0ZXM7CisgICAgICAgIHZhciBm YWRlb3V0VGltZSA9IDEwMDA7CisKKyAgICAgICAgZnVuY3Rpb24gaW5pdCgpCisgICAgICAgIHsK KyAgICAgICAgICAgIHZpZGVvID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoInZpZGVv IilbMF07CisgICAgICAgICAgICB2aWRlby5zcmMgPSBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIsICJj b250ZW50L3Rlc3QiKTsKKworICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKKyAgICAgICAg ICAgIGNvbnNvbGVXcml0ZSgiKiogUGxheWluZyB0aGUgdmlkZW8gKioiKTsKKyAgICAgICAgICAg IHJ1bigidmlkZW8ucGxheSgpIik7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiB0ZXN0 KCkKKyAgICAgICAgeworICAgICAgICAgICAgcGFuZWwgPSBtZWRpYUNvbnRyb2xzRWxlbWVudChp bnRlcm5hbHMuc2hhZG93Um9vdCh2aWRlbykuZmlyc3RDaGlsZCwgIi13ZWJraXQtbWVkaWEtY29u dHJvbHMtcGFuZWwiKTsKKworICAgICAgICAgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgewor ICAgICAgICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICAgICAgICAgIG11dGVCdXR0b25Db29y ZGluYXRlcyA9IG1lZGlhQ29udHJvbHNCdXR0b25Db29yZGluYXRlcyh2aWRlbywgIm11dGUtYnV0 dG9uIik7CisgICAgICAgICAgICAgICAgfSBjYXRjaCAoZXhjZXB0aW9uKSB7CisgICAgICAgICAg ICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIGNv bnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCIqKiBNb3ZlIG1v dXNlIHNvbWV3aGVyZSBvdmVyIHRoZSBwYW5lbCAqKiIpOworICAgICAgICAgICAgICAgIHJ1bigi ZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8obXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzBdLCBtdXRlQnV0 dG9uQ29vcmRpbmF0ZXNbMV0pIik7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGNvbnNv bGVXcml0ZSgiIik7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIioqIFRlc3QgdGhhdCBjb250 cm9scyBhcmUgc2hvd24gd2hlbiBjb250cm9scyBhdHRyaWJ1dGUgaXMgcHJlc2VudCAqKiIpOwor ICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJwYW5lbC5zdHlsZVsnZGlzcGxheSddIiwgJ25vbmUn LCAiIT0iKTsKKworICAgICAgICAgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgeworICAgICAg ICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRl KCIqKiBNb3ZlIG1vdXNlIG91dHNpZGUgdGhlIHZpZGVvICoqIik7CisgICAgICAgICAgICAgICAg cnVuKCJldmVudFNlbmRlci5tb3VzZU1vdmVUbyh2aWRlby5vZmZzZXRMZWZ0LCB2aWRlby5vZmZz ZXRUb3AgKyAyICogdmlkZW8ub2Zmc2V0SGVpZ2h0KSIpOworICAgICAgICAgICAgfQorCisgICAg ICAgICAgICBzZXRUaW1lb3V0KGNvbnRpbnVlVGVzdCwgZmFkZW91dFRpbWUpOworICAgICAgICB9 CisKKyAgICAgICAgZnVuY3Rpb24gY29udGludWVUZXN0KCkKKyAgICAgICAgeworICAgICAgICAg ICAgY29uc29sZVdyaXRlKCIiKTsKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiKiogVGhlIGNv bnRyb2xzIHNob3VsZCBoYXZlIHRoZSBkaXNwbGF5IHByb3BlcnR5IHNldCB0byBub25lIik7Cisg ICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInBhbmVsLnN0eWxlWydkaXNwbGF5J10iLCAnbm9uZScs ICI9PSIpOworCisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAgICAgICAgICAgY29u c29sZVdyaXRlKCIqKiBSZW1vdmUgY29udHJvbHMgYXR0cmlidXRlKioiKTsKKyAgICAgICAgICAg IHJ1bigidmlkZW8ucmVtb3ZlQXR0cmlidXRlKCdjb250cm9scycpIik7CisKKyAgICAgICAgICAg IGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIioqIE1vdmUgbW91 c2UgYmFjayBvdmVyIHRoZSBwYW5lbCAqKiIpOworICAgICAgICAgICAgcnVuKCJldmVudFNlbmRl ci5tb3VzZU1vdmVUbyhtdXRlQnV0dG9uQ29vcmRpbmF0ZXNbMF0sIG11dGVCdXR0b25Db29yZGlu YXRlc1sxXSkiKTsKKworICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKKyAgICAgICAgICAg IGNvbnNvbGVXcml0ZSgiKiogVmlkZW8gY29udHJvbHMgc2hvdWxkIG5vdCBiZSBzaG93biAqKiIp OworICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJwYW5lbC5zdHlsZVsnZGlzcGxheSddIiwgJ25v bmUnLCAiPT0iKTsKKworICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKKworICAgICAgICAg ICAgZW5kVGVzdCgpOworICAgICAgICB9CisKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5 IG9ubG9hZD0iaW5pdCgpIj4KKyAgICBUZXN0cyB0aGF0IHNob3dpbmcgLyBoaWRpbmcgdmlkZW8g Y29udHJvbHMgdXNlcyB0aGUgc2V0cyB0aGUgZGlzcGxheTpub25lIHByb3BlcnR5PGJyPgorICAg IDx2aWRlbyBvbnBsYXk9InRlc3QoKSIgY29udHJvbHM+PC92aWRlbz4KKzwvYm9keT4KKzwvaHRt bD4K 136458 2012-04-10 07:43:43 -0700 2012-04-10 10:54:17 -0700 Fixed ChangeLog entries bug-82476-20120410174341.patch text/plain 11173 vcarbune U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE1NTNkMjZkNDA1NGE4 NDk5ZGE0Y2JiMzRiMjdkOGFhMzY2ZTRhNy4uYmQ2NzhhYjM0Njk4Y2IyMGU3ODc3OTg2ZGM1MTlh NTYxZWE4MThiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA0LTEwICBWaWN0 b3IgQ2FyYnVuZSAgPHZjYXJidW5lQGFkb2JlLmNvbT4KKworICAgICAgICBFeHRyYSBkaXNwbGF5 IGxvZ2ljIGZvciB0aGUgbWVkaWEgY29udHJvbCBwYW5lbCBlbGVtZW50CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjQ3NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgYSBidWcg d2hpY2ggY2F1c2VkIHRoZSBjb250cm9scyB0byBiZSBkaXNwbGF5ZWQKKyAgICAgICAgd2hlbiB0 aGV5IHNob3VsZCByZW1haW4gaGlkZGVuLiBBZGRlZCBhbiBleHRyYSB2YXJpYWJsZSB0byB0aGUK KyAgICAgICAgcGFuZWwgZWxlbWVudHMgd2hpY2ggcHJvcGVybHkga2VlcHMgdGhlIHN0YXRlIG9m IHRoZSBwYW5lbCAodmlzaWJsZSBvciBub3QpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3ZpZGVv LWNvbnRyb2xzLXRvZ2dsaW5nLmh0bWwKKworICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29u dHJvbEVsZW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFBhbmVsRWxl bWVudDo6TWVkaWFDb250cm9sUGFuZWxFbGVtZW50KTogQWRkZWQgdGhlCisgICAgICAgIHZhcmlh YmxlIG1faXNEaXNwbGF5ZWQgdG8gaG9sZCB0aGUgc3RhdGUgd2hldGhlciB0aGUgcGFuZWwgaXMg dmlzaWJsZSBvciBub3QuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQYW5lbEVsZW1l bnQ6Om1ha2VPcGFxdWUpOiBTaG93aW5nIHRoZSBwYW5lbCBvbmx5IGlmIGl0CisgICAgICAgIGlz IHZpc2libGUuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6Om1h a2VUcmFuc3BhcmVudCk6IEVuYWJsZWQgdGhlIHRyYW5zaXRpb24KKyAgICAgICAgdGltZXIgd2hp Y2ggc2V0cyB0aGUgZGlzcGxheTpub25lIHByb3BlcnR5IG9uIHRoZSBjb250cm9scy4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6c2V0SXNEaXNwbGF5ZWQpOiBT ZXR0ZXIgZm9yIHRoZSBzdGF0ZSB2YXJpYWJsZS4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAg ICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmg6CisgICAgICAgIChNZWRpYUNv bnRyb2xQYW5lbEVsZW1lbnQpOgorICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbFJv b3RFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50 OjpzaG93KTogVXBkYXRlZCB0aGUgcGFuZWwgdmlzaWJpbGl0eSBzdGF0ZS4KKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50OjpoaWRlKTogVXBkYXRlZCB0aGUgcGFuZWwg dmlzaWJpbGl0eSBzdGF0ZS4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290 RWxlbWVudENocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RF bGVtZW50Q2hyb21pdW06OnNob3cpOiBVcGRhdGVkIHRoZSBwYW5lbCB2aXNpYmlsaXR5IHN0YXRl LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6aGlk ZSk6IFVwZGF0ZWQgdGhlIHBhbmVsIHZpc2liaWxpdHkgc3RhdGUuCisKIDIwMTItMDQtMDUgIFBh dmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogYWRkIGFiaWxpdHkgdG8gY29weSByZXNvdXJjZSBVUkwgZnJvbSB3ZWIgaW5zcGVjdG9y J3MgcmVzb3VyY2VzIHBhZ2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9N ZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKaW5kZXggMGYzNDUzODgwOGRiYjdjZGQ1NDllZWM4MzEy MTllZjk0YzlhNTA1OC4uYzc1ODBmYThhNGY4NmZiNjBiMmZmM2YxN2JkOWNiMmRmMzMyMGQxNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVu dHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1l bnRzLmNwcApAQCAtMTA4LDYgKzEwOCw3IEBAIGlubGluZSBNZWRpYUNvbnRyb2xQYW5lbEVsZW1l bnQ6Ok1lZGlhQ29udHJvbFBhbmVsRWxlbWVudChEb2N1bWVudCogZG9jdW1lbnQpCiAgICAgOiBN ZWRpYUNvbnRyb2xFbGVtZW50KGRvY3VtZW50KQogICAgICwgbV9jYW5CZURyYWdnZWQoZmFsc2Up CiAgICAgLCBtX2lzQmVpbmdEcmFnZ2VkKGZhbHNlKQorICAgICwgbV9pc0Rpc3BsYXllZChmYWxz ZSkKICAgICAsIG1fb3BhcXVlKHRydWUpCiAgICAgLCBtX3RyYW5zaXRpb25UaW1lcih0aGlzLCAm TWVkaWFDb250cm9sUGFuZWxFbGVtZW50Ojp0cmFuc2l0aW9uVGltZXJGaXJlZCkKIHsKQEAgLTI0 Miw5ICsyNDMsOCBAQCB2b2lkIE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6bWFrZU9wYXF1ZSgp CiAKICAgICBtX29wYXF1ZSA9IHRydWU7CiAKLSAgICAvLyBGSVhNRShCVUcgNzkzNDcpOiBUaGUg ZGlzcGxheTpub25lIHByb3BlcnR5IHNob3VsZCBiZSB0b2dnbGVkIGJlbG93IG9ubHkKLSAgICAv LyB3aGVuIGRpc3BsYXkgbG9naWMgaXMgaW50cm9kdWNlZC4KLSAgICAvLyBzaG93KCk7CisgICAg aWYgKG1faXNEaXNwbGF5ZWQpCisgICAgICAgIHNob3coKTsKIH0KIAogdm9pZCBNZWRpYUNvbnRy b2xQYW5lbEVsZW1lbnQ6Om1ha2VUcmFuc3BhcmVudCgpCkBAIC0yNTgsOSArMjU4LDcgQEAgdm9p ZCBNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6Om1ha2VUcmFuc3BhcmVudCgpCiAKICAgICBtX29w YXF1ZSA9IGZhbHNlOwogCi0gICAgLy8gRklYTUUoQlVHIDc5MzQ3KTogVGhlIGRpc3BsYXk6bm9u ZSBwcm9wZXJ0eSBzaG91bGQgYmUgdG9nZ2xlZCBiZWxvdwotICAgIC8vICh0aHJvdWdoIHRoZSB0 aW1lciBzdGFydCkgd2hlbiBkaXNwbGF5IGxvZ2ljIGlzIGludHJvZHVjZWQuCi0gICAgLy8gc3Rh cnRUaW1lcigpOworICAgIHN0YXJ0VGltZXIoKTsKIH0KIAogdm9pZCBNZWRpYUNvbnRyb2xQYW5l bEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQpAQCAtMjkzLDYgKzI5 MSwxMSBAQCB2b2lkIE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6c2V0Q2FuQmVEcmFnZ2VkKGJv b2wgY2FuQmVEcmFnZ2VkKQogICAgICAgICBlbmREcmFnKCk7CiB9CiAKK3ZvaWQgTWVkaWFDb250 cm9sUGFuZWxFbGVtZW50OjpzZXRJc0Rpc3BsYXllZChib29sIGlzRGlzcGxheWVkKQoreworICAg IG1faXNEaXNwbGF5ZWQgPSBpc0Rpc3BsYXllZDsKK30KKwogLy8gLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogCiBpbmxpbmUgTWVkaWFDb250cm9sVGltZWxpbmVDb250YWluZXJFbGVtZW50 OjpNZWRpYUNvbnRyb2xUaW1lbGluZUNvbnRhaW5lckVsZW1lbnQoRG9jdW1lbnQqIGRvY3VtZW50 KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxl bWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRz LmgKaW5kZXggZWZhNjlhNThjNWE2ZTJhZmM2NmJiMTVhMjNiMzM4NTcxZWFlZTQ5Ny4uMWJkYjAx ZGQ4YTRlZjUwMTRjYTRhOGUzMjA3NGY5ZGM1MmZhNzA0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oCkBAIC0xMDksNiArMTA5LDgg QEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPE1lZGlhQ29udHJvbFBhbmVsRWxlbWVu dD4gY3JlYXRlKERvY3VtZW50Kik7CiAKICAgICB2b2lkIHNldENhbkJlRHJhZ2dlZChib29sKTsK KyAgICB2b2lkIHNldElzRGlzcGxheWVkKGJvb2wpOworCiAgICAgdm9pZCByZXNldFBvc2l0aW9u KCk7CiAgICAgdm9pZCBtYWtlT3BhcXVlKCk7CiAgICAgdm9pZCBtYWtlVHJhbnNwYXJlbnQoKTsK QEAgLTEzMSw2ICsxMzMsNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX2NhbkJlRHJhZ2dlZDsK ICAgICBib29sIG1faXNCZWluZ0RyYWdnZWQ7CisgICAgYm9vbCBtX2lzRGlzcGxheWVkOwogICAg IGJvb2wgbV9vcGFxdWU7CiAgICAgTGF5b3V0UG9pbnQgbV9kcmFnU3RhcnRQb3NpdGlvbjsKICAg ICBMYXlvdXRQb2ludCBtX2RyYWdTdGFydEV2ZW50TG9jYXRpb247CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudC5jcHAKaW5kZXgg NDUwNWZkZTgwZTk0YWIyM2FmMzhhOTExOGJkMTdmM2M5NzYyMWQzNC4uYTllZjg2YjI0ODc5YjE1 MWQ0ZjkxMjUwZmQwNTQxMzczMWU3Yjc1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50LmNwcApAQCAtMjgyLDExICsyODIs MTMgQEAgdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudDo6c2V0TWVkaWFDb250cm9sbGVyKE1l ZGlhQ29udHJvbGxlckludGVyZmFjZSogY29udHIKIAogdm9pZCBNZWRpYUNvbnRyb2xSb290RWxl bWVudDo6c2hvdygpCiB7CisgICAgbV9wYW5lbC0+c2V0SXNEaXNwbGF5ZWQodHJ1ZSk7CiAgICAg bV9wYW5lbC0+c2hvdygpOwogfQogCiB2b2lkIE1lZGlhQ29udHJvbFJvb3RFbGVtZW50OjpoaWRl KCkKIHsKKyAgICBtX3BhbmVsLT5zZXRJc0Rpc3BsYXllZChmYWxzZSk7CiAgICAgbV9wYW5lbC0+ aGlkZSgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRp YUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uY3BwCmluZGV4IGJlZDJhYmI4NTEz ZGUzZjMyOTc3YzNiYWZmZGM2OGY4ZTY5MGFlOGQuLjg2ZWE0ODliNWJlOGE0YWRhNmE4YzI5ZWVk ZDJhOWVkZGMxZjNhNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01l ZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uY3BwCkBAIC0xNjQsMTEg KzE2NCwxMyBAQCB2b2lkIE1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW06OnNldE1lZGlh Q29udHJvbGxlcihNZWRpYUNvbnRyb2xsZXJJbnRlcmZhYwogCiB2b2lkIE1lZGlhQ29udHJvbFJv b3RFbGVtZW50Q2hyb21pdW06OnNob3coKQogeworICAgIG1fcGFuZWwtPnNldElzRGlzcGxheWVk KHRydWUpOwogICAgIG1fcGFuZWwtPnNob3coKTsKIH0KIAogdm9pZCBNZWRpYUNvbnRyb2xSb290 RWxlbWVudENocm9taXVtOjpoaWRlKCkKIHsKKyAgICBtX3BhbmVsLT5zZXRJc0Rpc3BsYXllZChm YWxzZSk7CiAgICAgbV9wYW5lbC0+aGlkZSgpOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZjA4M2M4OWIzYjJhNDdm ZmJlNDJlMjYwNjBlZGM5OTAyMmEzMjdjYS4uMDMzNmJjNzhiNjU3NWRiYmJjMTE5NTI4MGYzM2Zk NzVlNTkwNWQ1NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA0LTEwICBWaWN0b3IgQ2Fy YnVuZSAgPHZjYXJidW5lQGFkb2JlLmNvbT4KKworICAgICAgICBFeHRyYSBkaXNwbGF5IGxvZ2lj IGZvciB0aGUgbWVkaWEgY29udHJvbCBwYW5lbCBlbGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjQ3NgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIHRlc3QgdG8gZW5zdXJlIHRoYXQgY29u dHJvbHMgYXJlIG5vdCBkaXNwbGF5ZWQgd2hlbgorICAgICAgICB0aGUgY29udHJvbHMgYXR0cmli dXRlIGlzIG5vdCBzZXQuCisKKyAgICAgICAgKiBtZWRpYS92aWRlby1jb250cm9scy10b2dnbGlu Zy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL3ZpZGVvLWNvbnRyb2xzLXRv Z2dsaW5nLmh0bWw6IEFkZGVkLgorCiAyMDEyLTA0LTA1ICBab2x0YW4gQXJ2YWkgIDx6YXJ2YWlA aW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFtRdF1bV0syXSBTa2lwIHRlc3RzIHRoYXQgc3Rp bGwgZmFpbGluZyBhZnRlciBpbXBsZW1lbnRpbmcgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0UGFn ZVZpc2liaWxpdHkoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJv bHMtdG9nZ2xpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJv bHMtdG9nZ2xpbmctZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVjOTUwZjdlNGJjNDc0MzA2OGRm OGIwMWZjYzJjYzAxZDhmZjEzZjAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRp YS92aWRlby1jb250cm9scy10b2dnbGluZy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyOCBAQAor VGVzdHMgdGhhdCBzaG93aW5nIC8gaGlkaW5nIHZpZGVvIGNvbnRyb2xzIHVzZXMgdGhlIHNldHMg dGhlIGRpc3BsYXk6bm9uZSBwcm9wZXJ0eQorCisqKiBQbGF5aW5nIHRoZSB2aWRlbyAqKgorUlVO KHZpZGVvLnBsYXkoKSkKKworKiogTW92ZSBtb3VzZSBzb21ld2hlcmUgb3ZlciB0aGUgcGFuZWwg KioKK1JVTihldmVudFNlbmRlci5tb3VzZU1vdmVUbyhtdXRlQnV0dG9uQ29vcmRpbmF0ZXNbMF0s IG11dGVCdXR0b25Db29yZGluYXRlc1sxXSkpCisKKyoqIFRlc3QgdGhhdCBjb250cm9scyBhcmUg c2hvd24gd2hlbiBjb250cm9scyBhdHRyaWJ1dGUgaXMgcHJlc2VudCAqKgorRVhQRUNURUQgKHBh bmVsLnN0eWxlWydkaXNwbGF5J10gIT0gJ25vbmUnKSBPSworCisqKiBNb3ZlIG1vdXNlIG91dHNp ZGUgdGhlIHZpZGVvICoqCitSVU4oZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8odmlkZW8ub2Zmc2V0 TGVmdCwgdmlkZW8ub2Zmc2V0VG9wICsgMiAqIHZpZGVvLm9mZnNldEhlaWdodCkpCisKKyoqIFRo ZSBjb250cm9scyBzaG91bGQgaGF2ZSB0aGUgZGlzcGxheSBwcm9wZXJ0eSBzZXQgdG8gbm9uZQor RVhQRUNURUQgKHBhbmVsLnN0eWxlWydkaXNwbGF5J10gPT0gJ25vbmUnKSBPSworCisqKiBSZW1v dmUgY29udHJvbHMgYXR0cmlidXRlKioKK1JVTih2aWRlby5yZW1vdmVBdHRyaWJ1dGUoJ2NvbnRy b2xzJykpCisKKyoqIE1vdmUgbW91c2UgYmFjayBvdmVyIHRoZSBwYW5lbCAqKgorUlVOKGV2ZW50 U2VuZGVyLm1vdXNlTW92ZVRvKG11dGVCdXR0b25Db29yZGluYXRlc1swXSwgbXV0ZUJ1dHRvbkNv b3JkaW5hdGVzWzFdKSkKKworKiogVmlkZW8gY29udHJvbHMgc2hvdWxkIG5vdCBiZSBzaG93biAq KgorRVhQRUNURUQgKHBhbmVsLnN0eWxlWydkaXNwbGF5J10gPT0gJ25vbmUnKSBPSworCitFTkQg T0YgVEVTVAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy10 b2dnbGluZy5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtdG9nZ2xpbmcu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi4zYzIyMDYwMDgyYzIzNWY4ODFlOGVhZjBlZjdkMGE1NjJkYWRlMTNm Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtdG9n Z2xpbmcuaHRtbApAQCAtMCwwICsxLDgyIEBACis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5U ZXN0IHJlbmRlcmluZyBvZiB2b2x1bWUgc2xpZGVyIG9mIHZpZGVvIHRhZzwvdGl0bGU+CisgICAg PHNjcmlwdCBzcmM9bWVkaWEtZmlsZS5qcz48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz1tZWRp YS1jb250cm9scy5qcz48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz12aWRlby10ZXN0LmpzPjwv c2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAgICAgIHZhciB2aWRlbzsKKyAgICAgICAgdmFyIHBh bmVsOworICAgICAgICB2YXIgbXV0ZUJ1dHRvbkNvb3JkaW5hdGVzOworICAgICAgICB2YXIgZmFk ZW91dFRpbWUgPSAxMDAwOworCisgICAgICAgIGZ1bmN0aW9uIGluaXQoKQorICAgICAgICB7Cisg ICAgICAgICAgICB2aWRlbyA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCJ2aWRlbyIp WzBdOworICAgICAgICAgICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8iLCAiY29u dGVudC90ZXN0Iik7CisKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAg ICBjb25zb2xlV3JpdGUoIioqIFBsYXlpbmcgdGhlIHZpZGVvICoqIik7CisgICAgICAgICAgICBy dW4oInZpZGVvLnBsYXkoKSIpOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gdGVzdCgp CisgICAgICAgIHsKKyAgICAgICAgICAgIHBhbmVsID0gbWVkaWFDb250cm9sc0VsZW1lbnQoaW50 ZXJuYWxzLnNoYWRvd1Jvb3QodmlkZW8pLmZpcnN0Q2hpbGQsICItd2Via2l0LW1lZGlhLWNvbnRy b2xzLXBhbmVsIik7CisKKyAgICAgICAgICAgIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsKKyAg ICAgICAgICAgICAgICB0cnkgeworICAgICAgICAgICAgICAgICAgICBtdXRlQnV0dG9uQ29vcmRp bmF0ZXMgPSBtZWRpYUNvbnRyb2xzQnV0dG9uQ29vcmRpbmF0ZXModmlkZW8sICJtdXRlLWJ1dHRv biIpOworICAgICAgICAgICAgICAgIH0gY2F0Y2ggKGV4Y2VwdGlvbikgeworICAgICAgICAgICAg ICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7CisgICAgICAgICAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICBjb25z b2xlV3JpdGUoIiIpOworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiKiogTW92ZSBtb3Vz ZSBzb21ld2hlcmUgb3ZlciB0aGUgcGFuZWwgKioiKTsKKyAgICAgICAgICAgICAgICBydW4oImV2 ZW50U2VuZGVyLm1vdXNlTW92ZVRvKG11dGVCdXR0b25Db29yZGluYXRlc1swXSwgbXV0ZUJ1dHRv bkNvb3JkaW5hdGVzWzFdKSIpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBjb25zb2xl V3JpdGUoIiIpOworICAgICAgICAgICAgY29uc29sZVdyaXRlKCIqKiBUZXN0IHRoYXQgY29udHJv bHMgYXJlIHNob3duIHdoZW4gY29udHJvbHMgYXR0cmlidXRlIGlzIHByZXNlbnQgKioiKTsKKyAg ICAgICAgICAgIHRlc3RFeHBlY3RlZCgicGFuZWwuc3R5bGVbJ2Rpc3BsYXknXSIsICdub25lJywg IiE9Iik7CisKKyAgICAgICAgICAgIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsKKyAgICAgICAg ICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgi KiogTW92ZSBtb3VzZSBvdXRzaWRlIHRoZSB2aWRlbyAqKiIpOworICAgICAgICAgICAgICAgIHJ1 bigiZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8odmlkZW8ub2Zmc2V0TGVmdCwgdmlkZW8ub2Zmc2V0 VG9wICsgMiAqIHZpZGVvLm9mZnNldEhlaWdodCkiKTsKKyAgICAgICAgICAgIH0KKworICAgICAg ICAgICAgc2V0VGltZW91dChjb250aW51ZVRlc3QsIGZhZGVvdXRUaW1lKTsKKyAgICAgICAgfQor CisgICAgICAgIGZ1bmN0aW9uIGNvbnRpbnVlVGVzdCgpCisgICAgICAgIHsKKyAgICAgICAgICAg IGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIioqIFRoZSBjb250 cm9scyBzaG91bGQgaGF2ZSB0aGUgZGlzcGxheSBwcm9wZXJ0eSBzZXQgdG8gbm9uZSIpOworICAg ICAgICAgICAgdGVzdEV4cGVjdGVkKCJwYW5lbC5zdHlsZVsnZGlzcGxheSddIiwgJ25vbmUnLCAi PT0iKTsKKworICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKKyAgICAgICAgICAgIGNvbnNv bGVXcml0ZSgiKiogUmVtb3ZlIGNvbnRyb2xzIGF0dHJpYnV0ZSoqIik7CisgICAgICAgICAgICBy dW4oInZpZGVvLnJlbW92ZUF0dHJpYnV0ZSgnY29udHJvbHMnKSIpOworCisgICAgICAgICAgICBj b25zb2xlV3JpdGUoIiIpOworICAgICAgICAgICAgY29uc29sZVdyaXRlKCIqKiBNb3ZlIG1vdXNl IGJhY2sgb3ZlciB0aGUgcGFuZWwgKioiKTsKKyAgICAgICAgICAgIHJ1bigiZXZlbnRTZW5kZXIu bW91c2VNb3ZlVG8obXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzBdLCBtdXRlQnV0dG9uQ29vcmRpbmF0 ZXNbMV0pIik7CisKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICBj b25zb2xlV3JpdGUoIioqIFZpZGVvIGNvbnRyb2xzIHNob3VsZCBub3QgYmUgc2hvd24gKioiKTsK KyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgicGFuZWwuc3R5bGVbJ2Rpc3BsYXknXSIsICdub25l JywgIj09Iik7CisKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisKKyAgICAgICAgICAg IGVuZFRlc3QoKTsKKyAgICAgICAgfQorCisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBv bmxvYWQ9ImluaXQoKSI+CisgICAgVGVzdHMgdGhhdCBzaG93aW5nIC8gaGlkaW5nIHZpZGVvIGNv bnRyb2xzIHVzZXMgdGhlIHNldHMgdGhlIGRpc3BsYXk6bm9uZSBwcm9wZXJ0eTxicj4KKyAgICA8 dmlkZW8gb25wbGF5PSJ0ZXN0KCkiIGNvbnRyb2xzPjwvdmlkZW8+Cis8L2JvZHk+Cis8L2h0bWw+ Cg== 136489 2012-04-10 10:54:25 -0700 2012-04-24 05:24:00 -0700 Updated test. bug-82476-20120410205422.patch text/plain 11323 vcarbune U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMzE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE1NTNkMjZkNDA1NGE4 NDk5ZGE0Y2JiMzRiMjdkOGFhMzY2ZTRhNy4uYmQ2NzhhYjM0Njk4Y2IyMGU3ODc3OTg2ZGM1MTlh NTYxZWE4MThiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA0LTEwICBWaWN0 b3IgQ2FyYnVuZSAgPHZjYXJidW5lQGFkb2JlLmNvbT4KKworICAgICAgICBFeHRyYSBkaXNwbGF5 IGxvZ2ljIGZvciB0aGUgbWVkaWEgY29udHJvbCBwYW5lbCBlbGVtZW50CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjQ3NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgYSBidWcg d2hpY2ggY2F1c2VkIHRoZSBjb250cm9scyB0byBiZSBkaXNwbGF5ZWQKKyAgICAgICAgd2hlbiB0 aGV5IHNob3VsZCByZW1haW4gaGlkZGVuLiBBZGRlZCBhbiBleHRyYSB2YXJpYWJsZSB0byB0aGUK KyAgICAgICAgcGFuZWwgZWxlbWVudHMgd2hpY2ggcHJvcGVybHkga2VlcHMgdGhlIHN0YXRlIG9m IHRoZSBwYW5lbCAodmlzaWJsZSBvciBub3QpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3ZpZGVv LWNvbnRyb2xzLXRvZ2dsaW5nLmh0bWwKKworICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29u dHJvbEVsZW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFBhbmVsRWxl bWVudDo6TWVkaWFDb250cm9sUGFuZWxFbGVtZW50KTogQWRkZWQgdGhlCisgICAgICAgIHZhcmlh YmxlIG1faXNEaXNwbGF5ZWQgdG8gaG9sZCB0aGUgc3RhdGUgd2hldGhlciB0aGUgcGFuZWwgaXMg dmlzaWJsZSBvciBub3QuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQYW5lbEVsZW1l bnQ6Om1ha2VPcGFxdWUpOiBTaG93aW5nIHRoZSBwYW5lbCBvbmx5IGlmIGl0CisgICAgICAgIGlz IHZpc2libGUuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6Om1h a2VUcmFuc3BhcmVudCk6IEVuYWJsZWQgdGhlIHRyYW5zaXRpb24KKyAgICAgICAgdGltZXIgd2hp Y2ggc2V0cyB0aGUgZGlzcGxheTpub25lIHByb3BlcnR5IG9uIHRoZSBjb250cm9scy4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6c2V0SXNEaXNwbGF5ZWQpOiBT ZXR0ZXIgZm9yIHRoZSBzdGF0ZSB2YXJpYWJsZS4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAg ICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmg6CisgICAgICAgIChNZWRpYUNv bnRyb2xQYW5lbEVsZW1lbnQpOgorICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbFJv b3RFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50 OjpzaG93KTogVXBkYXRlZCB0aGUgcGFuZWwgdmlzaWJpbGl0eSBzdGF0ZS4KKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50OjpoaWRlKTogVXBkYXRlZCB0aGUgcGFuZWwg dmlzaWJpbGl0eSBzdGF0ZS4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290 RWxlbWVudENocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RF bGVtZW50Q2hyb21pdW06OnNob3cpOiBVcGRhdGVkIHRoZSBwYW5lbCB2aXNpYmlsaXR5IHN0YXRl LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6aGlk ZSk6IFVwZGF0ZWQgdGhlIHBhbmVsIHZpc2liaWxpdHkgc3RhdGUuCisKIDIwMTItMDQtMDUgIFBh dmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogYWRkIGFiaWxpdHkgdG8gY29weSByZXNvdXJjZSBVUkwgZnJvbSB3ZWIgaW5zcGVjdG9y J3MgcmVzb3VyY2VzIHBhZ2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9N ZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKaW5kZXggMGYzNDUzODgwOGRiYjdjZGQ1NDllZWM4MzEy MTllZjk0YzlhNTA1OC4uYzc1ODBmYThhNGY4NmZiNjBiMmZmM2YxN2JkOWNiMmRmMzMyMGQxNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVu dHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1l bnRzLmNwcApAQCAtMTA4LDYgKzEwOCw3IEBAIGlubGluZSBNZWRpYUNvbnRyb2xQYW5lbEVsZW1l bnQ6Ok1lZGlhQ29udHJvbFBhbmVsRWxlbWVudChEb2N1bWVudCogZG9jdW1lbnQpCiAgICAgOiBN ZWRpYUNvbnRyb2xFbGVtZW50KGRvY3VtZW50KQogICAgICwgbV9jYW5CZURyYWdnZWQoZmFsc2Up CiAgICAgLCBtX2lzQmVpbmdEcmFnZ2VkKGZhbHNlKQorICAgICwgbV9pc0Rpc3BsYXllZChmYWxz ZSkKICAgICAsIG1fb3BhcXVlKHRydWUpCiAgICAgLCBtX3RyYW5zaXRpb25UaW1lcih0aGlzLCAm TWVkaWFDb250cm9sUGFuZWxFbGVtZW50Ojp0cmFuc2l0aW9uVGltZXJGaXJlZCkKIHsKQEAgLTI0 Miw5ICsyNDMsOCBAQCB2b2lkIE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6bWFrZU9wYXF1ZSgp CiAKICAgICBtX29wYXF1ZSA9IHRydWU7CiAKLSAgICAvLyBGSVhNRShCVUcgNzkzNDcpOiBUaGUg ZGlzcGxheTpub25lIHByb3BlcnR5IHNob3VsZCBiZSB0b2dnbGVkIGJlbG93IG9ubHkKLSAgICAv LyB3aGVuIGRpc3BsYXkgbG9naWMgaXMgaW50cm9kdWNlZC4KLSAgICAvLyBzaG93KCk7CisgICAg aWYgKG1faXNEaXNwbGF5ZWQpCisgICAgICAgIHNob3coKTsKIH0KIAogdm9pZCBNZWRpYUNvbnRy b2xQYW5lbEVsZW1lbnQ6Om1ha2VUcmFuc3BhcmVudCgpCkBAIC0yNTgsOSArMjU4LDcgQEAgdm9p ZCBNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6Om1ha2VUcmFuc3BhcmVudCgpCiAKICAgICBtX29w YXF1ZSA9IGZhbHNlOwogCi0gICAgLy8gRklYTUUoQlVHIDc5MzQ3KTogVGhlIGRpc3BsYXk6bm9u ZSBwcm9wZXJ0eSBzaG91bGQgYmUgdG9nZ2xlZCBiZWxvdwotICAgIC8vICh0aHJvdWdoIHRoZSB0 aW1lciBzdGFydCkgd2hlbiBkaXNwbGF5IGxvZ2ljIGlzIGludHJvZHVjZWQuCi0gICAgLy8gc3Rh cnRUaW1lcigpOworICAgIHN0YXJ0VGltZXIoKTsKIH0KIAogdm9pZCBNZWRpYUNvbnRyb2xQYW5l bEVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQpAQCAtMjkzLDYgKzI5 MSwxMSBAQCB2b2lkIE1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6c2V0Q2FuQmVEcmFnZ2VkKGJv b2wgY2FuQmVEcmFnZ2VkKQogICAgICAgICBlbmREcmFnKCk7CiB9CiAKK3ZvaWQgTWVkaWFDb250 cm9sUGFuZWxFbGVtZW50OjpzZXRJc0Rpc3BsYXllZChib29sIGlzRGlzcGxheWVkKQoreworICAg IG1faXNEaXNwbGF5ZWQgPSBpc0Rpc3BsYXllZDsKK30KKwogLy8gLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogCiBpbmxpbmUgTWVkaWFDb250cm9sVGltZWxpbmVDb250YWluZXJFbGVtZW50 OjpNZWRpYUNvbnRyb2xUaW1lbGluZUNvbnRhaW5lckVsZW1lbnQoRG9jdW1lbnQqIGRvY3VtZW50 KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxl bWVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRz LmgKaW5kZXggZWZhNjlhNThjNWE2ZTJhZmM2NmJiMTVhMjNiMzM4NTcxZWFlZTQ5Ny4uMWJkYjAx ZGQ4YTRlZjUwMTRjYTRhOGUzMjA3NGY5ZGM1MmZhNzA0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oCkBAIC0xMDksNiArMTA5LDgg QEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPE1lZGlhQ29udHJvbFBhbmVsRWxlbWVu dD4gY3JlYXRlKERvY3VtZW50Kik7CiAKICAgICB2b2lkIHNldENhbkJlRHJhZ2dlZChib29sKTsK KyAgICB2b2lkIHNldElzRGlzcGxheWVkKGJvb2wpOworCiAgICAgdm9pZCByZXNldFBvc2l0aW9u KCk7CiAgICAgdm9pZCBtYWtlT3BhcXVlKCk7CiAgICAgdm9pZCBtYWtlVHJhbnNwYXJlbnQoKTsK QEAgLTEzMSw2ICsxMzMsNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX2NhbkJlRHJhZ2dlZDsK ICAgICBib29sIG1faXNCZWluZ0RyYWdnZWQ7CisgICAgYm9vbCBtX2lzRGlzcGxheWVkOwogICAg IGJvb2wgbV9vcGFxdWU7CiAgICAgTGF5b3V0UG9pbnQgbV9kcmFnU3RhcnRQb3NpdGlvbjsKICAg ICBMYXlvdXRQb2ludCBtX2RyYWdTdGFydEV2ZW50TG9jYXRpb247CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudC5jcHAKaW5kZXgg NDUwNWZkZTgwZTk0YWIyM2FmMzhhOTExOGJkMTdmM2M5NzYyMWQzNC4uYTllZjg2YjI0ODc5YjE1 MWQ0ZjkxMjUwZmQwNTQxMzczMWU3Yjc1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50LmNwcApAQCAtMjgyLDExICsyODIs MTMgQEAgdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudDo6c2V0TWVkaWFDb250cm9sbGVyKE1l ZGlhQ29udHJvbGxlckludGVyZmFjZSogY29udHIKIAogdm9pZCBNZWRpYUNvbnRyb2xSb290RWxl bWVudDo6c2hvdygpCiB7CisgICAgbV9wYW5lbC0+c2V0SXNEaXNwbGF5ZWQodHJ1ZSk7CiAgICAg bV9wYW5lbC0+c2hvdygpOwogfQogCiB2b2lkIE1lZGlhQ29udHJvbFJvb3RFbGVtZW50OjpoaWRl KCkKIHsKKyAgICBtX3BhbmVsLT5zZXRJc0Rpc3BsYXllZChmYWxzZSk7CiAgICAgbV9wYW5lbC0+ aGlkZSgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRp YUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uY3BwCmluZGV4IGJlZDJhYmI4NTEz ZGUzZjMyOTc3YzNiYWZmZGM2OGY4ZTY5MGFlOGQuLjg2ZWE0ODliNWJlOGE0YWRhNmE4YzI5ZWVk ZDJhOWVkZGMxZjNhNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01l ZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW0uY3BwCkBAIC0xNjQsMTEg KzE2NCwxMyBAQCB2b2lkIE1lZGlhQ29udHJvbFJvb3RFbGVtZW50Q2hyb21pdW06OnNldE1lZGlh Q29udHJvbGxlcihNZWRpYUNvbnRyb2xsZXJJbnRlcmZhYwogCiB2b2lkIE1lZGlhQ29udHJvbFJv b3RFbGVtZW50Q2hyb21pdW06OnNob3coKQogeworICAgIG1fcGFuZWwtPnNldElzRGlzcGxheWVk KHRydWUpOwogICAgIG1fcGFuZWwtPnNob3coKTsKIH0KIAogdm9pZCBNZWRpYUNvbnRyb2xSb290 RWxlbWVudENocm9taXVtOjpoaWRlKCkKIHsKKyAgICBtX3BhbmVsLT5zZXRJc0Rpc3BsYXllZChm YWxzZSk7CiAgICAgbV9wYW5lbC0+aGlkZSgpOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZjA4M2M4OWIzYjJhNDdm ZmJlNDJlMjYwNjBlZGM5OTAyMmEzMjdjYS4uMDMzNmJjNzhiNjU3NWRiYmJjMTE5NTI4MGYzM2Zk NzVlNTkwNWQ1NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA0LTEwICBWaWN0b3IgQ2Fy YnVuZSAgPHZjYXJidW5lQGFkb2JlLmNvbT4KKworICAgICAgICBFeHRyYSBkaXNwbGF5IGxvZ2lj IGZvciB0aGUgbWVkaWEgY29udHJvbCBwYW5lbCBlbGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjQ3NgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIHRlc3QgdG8gZW5zdXJlIHRoYXQgY29u dHJvbHMgYXJlIG5vdCBkaXNwbGF5ZWQgd2hlbgorICAgICAgICB0aGUgY29udHJvbHMgYXR0cmli dXRlIGlzIG5vdCBzZXQuCisKKyAgICAgICAgKiBtZWRpYS92aWRlby1jb250cm9scy10b2dnbGlu Zy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL3ZpZGVvLWNvbnRyb2xzLXRv Z2dsaW5nLmh0bWw6IEFkZGVkLgorCiAyMDEyLTA0LTA1ICBab2x0YW4gQXJ2YWkgIDx6YXJ2YWlA aW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFtRdF1bV0syXSBTa2lwIHRlc3RzIHRoYXQgc3Rp bGwgZmFpbGluZyBhZnRlciBpbXBsZW1lbnRpbmcgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0UGFn ZVZpc2liaWxpdHkoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJv bHMtdG9nZ2xpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJv bHMtdG9nZ2xpbmctZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmVjOTUwZjdlNGJjNDc0MzA2OGRm OGIwMWZjYzJjYzAxZDhmZjEzZjAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRp YS92aWRlby1jb250cm9scy10b2dnbGluZy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyOCBAQAor VGVzdHMgdGhhdCBzaG93aW5nIC8gaGlkaW5nIHZpZGVvIGNvbnRyb2xzIHVzZXMgdGhlIHNldHMg dGhlIGRpc3BsYXk6bm9uZSBwcm9wZXJ0eQorCisqKiBQbGF5aW5nIHRoZSB2aWRlbyAqKgorUlVO KHZpZGVvLnBsYXkoKSkKKworKiogTW92ZSBtb3VzZSBzb21ld2hlcmUgb3ZlciB0aGUgcGFuZWwg KioKK1JVTihldmVudFNlbmRlci5tb3VzZU1vdmVUbyhtdXRlQnV0dG9uQ29vcmRpbmF0ZXNbMF0s IG11dGVCdXR0b25Db29yZGluYXRlc1sxXSkpCisKKyoqIFRlc3QgdGhhdCBjb250cm9scyBhcmUg c2hvd24gd2hlbiBjb250cm9scyBhdHRyaWJ1dGUgaXMgcHJlc2VudCAqKgorRVhQRUNURUQgKHBh bmVsLnN0eWxlWydkaXNwbGF5J10gIT0gJ25vbmUnKSBPSworCisqKiBNb3ZlIG1vdXNlIG91dHNp ZGUgdGhlIHZpZGVvICoqCitSVU4oZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8odmlkZW8ub2Zmc2V0 TGVmdCwgdmlkZW8ub2Zmc2V0VG9wICsgMiAqIHZpZGVvLm9mZnNldEhlaWdodCkpCisKKyoqIFRo ZSBjb250cm9scyBzaG91bGQgaGF2ZSB0aGUgZGlzcGxheSBwcm9wZXJ0eSBzZXQgdG8gbm9uZQor RVhQRUNURUQgKHBhbmVsLnN0eWxlWydkaXNwbGF5J10gPT0gJ25vbmUnKSBPSworCisqKiBSZW1v dmUgY29udHJvbHMgYXR0cmlidXRlKioKK1JVTih2aWRlby5yZW1vdmVBdHRyaWJ1dGUoJ2NvbnRy b2xzJykpCisKKyoqIE1vdmUgbW91c2UgYmFjayBvdmVyIHRoZSBwYW5lbCAqKgorUlVOKGV2ZW50 U2VuZGVyLm1vdXNlTW92ZVRvKG11dGVCdXR0b25Db29yZGluYXRlc1swXSwgbXV0ZUJ1dHRvbkNv b3JkaW5hdGVzWzFdKSkKKworKiogVmlkZW8gY29udHJvbHMgc2hvdWxkIG5vdCBiZSBzaG93biAq KgorRVhQRUNURUQgKHBhbmVsLnN0eWxlWydkaXNwbGF5J10gPT0gJ25vbmUnKSBPSworCitFTkQg T0YgVEVTVAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy10 b2dnbGluZy5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtdG9nZ2xpbmcu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi44MTg1ZDU3M2EzNGY0NDdjNTBjOTM4MGIwNDAxMDZjYzBiYzBlOWE5 Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtdG9n Z2xpbmcuaHRtbApAQCAtMCwwICsxLDg3IEBACis8aHRtbD4KKzxoZWFkPgorICAgIDx0aXRsZT5U ZXN0IHJlbmRlcmluZyBvZiB2b2x1bWUgc2xpZGVyIG9mIHZpZGVvIHRhZzwvdGl0bGU+CisgICAg PHNjcmlwdCBzcmM9bWVkaWEtZmlsZS5qcz48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz1tZWRp YS1jb250cm9scy5qcz48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz12aWRlby10ZXN0LmpzPjwv c2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAgICAgIHZhciB2aWRlbzsKKyAgICAgICAgdmFyIHBh bmVsOworICAgICAgICB2YXIgbXV0ZUJ1dHRvbkNvb3JkaW5hdGVzOworICAgICAgICB2YXIgZmFk ZW91dFRpbWUgPSAzMDA7CisKKyAgICAgICAgZnVuY3Rpb24gaW5pdCgpCisgICAgICAgIHsKKyAg ICAgICAgICAgIHZpZGVvID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoInZpZGVvIilb MF07CisgICAgICAgICAgICB2aWRlby5zcmMgPSBmaW5kTWVkaWFGaWxlKCJ2aWRlbyIsICJjb250 ZW50L3Rlc3QiKTsKKworICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKKyAgICAgICAgICAg IGNvbnNvbGVXcml0ZSgiKiogUGxheWluZyB0aGUgdmlkZW8gKioiKTsKKyAgICAgICAgICAgIHJ1 bigidmlkZW8ucGxheSgpIik7CisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiB0ZXN0KCkK KyAgICAgICAgeworICAgICAgICAgICAgcGFuZWwgPSBtZWRpYUNvbnRyb2xzRWxlbWVudChpbnRl cm5hbHMuc2hhZG93Um9vdCh2aWRlbykuZmlyc3RDaGlsZCwgIi13ZWJraXQtbWVkaWEtY29udHJv bHMtcGFuZWwiKTsKKworICAgICAgICAgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgeworICAg ICAgICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICAgICAgICAgIG11dGVCdXR0b25Db29yZGlu YXRlcyA9IG1lZGlhQ29udHJvbHNCdXR0b25Db29yZGluYXRlcyh2aWRlbywgIm11dGUtYnV0dG9u Iik7CisgICAgICAgICAgICAgICAgfSBjYXRjaCAoZXhjZXB0aW9uKSB7CisgICAgICAgICAgICAg ICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIGNvbnNv bGVXcml0ZSgiIik7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCIqKiBNb3ZlIG1vdXNl IHNvbWV3aGVyZSBvdmVyIHRoZSBwYW5lbCAqKiIpOworICAgICAgICAgICAgICAgIHJ1bigiZXZl bnRTZW5kZXIubW91c2VNb3ZlVG8obXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzBdLCBtdXRlQnV0dG9u Q29vcmRpbmF0ZXNbMV0pIik7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGNvbnNvbGVX cml0ZSgiIik7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIioqIFRlc3QgdGhhdCBjb250cm9s cyBhcmUgc2hvd24gd2hlbiBjb250cm9scyBhdHRyaWJ1dGUgaXMgcHJlc2VudCAqKiIpOworICAg ICAgICAgICAgdGVzdEV4cGVjdGVkKCJwYW5lbC5zdHlsZVsnZGlzcGxheSddIiwgJ25vbmUnLCAi IT0iKTsKKworICAgICAgICAgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgeworICAgICAgICAg ICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCIq KiBNb3ZlIG1vdXNlIG91dHNpZGUgdGhlIHZpZGVvICoqIik7CisgICAgICAgICAgICAgICAgcnVu KCJldmVudFNlbmRlci5tb3VzZU1vdmVUbyh2aWRlby5vZmZzZXRMZWZ0LCB2aWRlby5vZmZzZXRU b3AgKyAyICogdmlkZW8ub2Zmc2V0SGVpZ2h0KSIpOworICAgICAgICAgICAgfQorCisgICAgICAg ICAgICBzZXRUaW1lb3V0KGNvbnRpbnVlVGVzdCwgZmFkZW91dFRpbWUpOworICAgICAgICB9CisK KyAgICAgICAgZnVuY3Rpb24gY29udGludWVUZXN0KCkKKyAgICAgICAgeworICAgICAgICAgICAg aWYgKHBhbmVsLnN0eWxlWydkaXNwbGF5J10gIT0gJ25vbmUnKSB7CisgICAgICAgICAgICAgICAg c2V0VGltZW91dChjb250aW51ZVRlc3QsIGZhZGVvdXRUaW1lKTsKKyAgICAgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7Cisg ICAgICAgICAgICBjb25zb2xlV3JpdGUoIioqIFRoZSBjb250cm9scyBzaG91bGQgaGF2ZSB0aGUg ZGlzcGxheSBwcm9wZXJ0eSBzZXQgdG8gbm9uZSIpOworICAgICAgICAgICAgdGVzdEV4cGVjdGVk KCJwYW5lbC5zdHlsZVsnZGlzcGxheSddIiwgJ25vbmUnLCAiPT0iKTsKKworICAgICAgICAgICAg Y29uc29sZVdyaXRlKCIiKTsKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiKiogUmVtb3ZlIGNv bnRyb2xzIGF0dHJpYnV0ZSoqIik7CisgICAgICAgICAgICBydW4oInZpZGVvLnJlbW92ZUF0dHJp YnV0ZSgnY29udHJvbHMnKSIpOworCisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAg ICAgICAgICAgY29uc29sZVdyaXRlKCIqKiBNb3ZlIG1vdXNlIGJhY2sgb3ZlciB0aGUgcGFuZWwg KioiKTsKKyAgICAgICAgICAgIHJ1bigiZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8obXV0ZUJ1dHRv bkNvb3JkaW5hdGVzWzBdLCBtdXRlQnV0dG9uQ29vcmRpbmF0ZXNbMV0pIik7CisKKyAgICAgICAg ICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIioqIFZpZGVv IGNvbnRyb2xzIHNob3VsZCBub3QgYmUgc2hvd24gKioiKTsKKyAgICAgICAgICAgIHRlc3RFeHBl Y3RlZCgicGFuZWwuc3R5bGVbJ2Rpc3BsYXknXSIsICdub25lJywgIj09Iik7CisKKyAgICAgICAg ICAgIGNvbnNvbGVXcml0ZSgiIik7CisKKyAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAg fQorCisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9ImluaXQoKSI+CisgICAg VGVzdHMgdGhhdCBzaG93aW5nIC8gaGlkaW5nIHZpZGVvIGNvbnRyb2xzIHVzZXMgdGhlIHNldHMg dGhlIGRpc3BsYXk6bm9uZSBwcm9wZXJ0eTxicj4KKyAgICA8dmlkZW8gb25wbGF5PSJ0ZXN0KCki IGNvbnRyb2xzPjwvdmlkZW8+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 138540 2012-04-24 05:24:08 -0700 2012-04-24 15:50:24 -0700 Rebased bug-82476-20120424152405.patch text/plain 11252 vcarbune U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1MDMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmQ5ODQwMGIyYTc3MmI0 MGNlYWNmZjc3ZTk1OWQ5NjczNzc4YWQ5ZS4uNTVlZTc4MzVhMzY5Njg3YTMwMTQyNjcyYWQ3NjRh YzgyN2ZkZjNkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEyLTA0LTI0ICBWaWN0 b3IgQ2FyYnVuZSAgPHZjYXJidW5lQGFkb2JlLmNvbT4KKworICAgICAgICBFeHRyYSBkaXNwbGF5 IGxvZ2ljIGZvciB0aGUgbWVkaWEgY29udHJvbCBwYW5lbCBlbGVtZW50CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjQ3NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggZml4ZXMgYSBidWcg d2hpY2ggY2F1c2VkIHRoZSBjb250cm9scyB0byBiZSBkaXNwbGF5ZWQKKyAgICAgICAgd2hlbiB0 aGV5IHNob3VsZCByZW1haW4gaGlkZGVuLiBBZGRlZCBhbiBleHRyYSB2YXJpYWJsZSB0byB0aGUK KyAgICAgICAgcGFuZWwgZWxlbWVudHMgd2hpY2ggcHJvcGVybHkga2VlcHMgdGhlIHN0YXRlIG9m IHRoZSBwYW5lbCAodmlzaWJsZSBvciBub3QpLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL3ZpZGVv LWNvbnRyb2xzLXRvZ2dsaW5nLmh0bWwKKworICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29u dHJvbEVsZW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFBhbmVsRWxl bWVudDo6TWVkaWFDb250cm9sUGFuZWxFbGVtZW50KTogQWRkZWQgdGhlCisgICAgICAgIHZhcmlh YmxlIG1faXNEaXNwbGF5ZWQgdG8gaG9sZCB0aGUgc3RhdGUgd2hldGhlciB0aGUgcGFuZWwgaXMg dmlzaWJsZSBvciBub3QuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQYW5lbEVsZW1l bnQ6Om1ha2VPcGFxdWUpOiBTaG93aW5nIHRoZSBwYW5lbCBvbmx5IGlmIGl0CisgICAgICAgIGlz IHZpc2libGUuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6Om1h a2VUcmFuc3BhcmVudCk6IEVuYWJsZWQgdGhlIHRyYW5zaXRpb24KKyAgICAgICAgdGltZXIgd2hp Y2ggc2V0cyB0aGUgZGlzcGxheTpub25lIHByb3BlcnR5IG9uIHRoZSBjb250cm9scy4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFBhbmVsRWxlbWVudDo6c2V0SXNEaXNwbGF5ZWQpOiBT ZXR0ZXIgZm9yIHRoZSBzdGF0ZSB2YXJpYWJsZS4KKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAg ICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmg6CisgICAgICAgIChNZWRpYUNv bnRyb2xQYW5lbEVsZW1lbnQpOgorICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbFJv b3RFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50 OjpzaG93KTogVXBkYXRlZCB0aGUgcGFuZWwgdmlzaWJpbGl0eSBzdGF0ZS4KKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RFbGVtZW50OjpoaWRlKTogVXBkYXRlZCB0aGUgcGFuZWwg dmlzaWJpbGl0eSBzdGF0ZS4KKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290 RWxlbWVudENocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFJvb3RF bGVtZW50Q2hyb21pdW06OnNob3cpOiBVcGRhdGVkIHRoZSBwYW5lbCB2aXNpYmlsaXR5IHN0YXRl LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6aGlk ZSk6IFVwZGF0ZWQgdGhlIHBhbmVsIHZpc2liaWxpdHkgc3RhdGUuCisKIDIwMTItMDQtMjQgIFBh dmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogcmVtb3ZlIHB1cmUgZGVsZWdhdGlvbiBjb2RlIGZyb20gRGVidWdnZXJQcmVzZW50YXRp b25Nb2RlbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250 cm9sRWxlbWVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9s RWxlbWVudHMuY3BwCmluZGV4IGYxY2ZmYTAxZTk5NzEzMzUxNmNmZTJmMGNmOGNiZDYxMDVhMzFl NzQuLjhmNjM0NjVjZWZlNzY3NWE3ODE3NTJiOTBhNDMwZjE3YzQyMGNmMWMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKQEAg LTEwOCw2ICsxMDgsNyBAQCBpbmxpbmUgTWVkaWFDb250cm9sUGFuZWxFbGVtZW50OjpNZWRpYUNv bnRyb2xQYW5lbEVsZW1lbnQoRG9jdW1lbnQqIGRvY3VtZW50KQogICAgIDogTWVkaWFDb250cm9s RWxlbWVudChkb2N1bWVudCkKICAgICAsIG1fY2FuQmVEcmFnZ2VkKGZhbHNlKQogICAgICwgbV9p c0JlaW5nRHJhZ2dlZChmYWxzZSkKKyAgICAsIG1faXNEaXNwbGF5ZWQoZmFsc2UpCiAgICAgLCBt X29wYXF1ZSh0cnVlKQogICAgICwgbV90cmFuc2l0aW9uVGltZXIodGhpcywgJk1lZGlhQ29udHJv bFBhbmVsRWxlbWVudDo6dHJhbnNpdGlvblRpbWVyRmlyZWQpCiB7CkBAIC0yNDEsOSArMjQyLDgg QEAgdm9pZCBNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6Om1ha2VPcGFxdWUoKQogCiAgICAgbV9v cGFxdWUgPSB0cnVlOwogCi0gICAgLy8gRklYTUUoQlVHIDc5MzQ3KTogVGhlIGRpc3BsYXk6bm9u ZSBwcm9wZXJ0eSBzaG91bGQgYmUgdG9nZ2xlZCBiZWxvdyBvbmx5Ci0gICAgLy8gd2hlbiBkaXNw bGF5IGxvZ2ljIGlzIGludHJvZHVjZWQuCi0gICAgLy8gc2hvdygpOworICAgIGlmIChtX2lzRGlz cGxheWVkKQorICAgICAgICBzaG93KCk7CiB9CiAKIHZvaWQgTWVkaWFDb250cm9sUGFuZWxFbGVt ZW50OjptYWtlVHJhbnNwYXJlbnQoKQpAQCAtMjU3LDkgKzI1Nyw3IEBAIHZvaWQgTWVkaWFDb250 cm9sUGFuZWxFbGVtZW50OjptYWtlVHJhbnNwYXJlbnQoKQogCiAgICAgbV9vcGFxdWUgPSBmYWxz ZTsKIAotICAgIC8vIEZJWE1FKEJVRyA3OTM0Nyk6IFRoZSBkaXNwbGF5Om5vbmUgcHJvcGVydHkg c2hvdWxkIGJlIHRvZ2dsZWQgYmVsb3cKLSAgICAvLyAodGhyb3VnaCB0aGUgdGltZXIgc3RhcnQp IHdoZW4gZGlzcGxheSBsb2dpYyBpcyBpbnRyb2R1Y2VkLgotICAgIC8vIHN0YXJ0VGltZXIoKTsK KyAgICBzdGFydFRpbWVyKCk7CiB9CiAKIHZvaWQgTWVkaWFDb250cm9sUGFuZWxFbGVtZW50Ojpk ZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKQEAgLTI5Miw2ICsyOTAsMTEgQEAgdm9p ZCBNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ6OnNldENhbkJlRHJhZ2dlZChib29sIGNhbkJlRHJh Z2dlZCkKICAgICAgICAgZW5kRHJhZygpOwogfQogCit2b2lkIE1lZGlhQ29udHJvbFBhbmVsRWxl bWVudDo6c2V0SXNEaXNwbGF5ZWQoYm9vbCBpc0Rpc3BsYXllZCkKK3sKKyAgICBtX2lzRGlzcGxh eWVkID0gaXNEaXNwbGF5ZWQ7Cit9CisKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0K IAogaW5saW5lIE1lZGlhQ29udHJvbFRpbWVsaW5lQ29udGFpbmVyRWxlbWVudDo6TWVkaWFDb250 cm9sVGltZWxpbmVDb250YWluZXJFbGVtZW50KERvY3VtZW50KiBkb2N1bWVudCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmggYi9T b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5oCmluZGV4IDUz MDM3MmIxY2FlMWIyODA0MjA5YmJiNWVjYzhjZDI4ZmVkOTExY2IuLjQ2N2UzMWQ3ODE1MjkzMTQ3 MzdhYTFmY2U5ZjBmNmFlNjljMjhjNjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv c2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuaApAQCAtMTA5LDYgKzEwOSw4IEBAIHB1YmxpYzoK ICAgICBzdGF0aWMgUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xQYW5lbEVsZW1lbnQ+IGNyZWF0ZShE b2N1bWVudCopOwogCiAgICAgdm9pZCBzZXRDYW5CZURyYWdnZWQoYm9vbCk7CisgICAgdm9pZCBz ZXRJc0Rpc3BsYXllZChib29sKTsKKwogICAgIHZvaWQgcmVzZXRQb3NpdGlvbigpOwogICAgIHZv aWQgbWFrZU9wYXF1ZSgpOwogICAgIHZvaWQgbWFrZVRyYW5zcGFyZW50KCk7CkBAIC0xMzEsNiAr MTMzLDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgbV9jYW5CZURyYWdnZWQ7CiAgICAgYm9vbCBt X2lzQmVpbmdEcmFnZ2VkOworICAgIGJvb2wgbV9pc0Rpc3BsYXllZDsKICAgICBib29sIG1fb3Bh cXVlOwogICAgIExheW91dFBvaW50IG1fZHJhZ1N0YXJ0RXZlbnRMb2NhdGlvbjsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnQu Y3BwCmluZGV4IDAwZTAyN2RkODdiZjdlYWJhMWE1NmM5YTIyMjI5NmE4MDdmNTYzNjQuLjdmODMx YmM0MmIwMGE3Zjk5MmY5YjNlOWZlMDUzY2VkZmFjNDRiODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbFJvb3RFbGVtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudC5jcHAKQEAgLTI4 NCwxMSArMjg0LDEzIEBAIHZvaWQgTWVkaWFDb250cm9sUm9vdEVsZW1lbnQ6OnNldE1lZGlhQ29u dHJvbGxlcihNZWRpYUNvbnRyb2xsZXJJbnRlcmZhY2UqIGNvbnRyCiAKIHZvaWQgTWVkaWFDb250 cm9sUm9vdEVsZW1lbnQ6OnNob3coKQogeworICAgIG1fcGFuZWwtPnNldElzRGlzcGxheWVkKHRy dWUpOwogICAgIG1fcGFuZWwtPnNob3coKTsKIH0KIAogdm9pZCBNZWRpYUNvbnRyb2xSb290RWxl bWVudDo6aGlkZSgpCiB7CisgICAgbV9wYW5lbC0+c2V0SXNEaXNwbGF5ZWQoZmFsc2UpOwogICAg IG1fcGFuZWwtPmhpZGUoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvTWVkaWFDb250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcAppbmRleCBk YzQ5OGI4NmQ4MGY1NGVjYmM3NzBkYzBmOTIzOTU5MWY5ZGYxMjEzLi45ZmQ0N2EzNWZiZWVjYTEz MzczYWI2MmU4YWI3MjYwZGFhNmRlZTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVtLmNwcApA QCAtMTcwLDExICsxNzAsMTMgQEAgdm9pZCBNZWRpYUNvbnRyb2xSb290RWxlbWVudENocm9taXVt OjpzZXRNZWRpYUNvbnRyb2xsZXIoTWVkaWFDb250cm9sbGVySW50ZXJmYWMKIAogdm9pZCBNZWRp YUNvbnRyb2xSb290RWxlbWVudENocm9taXVtOjpzaG93KCkKIHsKKyAgICBtX3BhbmVsLT5zZXRJ c0Rpc3BsYXllZCh0cnVlKTsKICAgICBtX3BhbmVsLT5zaG93KCk7CiB9CiAKIHZvaWQgTWVkaWFD b250cm9sUm9vdEVsZW1lbnRDaHJvbWl1bTo6aGlkZSgpCiB7CisgICAgbV9wYW5lbC0+c2V0SXNE aXNwbGF5ZWQoZmFsc2UpOwogICAgIG1fcGFuZWwtPmhpZGUoKTsKIH0KIApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGRmM2Yw YmVmMGQwNjMwMmI5OTk4ZjNiYzc0MDFlNzhmMTRiYzY0YzIuLjYyNTA4NTY0NGQwOTViMThjMDll ZjAyZmI1ZDVhYzg4OWMyM2YyMzkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZwor KysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNC0yNCAg VmljdG9yIENhcmJ1bmUgIDx2Y2FyYnVuZUBhZG9iZS5jb20+CisKKyAgICAgICAgRXh0cmEgZGlz cGxheSBsb2dpYyBmb3IgdGhlIG1lZGlhIGNvbnRyb2wgcGFuZWwgZWxlbWVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI0NzYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCB0ZXN0IHRvIGVuc3Vy ZSB0aGF0IGNvbnRyb2xzIGFyZSBub3QgZGlzcGxheWVkIHdoZW4KKyAgICAgICAgdGhlIGNvbnRy b2xzIGF0dHJpYnV0ZSBpcyBub3Qgc2V0LgorCisgICAgICAgICogbWVkaWEvdmlkZW8tY29udHJv bHMtdG9nZ2xpbmctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS92aWRlby1j b250cm9scy10b2dnbGluZy5odG1sOiBBZGRlZC4KKwogMjAxMi0wNC0yNCAgQ2hyaXN0b3BoZSBE dW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29tPgogCiAgICAgICAgIFtFRkxdIE1vdmUg dGVzdHMgdGhhdCByZXF1aXJlIGxpbmsgcHJlZmV0Y2hpbmcgdG8gdGVzdCBleHBlY3RhdGlvbnMK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRyb2xzLXRvZ2dsaW5nLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRyb2xzLXRvZ2dsaW5nLWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lYzk1MGY3ZTRiYzQ3NDMwNjhkZjhiMDFmY2MyY2MwMWQ4 ZmYxM2YwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJv bHMtdG9nZ2xpbmctZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjggQEAKK1Rlc3RzIHRoYXQgc2hv d2luZyAvIGhpZGluZyB2aWRlbyBjb250cm9scyB1c2VzIHRoZSBzZXRzIHRoZSBkaXNwbGF5Om5v bmUgcHJvcGVydHkKKworKiogUGxheWluZyB0aGUgdmlkZW8gKioKK1JVTih2aWRlby5wbGF5KCkp CisKKyoqIE1vdmUgbW91c2Ugc29tZXdoZXJlIG92ZXIgdGhlIHBhbmVsICoqCitSVU4oZXZlbnRT ZW5kZXIubW91c2VNb3ZlVG8obXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzBdLCBtdXRlQnV0dG9uQ29v cmRpbmF0ZXNbMV0pKQorCisqKiBUZXN0IHRoYXQgY29udHJvbHMgYXJlIHNob3duIHdoZW4gY29u dHJvbHMgYXR0cmlidXRlIGlzIHByZXNlbnQgKioKK0VYUEVDVEVEIChwYW5lbC5zdHlsZVsnZGlz cGxheSddICE9ICdub25lJykgT0sKKworKiogTW92ZSBtb3VzZSBvdXRzaWRlIHRoZSB2aWRlbyAq KgorUlVOKGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHZpZGVvLm9mZnNldExlZnQsIHZpZGVvLm9m ZnNldFRvcCArIDIgKiB2aWRlby5vZmZzZXRIZWlnaHQpKQorCisqKiBUaGUgY29udHJvbHMgc2hv dWxkIGhhdmUgdGhlIGRpc3BsYXkgcHJvcGVydHkgc2V0IHRvIG5vbmUKK0VYUEVDVEVEIChwYW5l bC5zdHlsZVsnZGlzcGxheSddID09ICdub25lJykgT0sKKworKiogUmVtb3ZlIGNvbnRyb2xzIGF0 dHJpYnV0ZSoqCitSVU4odmlkZW8ucmVtb3ZlQXR0cmlidXRlKCdjb250cm9scycpKQorCisqKiBN b3ZlIG1vdXNlIGJhY2sgb3ZlciB0aGUgcGFuZWwgKioKK1JVTihldmVudFNlbmRlci5tb3VzZU1v dmVUbyhtdXRlQnV0dG9uQ29vcmRpbmF0ZXNbMF0sIG11dGVCdXR0b25Db29yZGluYXRlc1sxXSkp CisKKyoqIFZpZGVvIGNvbnRyb2xzIHNob3VsZCBub3QgYmUgc2hvd24gKioKK0VYUEVDVEVEIChw YW5lbC5zdHlsZVsnZGlzcGxheSddID09ICdub25lJykgT0sKKworRU5EIE9GIFRFU1QKKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtdG9nZ2xpbmcuaHRtbCBi L0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRyb2xzLXRvZ2dsaW5nLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uODE4NWQ1NzNhMzRmNDQ3YzUwYzkzODBiMDQwMTA2Y2MwYmMwZTlhOQotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRyb2xzLXRvZ2dsaW5nLmh0bWwKQEAg LTAsMCArMSw4NyBAQAorPGh0bWw+Cis8aGVhZD4KKyAgICA8dGl0bGU+VGVzdCByZW5kZXJpbmcg b2Ygdm9sdW1lIHNsaWRlciBvZiB2aWRlbyB0YWc8L3RpdGxlPgorICAgIDxzY3JpcHQgc3JjPW1l ZGlhLWZpbGUuanM+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9bWVkaWEtY29udHJvbHMuanM+ PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9dmlkZW8tdGVzdC5qcz48L3NjcmlwdD4KKyAgICA8 c2NyaXB0PgorICAgICAgICB2YXIgdmlkZW87CisgICAgICAgIHZhciBwYW5lbDsKKyAgICAgICAg dmFyIG11dGVCdXR0b25Db29yZGluYXRlczsKKyAgICAgICAgdmFyIGZhZGVvdXRUaW1lID0gMzAw OworCisgICAgICAgIGZ1bmN0aW9uIGluaXQoKQorICAgICAgICB7CisgICAgICAgICAgICB2aWRl byA9IGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCJ2aWRlbyIpWzBdOworICAgICAgICAg ICAgdmlkZW8uc3JjID0gZmluZE1lZGlhRmlsZSgidmlkZW8iLCAiY29udGVudC90ZXN0Iik7CisK KyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUo IioqIFBsYXlpbmcgdGhlIHZpZGVvICoqIik7CisgICAgICAgICAgICBydW4oInZpZGVvLnBsYXko KSIpOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gdGVzdCgpCisgICAgICAgIHsKKyAg ICAgICAgICAgIHBhbmVsID0gbWVkaWFDb250cm9sc0VsZW1lbnQoaW50ZXJuYWxzLnNoYWRvd1Jv b3QodmlkZW8pLmZpcnN0Q2hpbGQsICItd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsIik7CisK KyAgICAgICAgICAgIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsKKyAgICAgICAgICAgICAgICB0 cnkgeworICAgICAgICAgICAgICAgICAgICBtdXRlQnV0dG9uQ29vcmRpbmF0ZXMgPSBtZWRpYUNv bnRyb2xzQnV0dG9uQ29vcmRpbmF0ZXModmlkZW8sICJtdXRlLWJ1dHRvbiIpOworICAgICAgICAg ICAgICAgIH0gY2F0Y2ggKGV4Y2VwdGlvbikgeworICAgICAgICAgICAgICAgICAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwor ICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiKiogTW92ZSBtb3VzZSBzb21ld2hlcmUgb3Zl ciB0aGUgcGFuZWwgKioiKTsKKyAgICAgICAgICAgICAgICBydW4oImV2ZW50U2VuZGVyLm1vdXNl TW92ZVRvKG11dGVCdXR0b25Db29yZGluYXRlc1swXSwgbXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzFd KSIpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAg ICAgICAgICAgY29uc29sZVdyaXRlKCIqKiBUZXN0IHRoYXQgY29udHJvbHMgYXJlIHNob3duIHdo ZW4gY29udHJvbHMgYXR0cmlidXRlIGlzIHByZXNlbnQgKioiKTsKKyAgICAgICAgICAgIHRlc3RF eHBlY3RlZCgicGFuZWwuc3R5bGVbJ2Rpc3BsYXknXSIsICdub25lJywgIiE9Iik7CisKKyAgICAg ICAgICAgIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsKKyAgICAgICAgICAgICAgICBjb25zb2xl V3JpdGUoIiIpOworICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiKiogTW92ZSBtb3VzZSBv dXRzaWRlIHRoZSB2aWRlbyAqKiIpOworICAgICAgICAgICAgICAgIHJ1bigiZXZlbnRTZW5kZXIu bW91c2VNb3ZlVG8odmlkZW8ub2Zmc2V0TGVmdCwgdmlkZW8ub2Zmc2V0VG9wICsgMiAqIHZpZGVv Lm9mZnNldEhlaWdodCkiKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgc2V0VGltZW91 dChjb250aW51ZVRlc3QsIGZhZGVvdXRUaW1lKTsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0 aW9uIGNvbnRpbnVlVGVzdCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmIChwYW5lbC5zdHls ZVsnZGlzcGxheSddICE9ICdub25lJykgeworICAgICAgICAgICAgICAgIHNldFRpbWVvdXQoY29u dGludWVUZXN0LCBmYWRlb3V0VGltZSk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAg ICAgICAgfQorCisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOworICAgICAgICAgICAgY29u c29sZVdyaXRlKCIqKiBUaGUgY29udHJvbHMgc2hvdWxkIGhhdmUgdGhlIGRpc3BsYXkgcHJvcGVy dHkgc2V0IHRvIG5vbmUiKTsKKyAgICAgICAgICAgIHRlc3RFeHBlY3RlZCgicGFuZWwuc3R5bGVb J2Rpc3BsYXknXSIsICdub25lJywgIj09Iik7CisKKyAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgi Iik7CisgICAgICAgICAgICBjb25zb2xlV3JpdGUoIioqIFJlbW92ZSBjb250cm9scyBhdHRyaWJ1 dGUqKiIpOworICAgICAgICAgICAgcnVuKCJ2aWRlby5yZW1vdmVBdHRyaWJ1dGUoJ2NvbnRyb2xz JykiKTsKKworICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKKyAgICAgICAgICAgIGNvbnNv bGVXcml0ZSgiKiogTW92ZSBtb3VzZSBiYWNrIG92ZXIgdGhlIHBhbmVsICoqIik7CisgICAgICAg ICAgICBydW4oImV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKG11dGVCdXR0b25Db29yZGluYXRlc1sw XSwgbXV0ZUJ1dHRvbkNvb3JkaW5hdGVzWzFdKSIpOworCisgICAgICAgICAgICBjb25zb2xlV3Jp dGUoIiIpOworICAgICAgICAgICAgY29uc29sZVdyaXRlKCIqKiBWaWRlbyBjb250cm9scyBzaG91 bGQgbm90IGJlIHNob3duICoqIik7CisgICAgICAgICAgICB0ZXN0RXhwZWN0ZWQoInBhbmVsLnN0 eWxlWydkaXNwbGF5J10iLCAnbm9uZScsICI9PSIpOworCisgICAgICAgICAgICBjb25zb2xlV3Jp dGUoIiIpOworCisgICAgICAgICAgICBlbmRUZXN0KCk7CisgICAgICAgIH0KKworICAgIDwvc2Ny aXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJpbml0KCkiPgorICAgIFRlc3RzIHRoYXQgc2hv d2luZyAvIGhpZGluZyB2aWRlbyBjb250cm9scyB1c2VzIHRoZSBzZXRzIHRoZSBkaXNwbGF5Om5v bmUgcHJvcGVydHk8YnI+CisgICAgPHZpZGVvIG9ucGxheT0idGVzdCgpIiBjb250cm9scz48L3Zp ZGVvPgorPC9ib2R5PgorPC9odG1sPgo=