220847 2021-01-22 00:50:42 -0800 MotionMark scores are super sensitive to a single long frame 2021-03-09 15:50:26 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 222449 1 mmaxfield mmaxfield cdumez commit-queue ews-watchlist jbedard jonlee mjs rniwa sabouhallawa webkit-bug-importer oldest_to_newest 1721509 0 mmaxfield 2021-01-22 00:50:42 -0800 MotionMark scores are super sensitive to a single long frame 1721514 1 418116 mmaxfield 2021-01-22 00:58:13 -0800 Created attachment 418116 WIP 1723257 2 mmaxfield 2021-01-27 19:39:08 -0800 *** This bug has been marked as a duplicate of bug 221075 *** 1729991 3 mmaxfield 2021-02-16 15:42:34 -0800 Reopening because the problem seems to still exist after r272044 1729994 4 mmaxfield 2021-02-16 15:46:30 -0800 <rdar://problem/74152743> 1729997 5 420553 mmaxfield 2021-02-16 15:48:23 -0800 Created attachment 420553 Patch 1730611 6 420553 mjs 2021-02-17 15:59:09 -0800 Comment on attachment 420553 Patch I'm not an expert on MotionMark, but to the extent I understand the intent of this patch, it seems to do what its supposed to. 1730763 7 jonlee 2021-02-18 00:23:49 -0800 lgtm. 1731176 8 mmaxfield 2021-02-18 19:30:03 -0800 Committed r273122 (234319@main): <https://commits.webkit.org/234319@main> 1731177 9 mmaxfield 2021-02-18 19:35:24 -0800 Committed r273123 (234320@main): <https://commits.webkit.org/234320@main> 1733629 10 commit-queue 2021-02-25 18:39:04 -0800 Re-opened since this is blocked by bug 222449 1736985 11 422546 mmaxfield 2021-03-07 23:45:07 -0800 Created attachment 422546 Patch 1737173 12 422587 mmaxfield 2021-03-08 11:06:06 -0800 Created attachment 422587 Patch 1737514 13 422681 mmaxfield 2021-03-09 02:10:01 -0800 Created attachment 422681 Patch 1737745 14 422681 mmaxfield 2021-03-09 13:41:56 -0800 Comment on attachment 422681 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=422681&action=review > PerformanceTests/ChangeLog:17 > + a complexity that was 3.16x of the previous complexity. This patch changes that to 1.5x of the previous Whoops, this is actually 1.778x 1737753 15 422756 mmaxfield 2021-03-09 14:16:04 -0800 Created attachment 422756 Patch for committing 1737754 16 422757 mmaxfield 2021-03-09 14:16:57 -0800 Created attachment 422757 Patch for committing 1737790 17 ews-feeder 2021-03-09 15:08:46 -0800 Committed r274179: <https://commits.webkit.org/r274179> All reviewed patches have been landed. Closing bug and clearing flags on attachment 422757. 1737818 18 mmaxfield 2021-03-09 15:50:26 -0800 Committed r274183 (235102@main): <https://commits.webkit.org/235102@main> 418116 2021-01-22 00:58:13 -0800 2021-02-16 15:48:22 -0800 WIP bug-220847-20210122005812.patch text/plain 6950 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNjg1CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9icm93c2Vy YmVuY2gub3JnL0NoYW5nZUxvZyBiL1dlYnNpdGVzL2Jyb3dzZXJiZW5jaC5vcmcvQ2hhbmdlTG9n CmluZGV4IGZmNmM2ZGFlNDI5ZDllMzkxNmNlYTcyNWFkYzI2YjY3ODEyNjhlMTEuLjU3YTc2MDA3 ODFmM2IxMDEwYWIyY2MxNmU2NDhjMzcwNmNkMTg5YzQgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL2Jy b3dzZXJiZW5jaC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL2Jyb3dzZXJiZW5jaC5vcmcv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMjEtMDEtMjIgIE15bGVzIEMuIE1heGZpZWxk ICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBNb3Rpb25NYXJrIHNjb3JlcyBhcmUg c3VwZXIgc2Vuc2l0aXZlIHRvIGEgc2luZ2xlIGxvbmcgZnJhbWUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDg0NworICAgICAgICA8cmRhcjovL3By b2JsZW0vNzIxNDM2NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQ3VycmVudGx5LCAicmFtcCIgdGVzdHMgaGF2ZSB0d28gcGhhc2VzOiBvbmUgd2hl cmUgdGhleSB0cnkgdG8gZGV0ZXJtaW5lIGEgbWF4aW11bSByZWFzb25hYmxlIGNvbXBsZXhpdHks CisgICAgICAgIGFuZCBvbmUgd2hlcmUgdGhleSB0cnkgdmFyaW91cyBjb21wbGV4aXRpZXMgYmV0 d2VlbiAwIGFuZCB0aGUgbWF4aW11bS4gVGhlIGNhbGN1bGF0aW9uIG9mIHRoaXMgbWF4aW11bSBy ZWFzb25hYmxlCisgICAgICAgIGNvbXBsZXhpdHkgaXMgY3VycmVudGx5IHZlcnkgc2Vuc2l0aXZl IHRvIG91dGxpZXIgZnJhbWUgdGltZXMuIElmIHRoZXJlIGlzIGEgc2luZ2xlIG91dGxpZXIgZnJh bWUgdGltZSwgdGhlCisgICAgICAgIGZhaWx1cmUgbW9kZSBpcyB0byBhc3N1bWUgdGhhdCB0aGUg bWF4aW11bSBjb21wbGV4aXR5IGlzIH4xMC4gU28sIHRoZSBzb2x1dGlvbiBpcyB0byBpZ25vcmUg b3V0bGllciBmcmFtZSB0aW1lcworICAgICAgICBkdXJpbmcgdGhpcyBmaXJzdCBwaGFzZSwgYW5k IHRvIGVuc3VyZSB0aGF0IHRoZXJlIGFyZSBhdCBsZWFzdCA5IGZyYW1lcyBtZWFzdXJlZCB0aGF0 IGhhdmUgbm9uLW91dGxpZXIgdGltZXMuCisKKyAgICAgICAgKiBNb3Rpb25NYXJrMS4xL3Rlc3Rz L3Jlc291cmNlcy9tYWluLmpzOgorICAgICAgICAoZmlsdGVyT3V0T3V0bGllcnMpOgorICAgICAg ICAoX21lYXN1cmVBbmRSZXNldEludGVydmFsKToKKyAgICAgICAgKHVwZGF0ZSk6CisgICAgICAg IChyZWdpc3RlckZyYW1lVGltZSk6CisgICAgICAgIChpbnRlcnZhbEhhc0NvbmNsdWRlZCk6Cisg ICAgICAgIChzdGFydCk6CisgICAgICAgIChkaWRGaW5pc2hJbnRlcnZhbCk6CisKIDIwMjEtMDEt MDUgIEJldGggRGFraW4gIDxiZGFraW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBub24t aW5jbHVzaXZlIGxhbmd1YWdlIGZyb20gY29weSBvZiBKZXRTdHJlYW0gMi4wIGluIFdlYnNpdGVz LwpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvYnJvd3NlcmJlbmNoLm9yZy9Nb3Rpb25NYXJrMS4xL3Rl c3RzL3Jlc291cmNlcy9tYWluLmpzIGIvV2Vic2l0ZXMvYnJvd3NlcmJlbmNoLm9yZy9Nb3Rpb25N YXJrMS4xL3Rlc3RzL3Jlc291cmNlcy9tYWluLmpzCmluZGV4IDVjM2JiZGYzYzY1YjVjYTA5Y2Nm N2YyOWU5MmRhYWQ0ODFjOWVkMzIuLmIyMjhhNDQwMGI2MmMyMWFjZTA5YWJhNGI3NTAxMmFlOTRj ODg4YWYgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL2Jyb3dzZXJiZW5jaC5vcmcvTW90aW9uTWFyazEu MS90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qcworKysgYi9XZWJzaXRlcy9icm93c2VyYmVuY2gub3Jn L01vdGlvbk1hcmsxLjEvdGVzdHMvcmVzb3VyY2VzL21haW4uanMKQEAgLTExMCwxNCArMTEwLDMz IEBAIENvbnRyb2xsZXIgPSBVdGlsaXRpZXMuY3JlYXRlQ2xhc3MoCiAgICAgICAgIHJldHVybiBj b21tZW50IGluIHRoaXMuX21hcmtzOwogICAgIH0sCiAKKyAgICBmaWx0ZXJPdXRPdXRsaWVyczog ZnVuY3Rpb24oYXJyYXkpCisgICAgeworICAgICAgICBpZiAoYXJyYXkubGVuZ3RoID09IDApCisg ICAgICAgICAgICByZXR1cm4gW107CisKKyAgICAgICAgYXJyYXkuc29ydCgpOworICAgICAgICB2 YXIgcTEgPSBhcnJheVtNYXRoLm1pbihNYXRoLnJvdW5kKGFycmF5Lmxlbmd0aCAqIDEgLyA0KSwg YXJyYXkubGVuZ3RoIC0gMSldOworICAgICAgICB2YXIgcTMgPSBhcnJheVtNYXRoLm1pbihNYXRo LnJvdW5kKGFycmF5Lmxlbmd0aCAqIDMgLyA0KSwgYXJyYXkubGVuZ3RoIC0gMSldOworICAgICAg ICB2YXIgaW50ZXJxdWFydGlsZVJhbmdlID0gcTMgLSBxMTsKKyAgICAgICAgdmFyIG1pbmltdW0g PSBxMSAtIGludGVycXVhcnRpbGVSYW5nZSAqIDEuNTsKKyAgICAgICAgdmFyIG1heGltdW0gPSBx MyArIGludGVycXVhcnRpbGVSYW5nZSAqIDEuNTsKKyAgICAgICAgcmV0dXJuIGFycmF5LmZpbHRl cih4ID0+IHggPj0gbWluaW11bSAmJiB4IDw9IG1heGltdW0pOworICAgIH0sCisKICAgICBfbWVh c3VyZUFuZFJlc2V0SW50ZXJ2YWw6IGZ1bmN0aW9uKGN1cnJlbnRUaW1lc3RhbXApCiAgICAgewog ICAgICAgICB2YXIgc2FtcGxlQ291bnQgPSB0aGlzLl9zYW1wbGVyLnNhbXBsZUNvdW50OwogICAg ICAgICB2YXIgYXZlcmFnZUZyYW1lTGVuZ3RoID0gMDsKIAogICAgICAgICBpZiAodGhpcy5faW50 ZXJ2YWxFbmRUaW1lc3RhbXApIHsKLSAgICAgICAgICAgIHZhciBpbnRlcnZhbFN0YXJ0VGltZXN0 YW1wID0gdGhpcy5fc2FtcGxlci5zYW1wbGVzWzBdW3RoaXMuX2ludGVydmFsU3RhcnRJbmRleF07 Ci0gICAgICAgICAgICBhdmVyYWdlRnJhbWVMZW5ndGggPSAoY3VycmVudFRpbWVzdGFtcCAtIGlu dGVydmFsU3RhcnRUaW1lc3RhbXApIC8gKHNhbXBsZUNvdW50IC0gdGhpcy5faW50ZXJ2YWxTdGFy dEluZGV4KTsKKyAgICAgICAgICAgIHZhciBkdXJhdGlvbnMgPSBbXTsKKyAgICAgICAgICAgIGZv ciAodmFyIGkgPSBNYXRoLm1heCh0aGlzLl9pbnRlcnZhbFN0YXJ0SW5kZXgsIDEpOyBpIDwgc2Ft cGxlQ291bnQ7ICsraSkgeworICAgICAgICAgICAgICAgIGR1cmF0aW9ucy5wdXNoKHRoaXMuX3Nh bXBsZXIuc2FtcGxlc1swXVtpXSAtIHRoaXMuX3NhbXBsZXIuc2FtcGxlc1swXVtpIC0gMV0pOwor ICAgICAgICAgICAgfQorICAgICAgICAgICAgdmFyIGZpbHRlcmVkRHVyYXRpb25zID0gdGhpcy5m aWx0ZXJPdXRPdXRsaWVycyhkdXJhdGlvbnMpOworICAgICAgICAgICAgaWYgKGZpbHRlcmVkRHVy YXRpb25zLmxlbmd0aCA+IDApCisgICAgICAgICAgICAgICAgYXZlcmFnZUZyYW1lTGVuZ3RoID0g ZmlsdGVyZWREdXJhdGlvbnMucmVkdWNlKChhLCBiKSA9PiBhICsgYiwgMCkgLyBmaWx0ZXJlZER1 cmF0aW9ucy5sZW5ndGg7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9pbnRlcnZhbFN0YXJ0 SW5kZXggPSBzYW1wbGVDb3VudDsKQEAgLTEzOCwyMSArMTU3LDM0IEBAIENvbnRyb2xsZXIgPSBV dGlsaXRpZXMuY3JlYXRlQ2xhc3MoCiAgICAgICAgICAgICAgICAgdGhpcy5fZnJhbWVMZW5ndGhF c3RpbWF0b3Iuc2FtcGxlKGxhc3RGcmFtZUxlbmd0aCk7CiAgICAgICAgICAgICAgICAgZnJhbWVM ZW5ndGhFc3RpbWF0ZSA9IHRoaXMuX2ZyYW1lTGVuZ3RoRXN0aW1hdG9yLmVzdGltYXRlOwogICAg ICAgICAgICAgfQotICAgICAgICB9IGVsc2UgaWYgKHRpbWVzdGFtcCA+PSB0aGlzLl9pbnRlcnZh bEVuZFRpbWVzdGFtcCkgewotICAgICAgICAgICAgdmFyIGludGVydmFsU3RhcnRUaW1lc3RhbXAg PSB0aGlzLl9zYW1wbGVyLnNhbXBsZXNbMF1bdGhpcy5faW50ZXJ2YWxTdGFydEluZGV4XTsKLSAg ICAgICAgICAgIGludGVydmFsQXZlcmFnZUZyYW1lTGVuZ3RoID0gdGhpcy5fbWVhc3VyZUFuZFJl c2V0SW50ZXJ2YWwodGltZXN0YW1wKTsKLSAgICAgICAgICAgIGlmICh0aGlzLl9pc0ZyYW1lTGVu Z3RoRXN0aW1hdG9yRW5hYmxlZCkgewotICAgICAgICAgICAgICAgIHRoaXMuX2ZyYW1lTGVuZ3Ro RXN0aW1hdG9yLnNhbXBsZShpbnRlcnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCk7Ci0gICAgICAgICAg ICAgICAgZnJhbWVMZW5ndGhFc3RpbWF0ZSA9IHRoaXMuX2ZyYW1lTGVuZ3RoRXN0aW1hdG9yLmVz dGltYXRlOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgdGhpcy5yZWdpc3RlckZyYW1l VGltZShsYXN0RnJhbWVMZW5ndGgpOworICAgICAgICAgICAgaWYgKHRoaXMuaW50ZXJ2YWxIYXND b25jbHVkZWQodGltZXN0YW1wKSkgeworICAgICAgICAgICAgICAgIHZhciBpbnRlcnZhbFN0YXJ0 VGltZXN0YW1wID0gdGhpcy5fc2FtcGxlci5zYW1wbGVzWzBdW3RoaXMuX2ludGVydmFsU3RhcnRJ bmRleF07CisgICAgICAgICAgICAgICAgaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGggPSB0aGlz Ll9tZWFzdXJlQW5kUmVzZXRJbnRlcnZhbCh0aW1lc3RhbXApOworICAgICAgICAgICAgICAgIGlm ICh0aGlzLl9pc0ZyYW1lTGVuZ3RoRXN0aW1hdG9yRW5hYmxlZCkgeworICAgICAgICAgICAgICAg ICAgICB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5zYW1wbGUoaW50ZXJ2YWxBdmVyYWdlRnJh bWVMZW5ndGgpOworICAgICAgICAgICAgICAgICAgICBmcmFtZUxlbmd0aEVzdGltYXRlID0gdGhp cy5fZnJhbWVMZW5ndGhFc3RpbWF0b3IuZXN0aW1hdGU7CisgICAgICAgICAgICAgICAgfQorICAg ICAgICAgICAgICAgIGRpZEZpbmlzaEludGVydmFsID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICB0 aGlzLmRpZEZpbmlzaEludGVydmFsKHRpbWVzdGFtcCwgc3RhZ2UsIGludGVydmFsQXZlcmFnZUZy YW1lTGVuZ3RoKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5y ZXNldCgpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgZGlkRmluaXNoSW50ZXJ2YWwgPSB0 cnVlOwotICAgICAgICAgICAgdGhpcy5kaWRGaW5pc2hJbnRlcnZhbCh0aW1lc3RhbXAsIHN0YWdl LCBpbnRlcnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCk7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlz Ll9zYW1wbGVyLnJlY29yZCh0aW1lc3RhbXAsIHN0YWdlLmNvbXBsZXhpdHkoKSwgZnJhbWVMZW5n dGhFc3RpbWF0ZSk7CiAgICAgICAgIHRoaXMudHVuZSh0aW1lc3RhbXAsIHN0YWdlLCBsYXN0RnJh bWVMZW5ndGgsIGRpZEZpbmlzaEludGVydmFsLCBpbnRlcnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCk7 CiAgICAgfSwKIAorICAgIHJlZ2lzdGVyRnJhbWVUaW1lOiBmdW5jdGlvbihsYXN0RnJhbWVMZW5n dGgpCisgICAgeworICAgIH0sCisKKyAgICBpbnRlcnZhbEhhc0NvbmNsdWRlZDogZnVuY3Rpb24o dGltZXN0YW1wKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRpbWVzdGFtcCA+PSB0aGlzLl9pbnRl cnZhbEVuZFRpbWVzdGFtcDsKKyAgICB9LAorCiAgICAgZGlkRmluaXNoSW50ZXJ2YWw6IGZ1bmN0 aW9uKHRpbWVzdGFtcCwgc3RhZ2UsIGludGVydmFsQXZlcmFnZUZyYW1lTGVuZ3RoKQogICAgIHsK ICAgICB9LApAQCAtMzM2LDYgKzM2OCw4IEBAIFJhbXBDb250cm9sbGVyID0gVXRpbGl0aWVzLmNy ZWF0ZVN1YmNsYXNzKENvbnRyb2xsZXIsCiAgICAgdGllckZhc3RUZXN0TGVuZ3RoOiAyNTAsCiAg ICAgLy8gSWYgdGhlIGVuZ2luZSBpcyB1bmRlciBzdHJlc3MsIGxldCB0aGUgdGVzdCBydW4gYSBs aXR0bGUgbG9uZ2VyIHRvIGxldCB0aGUgbWVhc3VyZW1lbnQgc2V0dGxlCiAgICAgdGllclNsb3dU ZXN0TGVuZ3RoOiA3NTAsCisgICAgLy8gVGllciBpbnRlcnZhbHMgbXVzdCBoYXZlIHRoaXMgbnVt YmVyIG9mIG5vbi1vdXRsaWVyIGZyYW1lcyBpbiBvcmRlciB0byBlbmQuCisgICAgbnVtYmVyT2ZG cmFtZXNSZXF1aXJlZEluSW50ZXJ2YWw6IDksCiAKICAgICByYW1wV2FybXVwTGVuZ3RoOiAyMDAs CiAKQEAgLTM1NSwxMCArMzg5LDI1IEBAIFJhbXBDb250cm9sbGVyID0gVXRpbGl0aWVzLmNyZWF0 ZVN1YmNsYXNzKENvbnRyb2xsZXIsCiAgICAgICAgIENvbnRyb2xsZXIucHJvdG90eXBlLnN0YXJ0 LmNhbGwodGhpcywgc3RhcnRUaW1lc3RhbXAsIHN0YWdlKTsKICAgICAgICAgdGhpcy5fcmFtcFN0 YXJ0VGltZXN0YW1wID0gMDsKICAgICAgICAgdGhpcy5pbnRlcnZhbFNhbXBsaW5nTGVuZ3RoID0g MTAwOworICAgICAgICB0aGlzLl9mcmFtZVRpbWVIaXN0b3J5ID0gW107CisgICAgfSwKKworICAg IHJlZ2lzdGVyRnJhbWVUaW1lOiBmdW5jdGlvbihsYXN0RnJhbWVMZW5ndGgpCisgICAgeworICAg ICAgICB0aGlzLl9mcmFtZVRpbWVIaXN0b3J5LnB1c2gobGFzdEZyYW1lTGVuZ3RoKTsKKyAgICB9 LAorCisgICAgaW50ZXJ2YWxIYXNDb25jbHVkZWQ6IGZ1bmN0aW9uKHRpbWVzdGFtcCkKKyAgICB7 CisgICAgICAgIGlmICghQ29udHJvbGxlci5wcm90b3R5cGUuaW50ZXJ2YWxIYXNDb25jbHVkZWQu Y2FsbCh0aGlzLCB0aW1lc3RhbXApKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAg ICAgIHJldHVybiB0aGlzLl9maW5pc2hlZFRpZXJTYW1wbGluZyB8fCB0aGlzLmZpbHRlck91dE91 dGxpZXJzKHRoaXMuX2ZyYW1lVGltZUhpc3RvcnkpLmxlbmd0aCA+IHRoaXMubnVtYmVyT2ZGcmFt ZXNSZXF1aXJlZEluSW50ZXJ2YWw7CiAgICAgfSwKIAogICAgIGRpZEZpbmlzaEludGVydmFsOiBm dW5jdGlvbih0aW1lc3RhbXAsIHN0YWdlLCBpbnRlcnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCkKICAg ICB7CisgICAgICAgIHRoaXMuX2ZyYW1lVGltZUhpc3RvcnkgPSBbXTsKICAgICAgICAgaWYgKCF0 aGlzLl9maW5pc2hlZFRpZXJTYW1wbGluZykgewogICAgICAgICAgICAgaWYgKHRoaXMuX3RpZXJT dGFydFRpbWVzdGFtcCA+IDAgJiYgdGltZXN0YW1wIDwgdGhpcy5fdGllclN0YXJ0VGltZXN0YW1w ICsgdGhpcy50aWVyRmFzdFRlc3RMZW5ndGgpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwo= 420553 2021-02-16 15:48:23 -0800 2021-03-07 23:45:05 -0800 Patch bug-220847-20210216154823.patch text/plain 6933 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyODM4CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGJkYmI2MDNjZjVm MzMzOGRkMWQ2NWEwYjFlOGM4ZWM3NjFkOGQyZWYuLjNmNTFiYjkyZjQ3ZjhiYmRiMzlhNWYwOTc5 ZWEzOGIxYzQ2MzUyNjMgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjEtMDIt MTYgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBN b3Rpb25NYXJrIHNjb3JlcyBhcmUgc3VwZXIgc2Vuc2l0aXZlIHRvIGEgc2luZ2xlIGxvbmcgZnJh bWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDg0 NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTI3NDM+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5LCAicmFtcCIgdGVzdHMgaGF2 ZSB0aHJlZSBwaGFzZXMuIFRoZSBtaWRkbGUgcGhhc2UgaXMgd2hlcmUgdGhleSB0cnkgdG8gZGV0 ZXJtaW5lIGEgbWF4aW11bSByZWFzb25hYmxlCisgICAgICAgIGNvbXBsZXhpdHksIGFuZCB0aGUg dGhpcmQgb25lIGlzIHdoZXJlIHRoZXkgdHJ5IHZhcmlvdXMgY29tcGxleGl0aWVzIGJldHdlZW4g MCBhbmQgdGhlIG1heGltdW0uIFRoZSBjYWxjdWxhdGlvbgorICAgICAgICBvZiB0aGlzIG1heGlt dW0gcmVhc29uYWJsZSBjb21wbGV4aXR5IGlzIGN1cnJlbnRseSB2ZXJ5IHNlbnNpdGl2ZSB0byBv dXRsaWVyIGZyYW1lIHRpbWVzLiBJZiB0aGVyZSBpcyBhIHNpbmdsZQorICAgICAgICBvdXRsaWVy IGZyYW1lIHRpbWUsIHRoZSBmYWlsdXJlIG1vZGUgaXMgdG8gYXNzdW1lIHRoYXQgdGhlIG1heGlt dW0gY29tcGxleGl0eSBpcyB+MTAuIFNvLCB0aGUgc29sdXRpb24gaXMgdG8KKyAgICAgICAgaWdu b3JlIG91dGxpZXIgZnJhbWUgdGltZXMgZHVyaW5nIHRoaXMgZmlyc3QgcGhhc2UsIGFuZCB0byBl bnN1cmUgdGhhdCB0aGVyZSBhcmUgYXQgbGVhc3QgOSBmcmFtZXMgbWVhc3VyZWQgdGhhdAorICAg ICAgICBoYXZlIG5vbi1vdXRsaWVyIHRpbWVzLgorCisgICAgICAgICogTW90aW9uTWFyay90ZXN0 cy9yZXNvdXJjZXMvbWFpbi5qczoKKyAgICAgICAgKGZpbHRlck91dE91dGxpZXJzKToKKyAgICAg ICAgKF9tZWFzdXJlQW5kUmVzZXRJbnRlcnZhbCk6CisgICAgICAgICh1cGRhdGUpOgorICAgICAg ICAocmVnaXN0ZXJGcmFtZVRpbWUpOgorICAgICAgICAoaW50ZXJ2YWxIYXNDb25jbHVkZWQpOgor ICAgICAgICAoc3RhcnQpOgorICAgICAgICAoZGlkRmluaXNoSW50ZXJ2YWwpOgorCiAyMDIxLTAx LTI4ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAg TW90aW9uTWFyayBmb2N1cyB0ZXN0IGNhbiBjYXVzZSBleHRyZW1lIHZhcmlhbmNlIGluIHdoaWNo ZXZlciB0ZXN0IHJ1bnMgZGlyZWN0bHkgYWZ0ZXIgaXQKZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNl VGVzdHMvTW90aW9uTWFyay90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qcyBiL1BlcmZvcm1hbmNlVGVz dHMvTW90aW9uTWFyay90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qcwppbmRleCA2ZmM0NmI0YWYwZjMx OTkwZGUyNzQwZGIxZWM5YmJjNDBkNWFlZjBlLi40OWZkYTAyMWJhMDBhMTFmNjY5NTRmODRhMmY5 NDg2YTY3ZTEyZmIxIDEwMDY0NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvdGVz dHMvcmVzb3VyY2VzL21haW4uanMKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rl c3RzL3Jlc291cmNlcy9tYWluLmpzCkBAIC0xMTAsMTQgKzExMCwzMyBAQCBDb250cm9sbGVyID0g VXRpbGl0aWVzLmNyZWF0ZUNsYXNzKAogICAgICAgICByZXR1cm4gY29tbWVudCBpbiB0aGlzLl9t YXJrczsKICAgICB9LAogCisgICAgZmlsdGVyT3V0T3V0bGllcnM6IGZ1bmN0aW9uKGFycmF5KQor ICAgIHsKKyAgICAgICAgaWYgKGFycmF5Lmxlbmd0aCA9PSAwKQorICAgICAgICAgICAgcmV0dXJu IFtdOworCisgICAgICAgIGFycmF5LnNvcnQoKTsKKyAgICAgICAgdmFyIHExID0gYXJyYXlbTWF0 aC5taW4oTWF0aC5yb3VuZChhcnJheS5sZW5ndGggKiAxIC8gNCksIGFycmF5Lmxlbmd0aCAtIDEp XTsKKyAgICAgICAgdmFyIHEzID0gYXJyYXlbTWF0aC5taW4oTWF0aC5yb3VuZChhcnJheS5sZW5n dGggKiAzIC8gNCksIGFycmF5Lmxlbmd0aCAtIDEpXTsKKyAgICAgICAgdmFyIGludGVycXVhcnRp bGVSYW5nZSA9IHEzIC0gcTE7CisgICAgICAgIHZhciBtaW5pbXVtID0gcTEgLSBpbnRlcnF1YXJ0 aWxlUmFuZ2UgKiAxLjU7CisgICAgICAgIHZhciBtYXhpbXVtID0gcTMgKyBpbnRlcnF1YXJ0aWxl UmFuZ2UgKiAxLjU7CisgICAgICAgIHJldHVybiBhcnJheS5maWx0ZXIoeCA9PiB4ID49IG1pbmlt dW0gJiYgeCA8PSBtYXhpbXVtKTsKKyAgICB9LAorCiAgICAgX21lYXN1cmVBbmRSZXNldEludGVy dmFsOiBmdW5jdGlvbihjdXJyZW50VGltZXN0YW1wKQogICAgIHsKICAgICAgICAgdmFyIHNhbXBs ZUNvdW50ID0gdGhpcy5fc2FtcGxlci5zYW1wbGVDb3VudDsKICAgICAgICAgdmFyIGF2ZXJhZ2VG cmFtZUxlbmd0aCA9IDA7CiAKICAgICAgICAgaWYgKHRoaXMuX2ludGVydmFsRW5kVGltZXN0YW1w KSB7Ci0gICAgICAgICAgICB2YXIgaW50ZXJ2YWxTdGFydFRpbWVzdGFtcCA9IHRoaXMuX3NhbXBs ZXIuc2FtcGxlc1swXVt0aGlzLl9pbnRlcnZhbFN0YXJ0SW5kZXhdOwotICAgICAgICAgICAgYXZl cmFnZUZyYW1lTGVuZ3RoID0gKGN1cnJlbnRUaW1lc3RhbXAgLSBpbnRlcnZhbFN0YXJ0VGltZXN0 YW1wKSAvIChzYW1wbGVDb3VudCAtIHRoaXMuX2ludGVydmFsU3RhcnRJbmRleCk7CisgICAgICAg ICAgICB2YXIgZHVyYXRpb25zID0gW107CisgICAgICAgICAgICBmb3IgKHZhciBpID0gTWF0aC5t YXgodGhpcy5faW50ZXJ2YWxTdGFydEluZGV4LCAxKTsgaSA8IHNhbXBsZUNvdW50OyArK2kpIHsK KyAgICAgICAgICAgICAgICBkdXJhdGlvbnMucHVzaCh0aGlzLl9zYW1wbGVyLnNhbXBsZXNbMF1b aV0gLSB0aGlzLl9zYW1wbGVyLnNhbXBsZXNbMF1baSAtIDFdKTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIHZhciBmaWx0ZXJlZER1cmF0aW9ucyA9IHRoaXMuZmlsdGVyT3V0T3V0bGllcnMo ZHVyYXRpb25zKTsKKyAgICAgICAgICAgIGlmIChmaWx0ZXJlZER1cmF0aW9ucy5sZW5ndGggPiAw KQorICAgICAgICAgICAgICAgIGF2ZXJhZ2VGcmFtZUxlbmd0aCA9IGZpbHRlcmVkRHVyYXRpb25z LnJlZHVjZSgoYSwgYikgPT4gYSArIGIsIDApIC8gZmlsdGVyZWREdXJhdGlvbnMubGVuZ3RoOwog ICAgICAgICB9CiAKICAgICAgICAgdGhpcy5faW50ZXJ2YWxTdGFydEluZGV4ID0gc2FtcGxlQ291 bnQ7CkBAIC0xMzgsMjEgKzE1NywzNCBAQCBDb250cm9sbGVyID0gVXRpbGl0aWVzLmNyZWF0ZUNs YXNzKAogICAgICAgICAgICAgICAgIHRoaXMuX2ZyYW1lTGVuZ3RoRXN0aW1hdG9yLnNhbXBsZShs YXN0RnJhbWVMZW5ndGgpOwogICAgICAgICAgICAgICAgIGZyYW1lTGVuZ3RoRXN0aW1hdGUgPSB0 aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5lc3RpbWF0ZTsKICAgICAgICAgICAgIH0KLSAgICAg ICAgfSBlbHNlIGlmICh0aW1lc3RhbXAgPj0gdGhpcy5faW50ZXJ2YWxFbmRUaW1lc3RhbXApIHsK LSAgICAgICAgICAgIHZhciBpbnRlcnZhbFN0YXJ0VGltZXN0YW1wID0gdGhpcy5fc2FtcGxlci5z YW1wbGVzWzBdW3RoaXMuX2ludGVydmFsU3RhcnRJbmRleF07Ci0gICAgICAgICAgICBpbnRlcnZh bEF2ZXJhZ2VGcmFtZUxlbmd0aCA9IHRoaXMuX21lYXN1cmVBbmRSZXNldEludGVydmFsKHRpbWVz dGFtcCk7Ci0gICAgICAgICAgICBpZiAodGhpcy5faXNGcmFtZUxlbmd0aEVzdGltYXRvckVuYWJs ZWQpIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5zYW1wbGUo aW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpOwotICAgICAgICAgICAgICAgIGZyYW1lTGVuZ3Ro RXN0aW1hdGUgPSB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5lc3RpbWF0ZTsKKyAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgIHRoaXMucmVnaXN0ZXJGcmFtZVRpbWUobGFzdEZyYW1lTGVu Z3RoKTsKKyAgICAgICAgICAgIGlmICh0aGlzLmludGVydmFsSGFzQ29uY2x1ZGVkKHRpbWVzdGFt cCkpIHsKKyAgICAgICAgICAgICAgICB2YXIgaW50ZXJ2YWxTdGFydFRpbWVzdGFtcCA9IHRoaXMu X3NhbXBsZXIuc2FtcGxlc1swXVt0aGlzLl9pbnRlcnZhbFN0YXJ0SW5kZXhdOworICAgICAgICAg ICAgICAgIGludGVydmFsQXZlcmFnZUZyYW1lTGVuZ3RoID0gdGhpcy5fbWVhc3VyZUFuZFJlc2V0 SW50ZXJ2YWwodGltZXN0YW1wKTsKKyAgICAgICAgICAgICAgICBpZiAodGhpcy5faXNGcmFtZUxl bmd0aEVzdGltYXRvckVuYWJsZWQpIHsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fZnJhbWVM ZW5ndGhFc3RpbWF0b3Iuc2FtcGxlKGludGVydmFsQXZlcmFnZUZyYW1lTGVuZ3RoKTsKKyAgICAg ICAgICAgICAgICAgICAgZnJhbWVMZW5ndGhFc3RpbWF0ZSA9IHRoaXMuX2ZyYW1lTGVuZ3RoRXN0 aW1hdG9yLmVzdGltYXRlOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBkaWRG aW5pc2hJbnRlcnZhbCA9IHRydWU7CisgICAgICAgICAgICAgICAgdGhpcy5kaWRGaW5pc2hJbnRl cnZhbCh0aW1lc3RhbXAsIHN0YWdlLCBpbnRlcnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCk7CisgICAg ICAgICAgICAgICAgdGhpcy5fZnJhbWVMZW5ndGhFc3RpbWF0b3IucmVzZXQoKTsKICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIGRpZEZpbmlzaEludGVydmFsID0gdHJ1ZTsKLSAgICAgICAgICAg IHRoaXMuZGlkRmluaXNoSW50ZXJ2YWwodGltZXN0YW1wLCBzdGFnZSwgaW50ZXJ2YWxBdmVyYWdl RnJhbWVMZW5ndGgpOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fc2FtcGxlci5yZWNvcmQo dGltZXN0YW1wLCBzdGFnZS5jb21wbGV4aXR5KCksIGZyYW1lTGVuZ3RoRXN0aW1hdGUpOwogICAg ICAgICB0aGlzLnR1bmUodGltZXN0YW1wLCBzdGFnZSwgbGFzdEZyYW1lTGVuZ3RoLCBkaWRGaW5p c2hJbnRlcnZhbCwgaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpOwogICAgIH0sCiAKKyAgICBy ZWdpc3RlckZyYW1lVGltZTogZnVuY3Rpb24obGFzdEZyYW1lTGVuZ3RoKQorICAgIHsKKyAgICB9 LAorCisgICAgaW50ZXJ2YWxIYXNDb25jbHVkZWQ6IGZ1bmN0aW9uKHRpbWVzdGFtcCkKKyAgICB7 CisgICAgICAgIHJldHVybiB0aW1lc3RhbXAgPj0gdGhpcy5faW50ZXJ2YWxFbmRUaW1lc3RhbXA7 CisgICAgfSwKKwogICAgIGRpZEZpbmlzaEludGVydmFsOiBmdW5jdGlvbih0aW1lc3RhbXAsIHN0 YWdlLCBpbnRlcnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCkKICAgICB7CiAgICAgfSwKQEAgLTMzNiw2 ICszNjgsOCBAQCBSYW1wQ29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhDb250 cm9sbGVyLAogICAgIHRpZXJGYXN0VGVzdExlbmd0aDogMjUwLAogICAgIC8vIElmIHRoZSBlbmdp bmUgaXMgdW5kZXIgc3RyZXNzLCBsZXQgdGhlIHRlc3QgcnVuIGEgbGl0dGxlIGxvbmdlciB0byBs ZXQgdGhlIG1lYXN1cmVtZW50IHNldHRsZQogICAgIHRpZXJTbG93VGVzdExlbmd0aDogNzUwLAor ICAgIC8vIFRpZXIgaW50ZXJ2YWxzIG11c3QgaGF2ZSB0aGlzIG51bWJlciBvZiBub24tb3V0bGll ciBmcmFtZXMgaW4gb3JkZXIgdG8gZW5kLgorICAgIG51bWJlck9mRnJhbWVzUmVxdWlyZWRJbklu dGVydmFsOiA5LAogCiAgICAgcmFtcFdhcm11cExlbmd0aDogMjAwLAogCkBAIC0zNTUsMTAgKzM4 OSwyNSBAQCBSYW1wQ29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhDb250cm9s bGVyLAogICAgICAgICBDb250cm9sbGVyLnByb3RvdHlwZS5zdGFydC5jYWxsKHRoaXMsIHN0YXJ0 VGltZXN0YW1wLCBzdGFnZSk7CiAgICAgICAgIHRoaXMuX3JhbXBTdGFydFRpbWVzdGFtcCA9IDA7 CiAgICAgICAgIHRoaXMuaW50ZXJ2YWxTYW1wbGluZ0xlbmd0aCA9IDEwMDsKKyAgICAgICAgdGhp cy5fZnJhbWVUaW1lSGlzdG9yeSA9IFtdOworICAgIH0sCisKKyAgICByZWdpc3RlckZyYW1lVGlt ZTogZnVuY3Rpb24obGFzdEZyYW1lTGVuZ3RoKQorICAgIHsKKyAgICAgICAgdGhpcy5fZnJhbWVU aW1lSGlzdG9yeS5wdXNoKGxhc3RGcmFtZUxlbmd0aCk7CisgICAgfSwKKworICAgIGludGVydmFs SGFzQ29uY2x1ZGVkOiBmdW5jdGlvbih0aW1lc3RhbXApCisgICAgeworICAgICAgICBpZiAoIUNv bnRyb2xsZXIucHJvdG90eXBlLmludGVydmFsSGFzQ29uY2x1ZGVkLmNhbGwodGhpcywgdGltZXN0 YW1wKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICByZXR1cm4gdGhpcy5f ZmluaXNoZWRUaWVyU2FtcGxpbmcgfHwgdGhpcy5maWx0ZXJPdXRPdXRsaWVycyh0aGlzLl9mcmFt ZVRpbWVIaXN0b3J5KS5sZW5ndGggPiB0aGlzLm51bWJlck9mRnJhbWVzUmVxdWlyZWRJbkludGVy dmFsOwogICAgIH0sCiAKICAgICBkaWRGaW5pc2hJbnRlcnZhbDogZnVuY3Rpb24odGltZXN0YW1w LCBzdGFnZSwgaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpCiAgICAgeworICAgICAgICB0aGlz Ll9mcmFtZVRpbWVIaXN0b3J5ID0gW107CiAgICAgICAgIGlmICghdGhpcy5fZmluaXNoZWRUaWVy U2FtcGxpbmcpIHsKICAgICAgICAgICAgIGlmICh0aGlzLl90aWVyU3RhcnRUaW1lc3RhbXAgPiAw ICYmIHRpbWVzdGFtcCA8IHRoaXMuX3RpZXJTdGFydFRpbWVzdGFtcCArIHRoaXMudGllckZhc3RU ZXN0TGVuZ3RoKQogICAgICAgICAgICAgICAgIHJldHVybjsK 422546 2021-03-07 23:45:07 -0800 2021-03-08 11:06:03 -0800 Patch bug-220847-20210307234507.patch text/plain 10327 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDYxCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZlZmQzYTRmMjBj MGZjOGE0ZmRmNjliMGExZjQ0MjYyNDhiZGIxMTIuLmJkNjc1YzgwY2JkMzc4YTFmYjk3OGQzM2Jl YzFhY2M5ZDA5ZTYwN2EgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjEtMDMt MDcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBN b3Rpb25NYXJrIHNjb3JlcyBhcmUgc3VwZXIgc2Vuc2l0aXZlIHRvIGEgc2luZ2xlIGxvbmcgZnJh bWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDg0 NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTI3NDM+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5LCAicmFtcCIgdGVzdHMgaGF2 ZSB0aHJlZSBwaGFzZXMuIFRoZSBtaWRkbGUgcGhhc2UgaXMgd2hlcmUgdGhleSB0cnkgdG8gZGV0 ZXJtaW5lIGEgbWF4aW11bSByZWFzb25hYmxlCisgICAgICAgIGNvbXBsZXhpdHksIGFuZCB0aGUg dGhpcmQgb25lIGlzIHdoZXJlIHRoZXkgdHJ5IHZhcmlvdXMgY29tcGxleGl0aWVzIGJldHdlZW4g MCBhbmQgdGhlIG1heGltdW0uIFRoZSBjYWxjdWxhdGlvbgorICAgICAgICBvZiB0aGlzIG1heGlt dW0gcmVhc29uYWJsZSBjb21wbGV4aXR5IGlzIGN1cnJlbnRseSB2ZXJ5IHNlbnNpdGl2ZSB0byBv dXRsaWVyIGZyYW1lIHRpbWVzLiBJZiB0aGVyZSBpcyBhIHNpbmdsZQorICAgICAgICBvdXRsaWVy IGZyYW1lIHRpbWUsIHRoZSBmYWlsdXJlIG1vZGUgaXMgdG8gYXNzdW1lIHRoYXQgdGhlIG1heGlt dW0gY29tcGxleGl0eSBpcyB+MTAuIFNvLCB0aGUgc29sdXRpb24gaXMgdG8KKyAgICAgICAgaWdu b3JlIG91dGxpZXIgZnJhbWUgdGltZXMgZHVyaW5nIHRoaXMgZmlyc3QgcGhhc2UsIGFuZCB0byBl bnN1cmUgdGhhdCB0aGVyZSBhcmUgYXQgbGVhc3QgOSBmcmFtZXMgbWVhc3VyZWQgdGhhdAorICAg ICAgICBoYXZlIG5vbi1vdXRsaWVyIHRpbWVzLgorCisgICAgICAgIFRoaXMgdGVzdCBhbHNvIGNo YW5nZXMgdGhlIHNwZWVkIG9mIHRoZSByYW1wLXVwIHBlcmlvZC4gUHJldmlvdXNseSwgZWFjaCBp bnRlcnZhbCBkdXJpbmcgdGhlIHJhbXAtdXAgcGVyaW9kIGhhZAorICAgICAgICBhIGNvbXBsZXhp dHkgdGhhdCB3YXMgMy4xNnggb2YgdGhlIHByZXZpb3VzIGNvbXBsZXhpdHkuIFRoaXMgcGF0Y2gg Y2hhbmdlcyB0aGF0IHRvIDEuMnggb2YgdGhlIHByZXZpb3VzCisgICAgICAgIGNvbXBsZXhpdHku IEJlY2F1c2UgdGhpcyBjYXVzZXMgdGVzdHMgdG8gdGFrZSBsb25nZXIsIHRoaXMgcGF0Y2ggYWxz byBidW1wcyB1cCB0aGUgdGVzdCBkdXJhdGlvbiBmcm9tIDMwcyB0byA0NXMuCisKKyAgICAgICAg KiBNb3Rpb25NYXJrL2RldmVsb3Blci5odG1sOgorICAgICAgICAqIE1vdGlvbk1hcmsvcmVzb3Vy Y2VzL3J1bm5lci9tb3Rpb25tYXJrLmpzOgorICAgICAgICAodGhpcy5jbGVhcik6CisgICAgICAg ICogTW90aW9uTWFyay90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qczoKKyAgICAgICAgKGZpbHRlck91 dE91dGxpZXJzKToKKyAgICAgICAgKF9tZWFzdXJlQW5kUmVzZXRJbnRlcnZhbCk6CisgICAgICAg ICh1cGRhdGUpOgorICAgICAgICAocmVnaXN0ZXJGcmFtZVRpbWUpOgorICAgICAgICAoaW50ZXJ2 YWxIYXNDb25jbHVkZWQpOgorICAgICAgICAoc3RhcnQpOgorICAgICAgICAoZGlkRmluaXNoSW50 ZXJ2YWwpOgorCiAyMDIxLTAyLTI2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1BlcmZvcm1hbmNlIHRlc3RdW0xpbmUgbGF5b3V0XSBBZGQgdGVzdCB3aXRoIGlu bGluZSBib3hlcwpkaWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL2RldmVs b3Blci5odG1sIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL2RldmVsb3Blci5odG1sCmlu ZGV4IDg2YjY2ODMwZDQ5MTk5MDYxNzk2ZGRlMDUxYmYxYzdmNmMxZDFmNGYuLjc2MzhjOTA0MTdk Y2QwMjAwYTU4NzI2NzY3ZWU3MzhiN2MyODY0M2QgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVz dHMvTW90aW9uTWFyay9kZXZlbG9wZXIuaHRtbAorKysgYi9QZXJmb3JtYW5jZVRlc3RzL01vdGlv bk1hcmsvZGV2ZWxvcGVyLmh0bWwKQEAgLTc0LDcgKzc0LDcgQEAKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxsYWJlbD5GaXJzdCBmcmFtZSBtaW5pbXVtIGxlbmd0aDogPGlu cHV0IHR5cGU9Im51bWJlciIgaWQ9ImZpcnN0LWZyYW1lLW1pbmltdW0tbGVuZ3RoIiB2YWx1ZT0i MCI+IG1zPC9sYWJlbD4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9saT4KICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGxpPgotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgPGxhYmVsPlRlc3QgbGVuZ3RoOiA8aW5wdXQgdHlwZT0ibnVtYmVyIiBp ZD0idGVzdC1pbnRlcnZhbCIgdmFsdWU9IjMwIj4gc2Vjb25kcyBlYWNoPC9sYWJlbD4KKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxsYWJlbD5UZXN0IGxlbmd0aDogPGlucHV0 IHR5cGU9Im51bWJlciIgaWQ9InRlc3QtaW50ZXJ2YWwiIHZhbHVlPSI0NSI+IHNlY29uZHMgZWFj aDwvbGFiZWw+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvbGk+CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDxsaT4KICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDxoMz5EaXNwbGF5OjwvaDM+CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L01vdGlvbk1hcmsvcmVzb3VyY2VzL3J1bm5lci9tb3Rpb25tYXJrLmpzIGIvUGVyZm9ybWFuY2VU ZXN0cy9Nb3Rpb25NYXJrL3Jlc291cmNlcy9ydW5uZXIvbW90aW9ubWFyay5qcwppbmRleCBjY2Q3 MTMyYzkwYjFkZDNhZmIxN2IxNTU0MDdlODMwMWQxMjIzYjI2Li41YzczMjcxYThhM2JmNjY3NzVk YWI4NWE4YWU0NjI2MzM3ZmJlMDUwIDEwMDY0NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL01vdGlv bk1hcmsvcmVzb3VyY2VzL3J1bm5lci9tb3Rpb25tYXJrLmpzCisrKyBiL1BlcmZvcm1hbmNlVGVz dHMvTW90aW9uTWFyay9yZXNvdXJjZXMvcnVubmVyL21vdGlvbm1hcmsuanMKQEAgLTQ1OCw3ICs0 NTgsNyBAQCB3aW5kb3cuc2VjdGlvbnNNYW5hZ2VyID0KIAogd2luZG93LmJlbmNobWFya0NvbnRy b2xsZXIgPSB7CiAgICAgYmVuY2htYXJrRGVmYXVsdFBhcmFtZXRlcnM6IHsKLSAgICAgICAgInRl c3QtaW50ZXJ2YWwiOiAzMCwKKyAgICAgICAgInRlc3QtaW50ZXJ2YWwiOiA0NSwKICAgICAgICAg ImRpc3BsYXkiOiAibWluaW1hbCIsCiAgICAgICAgICJ0aWxlcyI6ICJiaWciLAogICAgICAgICAi Y29udHJvbGxlciI6ICJyYW1wIiwKZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9u TWFyay90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qcyBiL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFy ay90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qcwppbmRleCA2ZmM0NmI0YWYwZjMxOTkwZGUyNzQwZGIx ZWM5YmJjNDBkNWFlZjBlLi5kN2Y2ZDYwOTkwNTc5NmI2NzVlNTljODI5ODA1YTQwNTI0NGZlNjYy IDEwMDY0NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvdGVzdHMvcmVzb3VyY2Vz L21haW4uanMKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL3Jlc291cmNl cy9tYWluLmpzCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNS0yMDIw IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNS0y MDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucwpAQCAtMTEwLDE0ICsxMTAsMzMgQEAgQ29udHJvbGxlciA9IFV0aWxpdGllcy5j cmVhdGVDbGFzcygKICAgICAgICAgcmV0dXJuIGNvbW1lbnQgaW4gdGhpcy5fbWFya3M7CiAgICAg fSwKIAorICAgIGZpbHRlck91dE91dGxpZXJzOiBmdW5jdGlvbihhcnJheSkKKyAgICB7CisgICAg ICAgIGlmIChhcnJheS5sZW5ndGggPT0gMCkKKyAgICAgICAgICAgIHJldHVybiBbXTsKKworICAg ICAgICBhcnJheS5zb3J0KCk7CisgICAgICAgIHZhciBxMSA9IGFycmF5W01hdGgubWluKE1hdGgu cm91bmQoYXJyYXkubGVuZ3RoICogMSAvIDQpLCBhcnJheS5sZW5ndGggLSAxKV07CisgICAgICAg IHZhciBxMyA9IGFycmF5W01hdGgubWluKE1hdGgucm91bmQoYXJyYXkubGVuZ3RoICogMyAvIDQp LCBhcnJheS5sZW5ndGggLSAxKV07CisgICAgICAgIHZhciBpbnRlcnF1YXJ0aWxlUmFuZ2UgPSBx MyAtIHExOworICAgICAgICB2YXIgbWluaW11bSA9IHExIC0gaW50ZXJxdWFydGlsZVJhbmdlICog MS41OworICAgICAgICB2YXIgbWF4aW11bSA9IHEzICsgaW50ZXJxdWFydGlsZVJhbmdlICogMS41 OworICAgICAgICByZXR1cm4gYXJyYXkuZmlsdGVyKHggPT4geCA+PSBtaW5pbXVtICYmIHggPD0g bWF4aW11bSk7CisgICAgfSwKKwogICAgIF9tZWFzdXJlQW5kUmVzZXRJbnRlcnZhbDogZnVuY3Rp b24oY3VycmVudFRpbWVzdGFtcCkKICAgICB7CiAgICAgICAgIHZhciBzYW1wbGVDb3VudCA9IHRo aXMuX3NhbXBsZXIuc2FtcGxlQ291bnQ7CiAgICAgICAgIHZhciBhdmVyYWdlRnJhbWVMZW5ndGgg PSAwOwogCiAgICAgICAgIGlmICh0aGlzLl9pbnRlcnZhbEVuZFRpbWVzdGFtcCkgewotICAgICAg ICAgICAgdmFyIGludGVydmFsU3RhcnRUaW1lc3RhbXAgPSB0aGlzLl9zYW1wbGVyLnNhbXBsZXNb MF1bdGhpcy5faW50ZXJ2YWxTdGFydEluZGV4XTsKLSAgICAgICAgICAgIGF2ZXJhZ2VGcmFtZUxl bmd0aCA9IChjdXJyZW50VGltZXN0YW1wIC0gaW50ZXJ2YWxTdGFydFRpbWVzdGFtcCkgLyAoc2Ft cGxlQ291bnQgLSB0aGlzLl9pbnRlcnZhbFN0YXJ0SW5kZXgpOworICAgICAgICAgICAgdmFyIGR1 cmF0aW9ucyA9IFtdOworICAgICAgICAgICAgZm9yICh2YXIgaSA9IE1hdGgubWF4KHRoaXMuX2lu dGVydmFsU3RhcnRJbmRleCwgMSk7IGkgPCBzYW1wbGVDb3VudDsgKytpKSB7CisgICAgICAgICAg ICAgICAgZHVyYXRpb25zLnB1c2godGhpcy5fc2FtcGxlci5zYW1wbGVzWzBdW2ldIC0gdGhpcy5f c2FtcGxlci5zYW1wbGVzWzBdW2kgLSAxXSk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICB2 YXIgZmlsdGVyZWREdXJhdGlvbnMgPSB0aGlzLmZpbHRlck91dE91dGxpZXJzKGR1cmF0aW9ucyk7 CisgICAgICAgICAgICBpZiAoZmlsdGVyZWREdXJhdGlvbnMubGVuZ3RoID4gMCkKKyAgICAgICAg ICAgICAgICBhdmVyYWdlRnJhbWVMZW5ndGggPSBmaWx0ZXJlZER1cmF0aW9ucy5yZWR1Y2UoKGEs IGIpID0+IGEgKyBiLCAwKSAvIGZpbHRlcmVkRHVyYXRpb25zLmxlbmd0aDsKICAgICAgICAgfQog CiAgICAgICAgIHRoaXMuX2ludGVydmFsU3RhcnRJbmRleCA9IHNhbXBsZUNvdW50OwpAQCAtMTM4 LDIxICsxNTcsMzQgQEAgQ29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVhdGVDbGFzcygKICAgICAg ICAgICAgICAgICB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5zYW1wbGUobGFzdEZyYW1lTGVu Z3RoKTsKICAgICAgICAgICAgICAgICBmcmFtZUxlbmd0aEVzdGltYXRlID0gdGhpcy5fZnJhbWVM ZW5ndGhFc3RpbWF0b3IuZXN0aW1hdGU7CiAgICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBp ZiAodGltZXN0YW1wID49IHRoaXMuX2ludGVydmFsRW5kVGltZXN0YW1wKSB7Ci0gICAgICAgICAg ICB2YXIgaW50ZXJ2YWxTdGFydFRpbWVzdGFtcCA9IHRoaXMuX3NhbXBsZXIuc2FtcGxlc1swXVt0 aGlzLl9pbnRlcnZhbFN0YXJ0SW5kZXhdOwotICAgICAgICAgICAgaW50ZXJ2YWxBdmVyYWdlRnJh bWVMZW5ndGggPSB0aGlzLl9tZWFzdXJlQW5kUmVzZXRJbnRlcnZhbCh0aW1lc3RhbXApOwotICAg ICAgICAgICAgaWYgKHRoaXMuX2lzRnJhbWVMZW5ndGhFc3RpbWF0b3JFbmFibGVkKSB7Ci0gICAg ICAgICAgICAgICAgdGhpcy5fZnJhbWVMZW5ndGhFc3RpbWF0b3Iuc2FtcGxlKGludGVydmFsQXZl cmFnZUZyYW1lTGVuZ3RoKTsKLSAgICAgICAgICAgICAgICBmcmFtZUxlbmd0aEVzdGltYXRlID0g dGhpcy5fZnJhbWVMZW5ndGhFc3RpbWF0b3IuZXN0aW1hdGU7CisgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICB0aGlzLnJlZ2lzdGVyRnJhbWVUaW1lKGxhc3RGcmFtZUxlbmd0aCk7CisgICAg ICAgICAgICBpZiAodGhpcy5pbnRlcnZhbEhhc0NvbmNsdWRlZCh0aW1lc3RhbXApKSB7CisgICAg ICAgICAgICAgICAgdmFyIGludGVydmFsU3RhcnRUaW1lc3RhbXAgPSB0aGlzLl9zYW1wbGVyLnNh bXBsZXNbMF1bdGhpcy5faW50ZXJ2YWxTdGFydEluZGV4XTsKKyAgICAgICAgICAgICAgICBpbnRl cnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCA9IHRoaXMuX21lYXN1cmVBbmRSZXNldEludGVydmFsKHRp bWVzdGFtcCk7CisgICAgICAgICAgICAgICAgaWYgKHRoaXMuX2lzRnJhbWVMZW5ndGhFc3RpbWF0 b3JFbmFibGVkKSB7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX2ZyYW1lTGVuZ3RoRXN0aW1h dG9yLnNhbXBsZShpbnRlcnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCk7CisgICAgICAgICAgICAgICAg ICAgIGZyYW1lTGVuZ3RoRXN0aW1hdGUgPSB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5lc3Rp bWF0ZTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgZGlkRmluaXNoSW50ZXJ2 YWwgPSB0cnVlOworICAgICAgICAgICAgICAgIHRoaXMuZGlkRmluaXNoSW50ZXJ2YWwodGltZXN0 YW1wLCBzdGFnZSwgaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpOworICAgICAgICAgICAgICAg IHRoaXMuX2ZyYW1lTGVuZ3RoRXN0aW1hdG9yLnJlc2V0KCk7CiAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICBkaWRGaW5pc2hJbnRlcnZhbCA9IHRydWU7Ci0gICAgICAgICAgICB0aGlzLmRpZEZp bmlzaEludGVydmFsKHRpbWVzdGFtcCwgc3RhZ2UsIGludGVydmFsQXZlcmFnZUZyYW1lTGVuZ3Ro KTsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX3NhbXBsZXIucmVjb3JkKHRpbWVzdGFtcCwg c3RhZ2UuY29tcGxleGl0eSgpLCBmcmFtZUxlbmd0aEVzdGltYXRlKTsKICAgICAgICAgdGhpcy50 dW5lKHRpbWVzdGFtcCwgc3RhZ2UsIGxhc3RGcmFtZUxlbmd0aCwgZGlkRmluaXNoSW50ZXJ2YWws IGludGVydmFsQXZlcmFnZUZyYW1lTGVuZ3RoKTsKICAgICB9LAogCisgICAgcmVnaXN0ZXJGcmFt ZVRpbWU6IGZ1bmN0aW9uKGxhc3RGcmFtZUxlbmd0aCkKKyAgICB7CisgICAgfSwKKworICAgIGlu dGVydmFsSGFzQ29uY2x1ZGVkOiBmdW5jdGlvbih0aW1lc3RhbXApCisgICAgeworICAgICAgICBy ZXR1cm4gdGltZXN0YW1wID49IHRoaXMuX2ludGVydmFsRW5kVGltZXN0YW1wOworICAgIH0sCisK ICAgICBkaWRGaW5pc2hJbnRlcnZhbDogZnVuY3Rpb24odGltZXN0YW1wLCBzdGFnZSwgaW50ZXJ2 YWxBdmVyYWdlRnJhbWVMZW5ndGgpCiAgICAgewogICAgIH0sCkBAIC0zMDgsNyArMzQwLDcgQEAg UmFtcENvbnRyb2xsZXIgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoQ29udHJvbGxlciwKIAog ICAgICAgICAvLyBJbml0aWFsbHkgc3RhcnQgd2l0aCBhIHRpZXIgdGVzdCB0byBmaW5kIHRoZSBi b3VuZHMKICAgICAgICAgLy8gVGhlIG51bWJlciBvZiBvYmplY3RzIGluIGEgdGllciB0ZXN0IGlz IDEwXnxfdGllcnwKLSAgICAgICAgdGhpcy5fdGllciA9IC0uNTsKKyAgICAgICAgdGhpcy5fdGll ciA9IC0xOwogICAgICAgICAvLyBUaGUgdGltZXN0YW1wIGlzIGZpcnN0IHNldCBhZnRlciB0aGUg Zmlyc3QgaW50ZXJ2YWwgY29tcGxldGVzCiAgICAgICAgIHRoaXMuX3RpZXJTdGFydFRpbWVzdGFt cCA9IDA7CiAgICAgICAgIHRoaXMuX21pbmltdW1Db21wbGV4aXR5ID0gMTsKQEAgLTMzNiw2ICsz NjgsOCBAQCBSYW1wQ29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhDb250cm9s bGVyLAogICAgIHRpZXJGYXN0VGVzdExlbmd0aDogMjUwLAogICAgIC8vIElmIHRoZSBlbmdpbmUg aXMgdW5kZXIgc3RyZXNzLCBsZXQgdGhlIHRlc3QgcnVuIGEgbGl0dGxlIGxvbmdlciB0byBsZXQg dGhlIG1lYXN1cmVtZW50IHNldHRsZQogICAgIHRpZXJTbG93VGVzdExlbmd0aDogNzUwLAorICAg IC8vIFRpZXIgaW50ZXJ2YWxzIG11c3QgaGF2ZSB0aGlzIG51bWJlciBvZiBub24tb3V0bGllciBm cmFtZXMgaW4gb3JkZXIgdG8gZW5kLgorICAgIG51bWJlck9mRnJhbWVzUmVxdWlyZWRJbkludGVy dmFsOiA5LAogCiAgICAgcmFtcFdhcm11cExlbmd0aDogMjAwLAogCkBAIC0zNTUsMTAgKzM4OSwy NSBAQCBSYW1wQ29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhDb250cm9sbGVy LAogICAgICAgICBDb250cm9sbGVyLnByb3RvdHlwZS5zdGFydC5jYWxsKHRoaXMsIHN0YXJ0VGlt ZXN0YW1wLCBzdGFnZSk7CiAgICAgICAgIHRoaXMuX3JhbXBTdGFydFRpbWVzdGFtcCA9IDA7CiAg ICAgICAgIHRoaXMuaW50ZXJ2YWxTYW1wbGluZ0xlbmd0aCA9IDEwMDsKKyAgICAgICAgdGhpcy5f ZnJhbWVUaW1lSGlzdG9yeSA9IFtdOworICAgIH0sCisKKyAgICByZWdpc3RlckZyYW1lVGltZTog ZnVuY3Rpb24obGFzdEZyYW1lTGVuZ3RoKQorICAgIHsKKyAgICAgICAgdGhpcy5fZnJhbWVUaW1l SGlzdG9yeS5wdXNoKGxhc3RGcmFtZUxlbmd0aCk7CisgICAgfSwKKworICAgIGludGVydmFsSGFz Q29uY2x1ZGVkOiBmdW5jdGlvbih0aW1lc3RhbXApCisgICAgeworICAgICAgICBpZiAoIUNvbnRy b2xsZXIucHJvdG90eXBlLmludGVydmFsSGFzQ29uY2x1ZGVkLmNhbGwodGhpcywgdGltZXN0YW1w KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICByZXR1cm4gdGhpcy5fZmlu aXNoZWRUaWVyU2FtcGxpbmcgfHwgdGhpcy5maWx0ZXJPdXRPdXRsaWVycyh0aGlzLl9mcmFtZVRp bWVIaXN0b3J5KS5sZW5ndGggPiB0aGlzLm51bWJlck9mRnJhbWVzUmVxdWlyZWRJbkludGVydmFs OwogICAgIH0sCiAKICAgICBkaWRGaW5pc2hJbnRlcnZhbDogZnVuY3Rpb24odGltZXN0YW1wLCBz dGFnZSwgaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpCiAgICAgeworICAgICAgICB0aGlzLl9m cmFtZVRpbWVIaXN0b3J5ID0gW107CiAgICAgICAgIGlmICghdGhpcy5fZmluaXNoZWRUaWVyU2Ft cGxpbmcpIHsKICAgICAgICAgICAgIGlmICh0aGlzLl90aWVyU3RhcnRUaW1lc3RhbXAgPiAwICYm IHRpbWVzdGFtcCA8IHRoaXMuX3RpZXJTdGFydFRpbWVzdGFtcCArIHRoaXMudGllckZhc3RUZXN0 TGVuZ3RoKQogICAgICAgICAgICAgICAgIHJldHVybjsKQEAgLTM3OCw5ICs0MjcsOSBAQCBSYW1w Q29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhDb250cm9sbGVyLAogICAgICAg ICAgICAgICAgIHRoaXMuX2xhc3RUaWVyQ29tcGxleGl0eSA9IGN1cnJlbnRDb21wbGV4aXR5Owog ICAgICAgICAgICAgICAgIHRoaXMuX2xhc3RUaWVyRnJhbWVMZW5ndGggPSBjdXJyZW50RnJhbWVM ZW5ndGg7CiAKLSAgICAgICAgICAgICAgICB0aGlzLl90aWVyICs9IC41OworICAgICAgICAgICAg ICAgIHRoaXMuX3RpZXIgKz0gMTsKICAgICAgICAgICAgICAgICB0aGlzLl9lbmRUaW1lc3RhbXAg PSB0aW1lc3RhbXAgKyB0aGlzLl90ZXN0TGVuZ3RoOwotICAgICAgICAgICAgICAgIHZhciBuZXh0 VGllckNvbXBsZXhpdHkgPSBNYXRoLnJvdW5kKE1hdGgucG93KDEwLCB0aGlzLl90aWVyKSk7Cisg ICAgICAgICAgICAgICAgdmFyIG5leHRUaWVyQ29tcGxleGl0eSA9IE1hdGgubWF4KE1hdGgucm91 bmQoTWF0aC5wb3coMS4yLCB0aGlzLl90aWVyKSksIGN1cnJlbnRDb21wbGV4aXR5ICsgMSk7CiAg ICAgICAgICAgICAgICAgc3RhZ2UudHVuZShuZXh0VGllckNvbXBsZXhpdHkgLSBjdXJyZW50Q29t cGxleGl0eSk7CiAKICAgICAgICAgICAgICAgICAvLyBTb21lIHRlc3RzIG1heSBiZSB1bmFibGUg dG8gZ28gYmV5b25kIGEgY2VydGFpbiBjYXBhY2l0eS4gSWYgc28sIGRvbid0IGtlZXAgbW92aW5n IHVwIHRpZXJzCg== 422587 2021-03-08 11:06:06 -0800 2021-03-09 02:09:58 -0800 Patch bug-220847-20210308110605.patch text/plain 10327 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDYxCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZlZmQzYTRmMjBj MGZjOGE0ZmRmNjliMGExZjQ0MjYyNDhiZGIxMTIuLmM0MDc3NzdlNmQxYjE5M2FjZWQxNDI0NDU4 Nzk1MTc5MzU3NWYyODEgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjEtMDMt MDcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBN b3Rpb25NYXJrIHNjb3JlcyBhcmUgc3VwZXIgc2Vuc2l0aXZlIHRvIGEgc2luZ2xlIGxvbmcgZnJh bWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDg0 NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTI3NDM+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5LCAicmFtcCIgdGVzdHMgaGF2 ZSB0aHJlZSBwaGFzZXMuIFRoZSBtaWRkbGUgcGhhc2UgaXMgd2hlcmUgdGhleSB0cnkgdG8gZGV0 ZXJtaW5lIGEgbWF4aW11bSByZWFzb25hYmxlCisgICAgICAgIGNvbXBsZXhpdHksIGFuZCB0aGUg dGhpcmQgb25lIGlzIHdoZXJlIHRoZXkgdHJ5IHZhcmlvdXMgY29tcGxleGl0aWVzIGJldHdlZW4g MCBhbmQgdGhlIG1heGltdW0uIFRoZSBjYWxjdWxhdGlvbgorICAgICAgICBvZiB0aGlzIG1heGlt dW0gcmVhc29uYWJsZSBjb21wbGV4aXR5IGlzIGN1cnJlbnRseSB2ZXJ5IHNlbnNpdGl2ZSB0byBv dXRsaWVyIGZyYW1lIHRpbWVzLiBJZiB0aGVyZSBpcyBhIHNpbmdsZQorICAgICAgICBvdXRsaWVy IGZyYW1lIHRpbWUsIHRoZSBmYWlsdXJlIG1vZGUgaXMgdG8gYXNzdW1lIHRoYXQgdGhlIG1heGlt dW0gY29tcGxleGl0eSBpcyB+MTAuIFNvLCB0aGUgc29sdXRpb24gaXMgdG8KKyAgICAgICAgaWdu b3JlIG91dGxpZXIgZnJhbWUgdGltZXMgZHVyaW5nIHRoaXMgZmlyc3QgcGhhc2UsIGFuZCB0byBl bnN1cmUgdGhhdCB0aGVyZSBhcmUgYXQgbGVhc3QgOSBmcmFtZXMgbWVhc3VyZWQgdGhhdAorICAg ICAgICBoYXZlIG5vbi1vdXRsaWVyIHRpbWVzLgorCisgICAgICAgIFRoaXMgdGVzdCBhbHNvIGNo YW5nZXMgdGhlIHNwZWVkIG9mIHRoZSByYW1wLXVwIHBlcmlvZC4gUHJldmlvdXNseSwgZWFjaCBp bnRlcnZhbCBkdXJpbmcgdGhlIHJhbXAtdXAgcGVyaW9kIGhhZAorICAgICAgICBhIGNvbXBsZXhp dHkgdGhhdCB3YXMgMy4xNnggb2YgdGhlIHByZXZpb3VzIGNvbXBsZXhpdHkuIFRoaXMgcGF0Y2gg Y2hhbmdlcyB0aGF0IHRvIDEuMnggb2YgdGhlIHByZXZpb3VzCisgICAgICAgIGNvbXBsZXhpdHku IEJlY2F1c2UgdGhpcyBjYXVzZXMgdGVzdHMgdG8gdGFrZSBsb25nZXIsIHRoaXMgcGF0Y2ggYWxz byBidW1wcyB1cCB0aGUgdGVzdCBkdXJhdGlvbiBmcm9tIDMwcyB0byAzN3MuCisKKyAgICAgICAg KiBNb3Rpb25NYXJrL2RldmVsb3Blci5odG1sOgorICAgICAgICAqIE1vdGlvbk1hcmsvcmVzb3Vy Y2VzL3J1bm5lci9tb3Rpb25tYXJrLmpzOgorICAgICAgICAodGhpcy5jbGVhcik6CisgICAgICAg ICogTW90aW9uTWFyay90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qczoKKyAgICAgICAgKGZpbHRlck91 dE91dGxpZXJzKToKKyAgICAgICAgKF9tZWFzdXJlQW5kUmVzZXRJbnRlcnZhbCk6CisgICAgICAg ICh1cGRhdGUpOgorICAgICAgICAocmVnaXN0ZXJGcmFtZVRpbWUpOgorICAgICAgICAoaW50ZXJ2 YWxIYXNDb25jbHVkZWQpOgorICAgICAgICAoc3RhcnQpOgorICAgICAgICAoZGlkRmluaXNoSW50 ZXJ2YWwpOgorCiAyMDIxLTAyLTI2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1BlcmZvcm1hbmNlIHRlc3RdW0xpbmUgbGF5b3V0XSBBZGQgdGVzdCB3aXRoIGlu bGluZSBib3hlcwpkaWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL2RldmVs b3Blci5odG1sIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL2RldmVsb3Blci5odG1sCmlu ZGV4IDg2YjY2ODMwZDQ5MTk5MDYxNzk2ZGRlMDUxYmYxYzdmNmMxZDFmNGYuLjVjZTE1MWRhOGYw OTJmMTQxMWI3ZjI5YzQ1OGE1MGQyOGJjZDQ5MGQgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVz dHMvTW90aW9uTWFyay9kZXZlbG9wZXIuaHRtbAorKysgYi9QZXJmb3JtYW5jZVRlc3RzL01vdGlv bk1hcmsvZGV2ZWxvcGVyLmh0bWwKQEAgLTc0LDcgKzc0LDcgQEAKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxsYWJlbD5GaXJzdCBmcmFtZSBtaW5pbXVtIGxlbmd0aDogPGlu cHV0IHR5cGU9Im51bWJlciIgaWQ9ImZpcnN0LWZyYW1lLW1pbmltdW0tbGVuZ3RoIiB2YWx1ZT0i MCI+IG1zPC9sYWJlbD4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9saT4KICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGxpPgotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgPGxhYmVsPlRlc3QgbGVuZ3RoOiA8aW5wdXQgdHlwZT0ibnVtYmVyIiBp ZD0idGVzdC1pbnRlcnZhbCIgdmFsdWU9IjMwIj4gc2Vjb25kcyBlYWNoPC9sYWJlbD4KKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxsYWJlbD5UZXN0IGxlbmd0aDogPGlucHV0 IHR5cGU9Im51bWJlciIgaWQ9InRlc3QtaW50ZXJ2YWwiIHZhbHVlPSIzNyI+IHNlY29uZHMgZWFj aDwvbGFiZWw+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvbGk+CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDxsaT4KICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDxoMz5EaXNwbGF5OjwvaDM+CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L01vdGlvbk1hcmsvcmVzb3VyY2VzL3J1bm5lci9tb3Rpb25tYXJrLmpzIGIvUGVyZm9ybWFuY2VU ZXN0cy9Nb3Rpb25NYXJrL3Jlc291cmNlcy9ydW5uZXIvbW90aW9ubWFyay5qcwppbmRleCBjY2Q3 MTMyYzkwYjFkZDNhZmIxN2IxNTU0MDdlODMwMWQxMjIzYjI2Li4xNzI0OGM4Y2I3YjFlNTZmZDQ3 YWJiNTRmN2YzMzRlN2Y5OTdiMjEyIDEwMDY0NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL01vdGlv bk1hcmsvcmVzb3VyY2VzL3J1bm5lci9tb3Rpb25tYXJrLmpzCisrKyBiL1BlcmZvcm1hbmNlVGVz dHMvTW90aW9uTWFyay9yZXNvdXJjZXMvcnVubmVyL21vdGlvbm1hcmsuanMKQEAgLTQ1OCw3ICs0 NTgsNyBAQCB3aW5kb3cuc2VjdGlvbnNNYW5hZ2VyID0KIAogd2luZG93LmJlbmNobWFya0NvbnRy b2xsZXIgPSB7CiAgICAgYmVuY2htYXJrRGVmYXVsdFBhcmFtZXRlcnM6IHsKLSAgICAgICAgInRl c3QtaW50ZXJ2YWwiOiAzMCwKKyAgICAgICAgInRlc3QtaW50ZXJ2YWwiOiAzNywKICAgICAgICAg ImRpc3BsYXkiOiAibWluaW1hbCIsCiAgICAgICAgICJ0aWxlcyI6ICJiaWciLAogICAgICAgICAi Y29udHJvbGxlciI6ICJyYW1wIiwKZGlmZiAtLWdpdCBhL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9u TWFyay90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qcyBiL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFy ay90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qcwppbmRleCA2ZmM0NmI0YWYwZjMxOTkwZGUyNzQwZGIx ZWM5YmJjNDBkNWFlZjBlLi5kN2Y2ZDYwOTkwNTc5NmI2NzVlNTljODI5ODA1YTQwNTI0NGZlNjYy IDEwMDY0NAotLS0gYS9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvdGVzdHMvcmVzb3VyY2Vz L21haW4uanMKKysrIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL3Jlc291cmNl cy9tYWluLmpzCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAxNS0yMDIw IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNS0y MDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucwpAQCAtMTEwLDE0ICsxMTAsMzMgQEAgQ29udHJvbGxlciA9IFV0aWxpdGllcy5j cmVhdGVDbGFzcygKICAgICAgICAgcmV0dXJuIGNvbW1lbnQgaW4gdGhpcy5fbWFya3M7CiAgICAg fSwKIAorICAgIGZpbHRlck91dE91dGxpZXJzOiBmdW5jdGlvbihhcnJheSkKKyAgICB7CisgICAg ICAgIGlmIChhcnJheS5sZW5ndGggPT0gMCkKKyAgICAgICAgICAgIHJldHVybiBbXTsKKworICAg ICAgICBhcnJheS5zb3J0KCk7CisgICAgICAgIHZhciBxMSA9IGFycmF5W01hdGgubWluKE1hdGgu cm91bmQoYXJyYXkubGVuZ3RoICogMSAvIDQpLCBhcnJheS5sZW5ndGggLSAxKV07CisgICAgICAg IHZhciBxMyA9IGFycmF5W01hdGgubWluKE1hdGgucm91bmQoYXJyYXkubGVuZ3RoICogMyAvIDQp LCBhcnJheS5sZW5ndGggLSAxKV07CisgICAgICAgIHZhciBpbnRlcnF1YXJ0aWxlUmFuZ2UgPSBx MyAtIHExOworICAgICAgICB2YXIgbWluaW11bSA9IHExIC0gaW50ZXJxdWFydGlsZVJhbmdlICog MS41OworICAgICAgICB2YXIgbWF4aW11bSA9IHEzICsgaW50ZXJxdWFydGlsZVJhbmdlICogMS41 OworICAgICAgICByZXR1cm4gYXJyYXkuZmlsdGVyKHggPT4geCA+PSBtaW5pbXVtICYmIHggPD0g bWF4aW11bSk7CisgICAgfSwKKwogICAgIF9tZWFzdXJlQW5kUmVzZXRJbnRlcnZhbDogZnVuY3Rp b24oY3VycmVudFRpbWVzdGFtcCkKICAgICB7CiAgICAgICAgIHZhciBzYW1wbGVDb3VudCA9IHRo aXMuX3NhbXBsZXIuc2FtcGxlQ291bnQ7CiAgICAgICAgIHZhciBhdmVyYWdlRnJhbWVMZW5ndGgg PSAwOwogCiAgICAgICAgIGlmICh0aGlzLl9pbnRlcnZhbEVuZFRpbWVzdGFtcCkgewotICAgICAg ICAgICAgdmFyIGludGVydmFsU3RhcnRUaW1lc3RhbXAgPSB0aGlzLl9zYW1wbGVyLnNhbXBsZXNb MF1bdGhpcy5faW50ZXJ2YWxTdGFydEluZGV4XTsKLSAgICAgICAgICAgIGF2ZXJhZ2VGcmFtZUxl bmd0aCA9IChjdXJyZW50VGltZXN0YW1wIC0gaW50ZXJ2YWxTdGFydFRpbWVzdGFtcCkgLyAoc2Ft cGxlQ291bnQgLSB0aGlzLl9pbnRlcnZhbFN0YXJ0SW5kZXgpOworICAgICAgICAgICAgdmFyIGR1 cmF0aW9ucyA9IFtdOworICAgICAgICAgICAgZm9yICh2YXIgaSA9IE1hdGgubWF4KHRoaXMuX2lu dGVydmFsU3RhcnRJbmRleCwgMSk7IGkgPCBzYW1wbGVDb3VudDsgKytpKSB7CisgICAgICAgICAg ICAgICAgZHVyYXRpb25zLnB1c2godGhpcy5fc2FtcGxlci5zYW1wbGVzWzBdW2ldIC0gdGhpcy5f c2FtcGxlci5zYW1wbGVzWzBdW2kgLSAxXSk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICB2 YXIgZmlsdGVyZWREdXJhdGlvbnMgPSB0aGlzLmZpbHRlck91dE91dGxpZXJzKGR1cmF0aW9ucyk7 CisgICAgICAgICAgICBpZiAoZmlsdGVyZWREdXJhdGlvbnMubGVuZ3RoID4gMCkKKyAgICAgICAg ICAgICAgICBhdmVyYWdlRnJhbWVMZW5ndGggPSBmaWx0ZXJlZER1cmF0aW9ucy5yZWR1Y2UoKGEs IGIpID0+IGEgKyBiLCAwKSAvIGZpbHRlcmVkRHVyYXRpb25zLmxlbmd0aDsKICAgICAgICAgfQog CiAgICAgICAgIHRoaXMuX2ludGVydmFsU3RhcnRJbmRleCA9IHNhbXBsZUNvdW50OwpAQCAtMTM4 LDIxICsxNTcsMzQgQEAgQ29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVhdGVDbGFzcygKICAgICAg ICAgICAgICAgICB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5zYW1wbGUobGFzdEZyYW1lTGVu Z3RoKTsKICAgICAgICAgICAgICAgICBmcmFtZUxlbmd0aEVzdGltYXRlID0gdGhpcy5fZnJhbWVM ZW5ndGhFc3RpbWF0b3IuZXN0aW1hdGU7CiAgICAgICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSBp ZiAodGltZXN0YW1wID49IHRoaXMuX2ludGVydmFsRW5kVGltZXN0YW1wKSB7Ci0gICAgICAgICAg ICB2YXIgaW50ZXJ2YWxTdGFydFRpbWVzdGFtcCA9IHRoaXMuX3NhbXBsZXIuc2FtcGxlc1swXVt0 aGlzLl9pbnRlcnZhbFN0YXJ0SW5kZXhdOwotICAgICAgICAgICAgaW50ZXJ2YWxBdmVyYWdlRnJh bWVMZW5ndGggPSB0aGlzLl9tZWFzdXJlQW5kUmVzZXRJbnRlcnZhbCh0aW1lc3RhbXApOwotICAg ICAgICAgICAgaWYgKHRoaXMuX2lzRnJhbWVMZW5ndGhFc3RpbWF0b3JFbmFibGVkKSB7Ci0gICAg ICAgICAgICAgICAgdGhpcy5fZnJhbWVMZW5ndGhFc3RpbWF0b3Iuc2FtcGxlKGludGVydmFsQXZl cmFnZUZyYW1lTGVuZ3RoKTsKLSAgICAgICAgICAgICAgICBmcmFtZUxlbmd0aEVzdGltYXRlID0g dGhpcy5fZnJhbWVMZW5ndGhFc3RpbWF0b3IuZXN0aW1hdGU7CisgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICB0aGlzLnJlZ2lzdGVyRnJhbWVUaW1lKGxhc3RGcmFtZUxlbmd0aCk7CisgICAg ICAgICAgICBpZiAodGhpcy5pbnRlcnZhbEhhc0NvbmNsdWRlZCh0aW1lc3RhbXApKSB7CisgICAg ICAgICAgICAgICAgdmFyIGludGVydmFsU3RhcnRUaW1lc3RhbXAgPSB0aGlzLl9zYW1wbGVyLnNh bXBsZXNbMF1bdGhpcy5faW50ZXJ2YWxTdGFydEluZGV4XTsKKyAgICAgICAgICAgICAgICBpbnRl cnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCA9IHRoaXMuX21lYXN1cmVBbmRSZXNldEludGVydmFsKHRp bWVzdGFtcCk7CisgICAgICAgICAgICAgICAgaWYgKHRoaXMuX2lzRnJhbWVMZW5ndGhFc3RpbWF0 b3JFbmFibGVkKSB7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX2ZyYW1lTGVuZ3RoRXN0aW1h dG9yLnNhbXBsZShpbnRlcnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCk7CisgICAgICAgICAgICAgICAg ICAgIGZyYW1lTGVuZ3RoRXN0aW1hdGUgPSB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5lc3Rp bWF0ZTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgZGlkRmluaXNoSW50ZXJ2 YWwgPSB0cnVlOworICAgICAgICAgICAgICAgIHRoaXMuZGlkRmluaXNoSW50ZXJ2YWwodGltZXN0 YW1wLCBzdGFnZSwgaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpOworICAgICAgICAgICAgICAg IHRoaXMuX2ZyYW1lTGVuZ3RoRXN0aW1hdG9yLnJlc2V0KCk7CiAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICBkaWRGaW5pc2hJbnRlcnZhbCA9IHRydWU7Ci0gICAgICAgICAgICB0aGlzLmRpZEZp bmlzaEludGVydmFsKHRpbWVzdGFtcCwgc3RhZ2UsIGludGVydmFsQXZlcmFnZUZyYW1lTGVuZ3Ro KTsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX3NhbXBsZXIucmVjb3JkKHRpbWVzdGFtcCwg c3RhZ2UuY29tcGxleGl0eSgpLCBmcmFtZUxlbmd0aEVzdGltYXRlKTsKICAgICAgICAgdGhpcy50 dW5lKHRpbWVzdGFtcCwgc3RhZ2UsIGxhc3RGcmFtZUxlbmd0aCwgZGlkRmluaXNoSW50ZXJ2YWws IGludGVydmFsQXZlcmFnZUZyYW1lTGVuZ3RoKTsKICAgICB9LAogCisgICAgcmVnaXN0ZXJGcmFt ZVRpbWU6IGZ1bmN0aW9uKGxhc3RGcmFtZUxlbmd0aCkKKyAgICB7CisgICAgfSwKKworICAgIGlu dGVydmFsSGFzQ29uY2x1ZGVkOiBmdW5jdGlvbih0aW1lc3RhbXApCisgICAgeworICAgICAgICBy ZXR1cm4gdGltZXN0YW1wID49IHRoaXMuX2ludGVydmFsRW5kVGltZXN0YW1wOworICAgIH0sCisK ICAgICBkaWRGaW5pc2hJbnRlcnZhbDogZnVuY3Rpb24odGltZXN0YW1wLCBzdGFnZSwgaW50ZXJ2 YWxBdmVyYWdlRnJhbWVMZW5ndGgpCiAgICAgewogICAgIH0sCkBAIC0zMDgsNyArMzQwLDcgQEAg UmFtcENvbnRyb2xsZXIgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoQ29udHJvbGxlciwKIAog ICAgICAgICAvLyBJbml0aWFsbHkgc3RhcnQgd2l0aCBhIHRpZXIgdGVzdCB0byBmaW5kIHRoZSBi b3VuZHMKICAgICAgICAgLy8gVGhlIG51bWJlciBvZiBvYmplY3RzIGluIGEgdGllciB0ZXN0IGlz IDEwXnxfdGllcnwKLSAgICAgICAgdGhpcy5fdGllciA9IC0uNTsKKyAgICAgICAgdGhpcy5fdGll ciA9IC0xOwogICAgICAgICAvLyBUaGUgdGltZXN0YW1wIGlzIGZpcnN0IHNldCBhZnRlciB0aGUg Zmlyc3QgaW50ZXJ2YWwgY29tcGxldGVzCiAgICAgICAgIHRoaXMuX3RpZXJTdGFydFRpbWVzdGFt cCA9IDA7CiAgICAgICAgIHRoaXMuX21pbmltdW1Db21wbGV4aXR5ID0gMTsKQEAgLTMzNiw2ICsz NjgsOCBAQCBSYW1wQ29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhDb250cm9s bGVyLAogICAgIHRpZXJGYXN0VGVzdExlbmd0aDogMjUwLAogICAgIC8vIElmIHRoZSBlbmdpbmUg aXMgdW5kZXIgc3RyZXNzLCBsZXQgdGhlIHRlc3QgcnVuIGEgbGl0dGxlIGxvbmdlciB0byBsZXQg dGhlIG1lYXN1cmVtZW50IHNldHRsZQogICAgIHRpZXJTbG93VGVzdExlbmd0aDogNzUwLAorICAg IC8vIFRpZXIgaW50ZXJ2YWxzIG11c3QgaGF2ZSB0aGlzIG51bWJlciBvZiBub24tb3V0bGllciBm cmFtZXMgaW4gb3JkZXIgdG8gZW5kLgorICAgIG51bWJlck9mRnJhbWVzUmVxdWlyZWRJbkludGVy dmFsOiA5LAogCiAgICAgcmFtcFdhcm11cExlbmd0aDogMjAwLAogCkBAIC0zNTUsMTAgKzM4OSwy NSBAQCBSYW1wQ29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhDb250cm9sbGVy LAogICAgICAgICBDb250cm9sbGVyLnByb3RvdHlwZS5zdGFydC5jYWxsKHRoaXMsIHN0YXJ0VGlt ZXN0YW1wLCBzdGFnZSk7CiAgICAgICAgIHRoaXMuX3JhbXBTdGFydFRpbWVzdGFtcCA9IDA7CiAg ICAgICAgIHRoaXMuaW50ZXJ2YWxTYW1wbGluZ0xlbmd0aCA9IDEwMDsKKyAgICAgICAgdGhpcy5f ZnJhbWVUaW1lSGlzdG9yeSA9IFtdOworICAgIH0sCisKKyAgICByZWdpc3RlckZyYW1lVGltZTog ZnVuY3Rpb24obGFzdEZyYW1lTGVuZ3RoKQorICAgIHsKKyAgICAgICAgdGhpcy5fZnJhbWVUaW1l SGlzdG9yeS5wdXNoKGxhc3RGcmFtZUxlbmd0aCk7CisgICAgfSwKKworICAgIGludGVydmFsSGFz Q29uY2x1ZGVkOiBmdW5jdGlvbih0aW1lc3RhbXApCisgICAgeworICAgICAgICBpZiAoIUNvbnRy b2xsZXIucHJvdG90eXBlLmludGVydmFsSGFzQ29uY2x1ZGVkLmNhbGwodGhpcywgdGltZXN0YW1w KSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICByZXR1cm4gdGhpcy5fZmlu aXNoZWRUaWVyU2FtcGxpbmcgfHwgdGhpcy5maWx0ZXJPdXRPdXRsaWVycyh0aGlzLl9mcmFtZVRp bWVIaXN0b3J5KS5sZW5ndGggPiB0aGlzLm51bWJlck9mRnJhbWVzUmVxdWlyZWRJbkludGVydmFs OwogICAgIH0sCiAKICAgICBkaWRGaW5pc2hJbnRlcnZhbDogZnVuY3Rpb24odGltZXN0YW1wLCBz dGFnZSwgaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpCiAgICAgeworICAgICAgICB0aGlzLl9m cmFtZVRpbWVIaXN0b3J5ID0gW107CiAgICAgICAgIGlmICghdGhpcy5fZmluaXNoZWRUaWVyU2Ft cGxpbmcpIHsKICAgICAgICAgICAgIGlmICh0aGlzLl90aWVyU3RhcnRUaW1lc3RhbXAgPiAwICYm IHRpbWVzdGFtcCA8IHRoaXMuX3RpZXJTdGFydFRpbWVzdGFtcCArIHRoaXMudGllckZhc3RUZXN0 TGVuZ3RoKQogICAgICAgICAgICAgICAgIHJldHVybjsKQEAgLTM3OCw5ICs0MjcsOSBAQCBSYW1w Q29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhDb250cm9sbGVyLAogICAgICAg ICAgICAgICAgIHRoaXMuX2xhc3RUaWVyQ29tcGxleGl0eSA9IGN1cnJlbnRDb21wbGV4aXR5Owog ICAgICAgICAgICAgICAgIHRoaXMuX2xhc3RUaWVyRnJhbWVMZW5ndGggPSBjdXJyZW50RnJhbWVM ZW5ndGg7CiAKLSAgICAgICAgICAgICAgICB0aGlzLl90aWVyICs9IC41OworICAgICAgICAgICAg ICAgIHRoaXMuX3RpZXIgKz0gMTsKICAgICAgICAgICAgICAgICB0aGlzLl9lbmRUaW1lc3RhbXAg PSB0aW1lc3RhbXAgKyB0aGlzLl90ZXN0TGVuZ3RoOwotICAgICAgICAgICAgICAgIHZhciBuZXh0 VGllckNvbXBsZXhpdHkgPSBNYXRoLnJvdW5kKE1hdGgucG93KDEwLCB0aGlzLl90aWVyKSk7Cisg ICAgICAgICAgICAgICAgdmFyIG5leHRUaWVyQ29tcGxleGl0eSA9IE1hdGgubWF4KE1hdGgucm91 bmQoTWF0aC5wb3coMS4yLCB0aGlzLl90aWVyKSksIGN1cnJlbnRDb21wbGV4aXR5ICsgMSk7CiAg ICAgICAgICAgICAgICAgc3RhZ2UudHVuZShuZXh0VGllckNvbXBsZXhpdHkgLSBjdXJyZW50Q29t cGxleGl0eSk7CiAKICAgICAgICAgICAgICAgICAvLyBTb21lIHRlc3RzIG1heSBiZSB1bmFibGUg dG8gZ28gYmV5b25kIGEgY2VydGFpbiBjYXBhY2l0eS4gSWYgc28sIGRvbid0IGtlZXAgbW92aW5n IHVwIHRpZXJzCg== 422681 2021-03-09 02:10:01 -0800 2021-03-09 10:21:42 -0800 Patch bug-220847-20210309021000.patch text/plain 8294 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDYxCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZlZmQzYTRmMjBj MGZjOGE0ZmRmNjliMGExZjQ0MjYyNDhiZGIxMTIuLjM1ZTVmODE2YWE5YjhiOTc3ZTNhMmNlOWZk NTkxZmYxMDA5ZGY5NzMgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDMt MDcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBN b3Rpb25NYXJrIHNjb3JlcyBhcmUgc3VwZXIgc2Vuc2l0aXZlIHRvIGEgc2luZ2xlIGxvbmcgZnJh bWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDg0 NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTI3NDM+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5LCAicmFtcCIgdGVzdHMgaGF2 ZSB0aHJlZSBwaGFzZXMuIFRoZSBtaWRkbGUgcGhhc2UgaXMgd2hlcmUgdGhleSB0cnkgdG8gZGV0 ZXJtaW5lIGEgbWF4aW11bSByZWFzb25hYmxlCisgICAgICAgIGNvbXBsZXhpdHksIGFuZCB0aGUg dGhpcmQgb25lIGlzIHdoZXJlIHRoZXkgdHJ5IHZhcmlvdXMgY29tcGxleGl0aWVzIGJldHdlZW4g MCBhbmQgdGhlIG1heGltdW0uIFRoZSBjYWxjdWxhdGlvbgorICAgICAgICBvZiB0aGlzIG1heGlt dW0gcmVhc29uYWJsZSBjb21wbGV4aXR5IGlzIGN1cnJlbnRseSB2ZXJ5IHNlbnNpdGl2ZSB0byBv dXRsaWVyIGZyYW1lIHRpbWVzLiBJZiB0aGVyZSBpcyBhIHNpbmdsZQorICAgICAgICBvdXRsaWVy IGZyYW1lIHRpbWUsIHRoZSBmYWlsdXJlIG1vZGUgaXMgdG8gYXNzdW1lIHRoYXQgdGhlIG1heGlt dW0gY29tcGxleGl0eSBpcyB+MTAuIFNvLCB0aGUgc29sdXRpb24gaXMgdG8KKyAgICAgICAgaWdu b3JlIG91dGxpZXIgZnJhbWUgdGltZXMgZHVyaW5nIHRoaXMgZmlyc3QgcGhhc2UsIGFuZCB0byBl bnN1cmUgdGhhdCB0aGVyZSBhcmUgYXQgbGVhc3QgOSBmcmFtZXMgbWVhc3VyZWQgdGhhdAorICAg ICAgICBoYXZlIG5vbi1vdXRsaWVyIHRpbWVzLgorCisgICAgICAgIFRoaXMgdGVzdCBhbHNvIGNo YW5nZXMgdGhlIHNwZWVkIG9mIHRoZSByYW1wLXVwIHBlcmlvZC4gUHJldmlvdXNseSwgZWFjaCBp bnRlcnZhbCBkdXJpbmcgdGhlIHJhbXAtdXAgcGVyaW9kIGhhZAorICAgICAgICBhIGNvbXBsZXhp dHkgdGhhdCB3YXMgMy4xNnggb2YgdGhlIHByZXZpb3VzIGNvbXBsZXhpdHkuIFRoaXMgcGF0Y2gg Y2hhbmdlcyB0aGF0IHRvIDEuNXggb2YgdGhlIHByZXZpb3VzCisgICAgICAgIGNvbXBsZXhpdHkg KGZvciBjb21wbGV4aXRpZXMgYWJvdmUgNTApLgorCisgICAgICAgICogTW90aW9uTWFyay90ZXN0 cy9yZXNvdXJjZXMvbWFpbi5qczoKKyAgICAgICAgKGZpbHRlck91dE91dGxpZXJzKToKKyAgICAg ICAgKF9tZWFzdXJlQW5kUmVzZXRJbnRlcnZhbCk6CisgICAgICAgICh1cGRhdGUpOgorICAgICAg ICAocmVnaXN0ZXJGcmFtZVRpbWUpOgorICAgICAgICAoaW50ZXJ2YWxIYXNDb25jbHVkZWQpOgor ICAgICAgICAoc3RhcnQpOgorICAgICAgICAoZGlkRmluaXNoSW50ZXJ2YWwpOgorCiAyMDIxLTAy LTI2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1BlcmZvcm1h bmNlIHRlc3RdW0xpbmUgbGF5b3V0XSBBZGQgdGVzdCB3aXRoIGlubGluZSBib3hlcwpkaWZmIC0t Z2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL3Jlc291cmNlcy9tYWluLmpz IGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL3Jlc291cmNlcy9tYWluLmpzCmlu ZGV4IDZmYzQ2YjRhZjBmMzE5OTBkZTI3NDBkYjFlYzliYmM0MGQ1YWVmMGUuLmM0N2EwOTBlMTU5 MTUwMWU0MDgzZTRiNmM2OWI0OWZjYWRlNjVlMzkgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVz dHMvTW90aW9uTWFyay90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qcworKysgYi9QZXJmb3JtYW5jZVRl c3RzL01vdGlvbk1hcmsvdGVzdHMvcmVzb3VyY2VzL21haW4uanMKQEAgLTEsNSArMSw1IEBACiAv KgotICogQ29weXJpZ2h0IChDKSAyMDE1LTIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE1LTIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0xMTAsMTQgKzExMCwz MyBAQCBDb250cm9sbGVyID0gVXRpbGl0aWVzLmNyZWF0ZUNsYXNzKAogICAgICAgICByZXR1cm4g Y29tbWVudCBpbiB0aGlzLl9tYXJrczsKICAgICB9LAogCisgICAgZmlsdGVyT3V0T3V0bGllcnM6 IGZ1bmN0aW9uKGFycmF5KQorICAgIHsKKyAgICAgICAgaWYgKGFycmF5Lmxlbmd0aCA9PSAwKQor ICAgICAgICAgICAgcmV0dXJuIFtdOworCisgICAgICAgIGFycmF5LnNvcnQoKTsKKyAgICAgICAg dmFyIHExID0gYXJyYXlbTWF0aC5taW4oTWF0aC5yb3VuZChhcnJheS5sZW5ndGggKiAxIC8gNCks IGFycmF5Lmxlbmd0aCAtIDEpXTsKKyAgICAgICAgdmFyIHEzID0gYXJyYXlbTWF0aC5taW4oTWF0 aC5yb3VuZChhcnJheS5sZW5ndGggKiAzIC8gNCksIGFycmF5Lmxlbmd0aCAtIDEpXTsKKyAgICAg ICAgdmFyIGludGVycXVhcnRpbGVSYW5nZSA9IHEzIC0gcTE7CisgICAgICAgIHZhciBtaW5pbXVt ID0gcTEgLSBpbnRlcnF1YXJ0aWxlUmFuZ2UgKiAxLjU7CisgICAgICAgIHZhciBtYXhpbXVtID0g cTMgKyBpbnRlcnF1YXJ0aWxlUmFuZ2UgKiAxLjU7CisgICAgICAgIHJldHVybiBhcnJheS5maWx0 ZXIoeCA9PiB4ID49IG1pbmltdW0gJiYgeCA8PSBtYXhpbXVtKTsKKyAgICB9LAorCiAgICAgX21l YXN1cmVBbmRSZXNldEludGVydmFsOiBmdW5jdGlvbihjdXJyZW50VGltZXN0YW1wKQogICAgIHsK ICAgICAgICAgdmFyIHNhbXBsZUNvdW50ID0gdGhpcy5fc2FtcGxlci5zYW1wbGVDb3VudDsKICAg ICAgICAgdmFyIGF2ZXJhZ2VGcmFtZUxlbmd0aCA9IDA7CiAKICAgICAgICAgaWYgKHRoaXMuX2lu dGVydmFsRW5kVGltZXN0YW1wKSB7Ci0gICAgICAgICAgICB2YXIgaW50ZXJ2YWxTdGFydFRpbWVz dGFtcCA9IHRoaXMuX3NhbXBsZXIuc2FtcGxlc1swXVt0aGlzLl9pbnRlcnZhbFN0YXJ0SW5kZXhd OwotICAgICAgICAgICAgYXZlcmFnZUZyYW1lTGVuZ3RoID0gKGN1cnJlbnRUaW1lc3RhbXAgLSBp bnRlcnZhbFN0YXJ0VGltZXN0YW1wKSAvIChzYW1wbGVDb3VudCAtIHRoaXMuX2ludGVydmFsU3Rh cnRJbmRleCk7CisgICAgICAgICAgICB2YXIgZHVyYXRpb25zID0gW107CisgICAgICAgICAgICBm b3IgKHZhciBpID0gTWF0aC5tYXgodGhpcy5faW50ZXJ2YWxTdGFydEluZGV4LCAxKTsgaSA8IHNh bXBsZUNvdW50OyArK2kpIHsKKyAgICAgICAgICAgICAgICBkdXJhdGlvbnMucHVzaCh0aGlzLl9z YW1wbGVyLnNhbXBsZXNbMF1baV0gLSB0aGlzLl9zYW1wbGVyLnNhbXBsZXNbMF1baSAtIDFdKTsK KyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHZhciBmaWx0ZXJlZER1cmF0aW9ucyA9IHRoaXMu ZmlsdGVyT3V0T3V0bGllcnMoZHVyYXRpb25zKTsKKyAgICAgICAgICAgIGlmIChmaWx0ZXJlZER1 cmF0aW9ucy5sZW5ndGggPiAwKQorICAgICAgICAgICAgICAgIGF2ZXJhZ2VGcmFtZUxlbmd0aCA9 IGZpbHRlcmVkRHVyYXRpb25zLnJlZHVjZSgoYSwgYikgPT4gYSArIGIsIDApIC8gZmlsdGVyZWRE dXJhdGlvbnMubGVuZ3RoOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5faW50ZXJ2YWxTdGFy dEluZGV4ID0gc2FtcGxlQ291bnQ7CkBAIC0xMzgsMjEgKzE1NywzNCBAQCBDb250cm9sbGVyID0g VXRpbGl0aWVzLmNyZWF0ZUNsYXNzKAogICAgICAgICAgICAgICAgIHRoaXMuX2ZyYW1lTGVuZ3Ro RXN0aW1hdG9yLnNhbXBsZShsYXN0RnJhbWVMZW5ndGgpOwogICAgICAgICAgICAgICAgIGZyYW1l TGVuZ3RoRXN0aW1hdGUgPSB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5lc3RpbWF0ZTsKICAg ICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIGlmICh0aW1lc3RhbXAgPj0gdGhpcy5faW50ZXJ2 YWxFbmRUaW1lc3RhbXApIHsKLSAgICAgICAgICAgIHZhciBpbnRlcnZhbFN0YXJ0VGltZXN0YW1w ID0gdGhpcy5fc2FtcGxlci5zYW1wbGVzWzBdW3RoaXMuX2ludGVydmFsU3RhcnRJbmRleF07Ci0g ICAgICAgICAgICBpbnRlcnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCA9IHRoaXMuX21lYXN1cmVBbmRS ZXNldEludGVydmFsKHRpbWVzdGFtcCk7Ci0gICAgICAgICAgICBpZiAodGhpcy5faXNGcmFtZUxl bmd0aEVzdGltYXRvckVuYWJsZWQpIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9mcmFtZUxlbmd0 aEVzdGltYXRvci5zYW1wbGUoaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpOwotICAgICAgICAg ICAgICAgIGZyYW1lTGVuZ3RoRXN0aW1hdGUgPSB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5l c3RpbWF0ZTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHRoaXMucmVnaXN0ZXJGcmFt ZVRpbWUobGFzdEZyYW1lTGVuZ3RoKTsKKyAgICAgICAgICAgIGlmICh0aGlzLmludGVydmFsSGFz Q29uY2x1ZGVkKHRpbWVzdGFtcCkpIHsKKyAgICAgICAgICAgICAgICB2YXIgaW50ZXJ2YWxTdGFy dFRpbWVzdGFtcCA9IHRoaXMuX3NhbXBsZXIuc2FtcGxlc1swXVt0aGlzLl9pbnRlcnZhbFN0YXJ0 SW5kZXhdOworICAgICAgICAgICAgICAgIGludGVydmFsQXZlcmFnZUZyYW1lTGVuZ3RoID0gdGhp cy5fbWVhc3VyZUFuZFJlc2V0SW50ZXJ2YWwodGltZXN0YW1wKTsKKyAgICAgICAgICAgICAgICBp ZiAodGhpcy5faXNGcmFtZUxlbmd0aEVzdGltYXRvckVuYWJsZWQpIHsKKyAgICAgICAgICAgICAg ICAgICAgdGhpcy5fZnJhbWVMZW5ndGhFc3RpbWF0b3Iuc2FtcGxlKGludGVydmFsQXZlcmFnZUZy YW1lTGVuZ3RoKTsKKyAgICAgICAgICAgICAgICAgICAgZnJhbWVMZW5ndGhFc3RpbWF0ZSA9IHRo aXMuX2ZyYW1lTGVuZ3RoRXN0aW1hdG9yLmVzdGltYXRlOworICAgICAgICAgICAgICAgIH0KKyAg ICAgICAgICAgICAgICBkaWRGaW5pc2hJbnRlcnZhbCA9IHRydWU7CisgICAgICAgICAgICAgICAg dGhpcy5kaWRGaW5pc2hJbnRlcnZhbCh0aW1lc3RhbXAsIHN0YWdlLCBpbnRlcnZhbEF2ZXJhZ2VG cmFtZUxlbmd0aCk7CisgICAgICAgICAgICAgICAgdGhpcy5fZnJhbWVMZW5ndGhFc3RpbWF0b3Iu cmVzZXQoKTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGRpZEZpbmlzaEludGVydmFsID0g dHJ1ZTsKLSAgICAgICAgICAgIHRoaXMuZGlkRmluaXNoSW50ZXJ2YWwodGltZXN0YW1wLCBzdGFn ZSwgaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpOwogICAgICAgICB9CiAKICAgICAgICAgdGhp cy5fc2FtcGxlci5yZWNvcmQodGltZXN0YW1wLCBzdGFnZS5jb21wbGV4aXR5KCksIGZyYW1lTGVu Z3RoRXN0aW1hdGUpOwogICAgICAgICB0aGlzLnR1bmUodGltZXN0YW1wLCBzdGFnZSwgbGFzdEZy YW1lTGVuZ3RoLCBkaWRGaW5pc2hJbnRlcnZhbCwgaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgp OwogICAgIH0sCiAKKyAgICByZWdpc3RlckZyYW1lVGltZTogZnVuY3Rpb24obGFzdEZyYW1lTGVu Z3RoKQorICAgIHsKKyAgICB9LAorCisgICAgaW50ZXJ2YWxIYXNDb25jbHVkZWQ6IGZ1bmN0aW9u KHRpbWVzdGFtcCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aW1lc3RhbXAgPj0gdGhpcy5faW50 ZXJ2YWxFbmRUaW1lc3RhbXA7CisgICAgfSwKKwogICAgIGRpZEZpbmlzaEludGVydmFsOiBmdW5j dGlvbih0aW1lc3RhbXAsIHN0YWdlLCBpbnRlcnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCkKICAgICB7 CiAgICAgfSwKQEAgLTMzNiw2ICszNjgsOCBAQCBSYW1wQ29udHJvbGxlciA9IFV0aWxpdGllcy5j cmVhdGVTdWJjbGFzcyhDb250cm9sbGVyLAogICAgIHRpZXJGYXN0VGVzdExlbmd0aDogMjUwLAog ICAgIC8vIElmIHRoZSBlbmdpbmUgaXMgdW5kZXIgc3RyZXNzLCBsZXQgdGhlIHRlc3QgcnVuIGEg bGl0dGxlIGxvbmdlciB0byBsZXQgdGhlIG1lYXN1cmVtZW50IHNldHRsZQogICAgIHRpZXJTbG93 VGVzdExlbmd0aDogNzUwLAorICAgIC8vIFRpZXIgaW50ZXJ2YWxzIG11c3QgaGF2ZSB0aGlzIG51 bWJlciBvZiBub24tb3V0bGllciBmcmFtZXMgaW4gb3JkZXIgdG8gZW5kLgorICAgIG51bWJlck9m RnJhbWVzUmVxdWlyZWRJbkludGVydmFsOiA5LAogCiAgICAgcmFtcFdhcm11cExlbmd0aDogMjAw LAogCkBAIC0zNTUsMTAgKzM4OSwyNSBAQCBSYW1wQ29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVh dGVTdWJjbGFzcyhDb250cm9sbGVyLAogICAgICAgICBDb250cm9sbGVyLnByb3RvdHlwZS5zdGFy dC5jYWxsKHRoaXMsIHN0YXJ0VGltZXN0YW1wLCBzdGFnZSk7CiAgICAgICAgIHRoaXMuX3JhbXBT dGFydFRpbWVzdGFtcCA9IDA7CiAgICAgICAgIHRoaXMuaW50ZXJ2YWxTYW1wbGluZ0xlbmd0aCA9 IDEwMDsKKyAgICAgICAgdGhpcy5fZnJhbWVUaW1lSGlzdG9yeSA9IFtdOworICAgIH0sCisKKyAg ICByZWdpc3RlckZyYW1lVGltZTogZnVuY3Rpb24obGFzdEZyYW1lTGVuZ3RoKQorICAgIHsKKyAg ICAgICAgdGhpcy5fZnJhbWVUaW1lSGlzdG9yeS5wdXNoKGxhc3RGcmFtZUxlbmd0aCk7CisgICAg fSwKKworICAgIGludGVydmFsSGFzQ29uY2x1ZGVkOiBmdW5jdGlvbih0aW1lc3RhbXApCisgICAg eworICAgICAgICBpZiAoIUNvbnRyb2xsZXIucHJvdG90eXBlLmludGVydmFsSGFzQ29uY2x1ZGVk LmNhbGwodGhpcywgdGltZXN0YW1wKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAg ICAgICByZXR1cm4gdGhpcy5fZmluaXNoZWRUaWVyU2FtcGxpbmcgfHwgdGhpcy5maWx0ZXJPdXRP dXRsaWVycyh0aGlzLl9mcmFtZVRpbWVIaXN0b3J5KS5sZW5ndGggPiB0aGlzLm51bWJlck9mRnJh bWVzUmVxdWlyZWRJbkludGVydmFsOwogICAgIH0sCiAKICAgICBkaWRGaW5pc2hJbnRlcnZhbDog ZnVuY3Rpb24odGltZXN0YW1wLCBzdGFnZSwgaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpCiAg ICAgeworICAgICAgICB0aGlzLl9mcmFtZVRpbWVIaXN0b3J5ID0gW107CiAgICAgICAgIGlmICgh dGhpcy5fZmluaXNoZWRUaWVyU2FtcGxpbmcpIHsKICAgICAgICAgICAgIGlmICh0aGlzLl90aWVy U3RhcnRUaW1lc3RhbXAgPiAwICYmIHRpbWVzdGFtcCA8IHRoaXMuX3RpZXJTdGFydFRpbWVzdGFt cCArIHRoaXMudGllckZhc3RUZXN0TGVuZ3RoKQogICAgICAgICAgICAgICAgIHJldHVybjsKQEAg LTM3OCw5ICs0MjcsMTIgQEAgUmFtcENvbnRyb2xsZXIgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xh c3MoQ29udHJvbGxlciwKICAgICAgICAgICAgICAgICB0aGlzLl9sYXN0VGllckNvbXBsZXhpdHkg PSBjdXJyZW50Q29tcGxleGl0eTsKICAgICAgICAgICAgICAgICB0aGlzLl9sYXN0VGllckZyYW1l TGVuZ3RoID0gY3VycmVudEZyYW1lTGVuZ3RoOwogCi0gICAgICAgICAgICAgICAgdGhpcy5fdGll ciArPSAuNTsKKyAgICAgICAgICAgICAgICBpZiAoY3VycmVudENvbXBsZXhpdHkgPCA1MCkKKyAg ICAgICAgICAgICAgICAgICAgdGhpcy5fdGllciArPSAuNTsKKyAgICAgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX3RpZXIgKz0gLjI1OwogICAgICAgICAgICAgICAg IHRoaXMuX2VuZFRpbWVzdGFtcCA9IHRpbWVzdGFtcCArIHRoaXMuX3Rlc3RMZW5ndGg7Ci0gICAg ICAgICAgICAgICAgdmFyIG5leHRUaWVyQ29tcGxleGl0eSA9IE1hdGgucm91bmQoTWF0aC5wb3co MTAsIHRoaXMuX3RpZXIpKTsKKyAgICAgICAgICAgICAgICB2YXIgbmV4dFRpZXJDb21wbGV4aXR5 ID0gTWF0aC5tYXgoTWF0aC5yb3VuZChNYXRoLnBvdygxMCwgdGhpcy5fdGllcikpLCBjdXJyZW50 Q29tcGxleGl0eSArIDEpOwogICAgICAgICAgICAgICAgIHN0YWdlLnR1bmUobmV4dFRpZXJDb21w bGV4aXR5IC0gY3VycmVudENvbXBsZXhpdHkpOwogCiAgICAgICAgICAgICAgICAgLy8gU29tZSB0 ZXN0cyBtYXkgYmUgdW5hYmxlIHRvIGdvIGJleW9uZCBhIGNlcnRhaW4gY2FwYWNpdHkuIElmIHNv LCBkb24ndCBrZWVwIG1vdmluZyB1cCB0aWVycwo= 422756 2021-03-09 14:16:04 -0800 2021-03-09 14:17:07 -0800 Patch for committing bug-220847-20210309141603.patch text/plain 8420 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDYxCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZlZmQzYTRmMjBj MGZjOGE0ZmRmNjliMGExZjQ0MjYyNDhiZGIxMTIuLmE1NTA0ZDI4NGJmOTAyNDhmNGFkNGFmM2Zk MDI3OGU3ZDcwMWQzM2EgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDMt MDcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBN b3Rpb25NYXJrIHNjb3JlcyBhcmUgc3VwZXIgc2Vuc2l0aXZlIHRvIGEgc2luZ2xlIGxvbmcgZnJh bWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDg0 NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTI3NDM+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5LCAicmFtcCIgdGVzdHMgaGF2 ZSB0aHJlZSBwaGFzZXMuIFRoZSBtaWRkbGUgcGhhc2UgaXMgd2hlcmUgdGhleSB0cnkgdG8gZGV0 ZXJtaW5lIGEgbWF4aW11bSByZWFzb25hYmxlCisgICAgICAgIGNvbXBsZXhpdHksIGFuZCB0aGUg dGhpcmQgb25lIGlzIHdoZXJlIHRoZXkgdHJ5IHZhcmlvdXMgY29tcGxleGl0aWVzIGJldHdlZW4g MCBhbmQgdGhlIG1heGltdW0uIFRoZSBjYWxjdWxhdGlvbgorICAgICAgICBvZiB0aGlzIG1heGlt dW0gcmVhc29uYWJsZSBjb21wbGV4aXR5IGlzIGN1cnJlbnRseSB2ZXJ5IHNlbnNpdGl2ZSB0byBv dXRsaWVyIGZyYW1lIHRpbWVzLiBJZiB0aGVyZSBpcyBhIHNpbmdsZQorICAgICAgICBvdXRsaWVy IGZyYW1lIHRpbWUsIHRoZSBmYWlsdXJlIG1vZGUgaXMgdG8gYXNzdW1lIHRoYXQgdGhlIG1heGlt dW0gY29tcGxleGl0eSBpcyB+MTAuIFNvLCB0aGUgc29sdXRpb24gaXMgdG8KKyAgICAgICAgaWdu b3JlIG91dGxpZXIgZnJhbWUgdGltZXMgZHVyaW5nIHRoaXMgZmlyc3QgcGhhc2UsIGFuZCB0byBl bnN1cmUgdGhhdCB0aGVyZSBhcmUgYXQgbGVhc3QgOSBmcmFtZXMgbWVhc3VyZWQgdGhhdAorICAg ICAgICBoYXZlIG5vbi1vdXRsaWVyIHRpbWVzLgorCisgICAgICAgIFRoaXMgdGVzdCBhbHNvIGNo YW5nZXMgdGhlIHNwZWVkIG9mIHRoZSBtaWRkbGUgcGhhc2UuIFByZXZpb3VzbHksIGVhY2ggaW50 ZXJ2YWwgZHVyaW5nIHRoaXMgcGhhc2UgaGFkCisgICAgICAgIGEgY29tcGxleGl0eSB0aGF0IHdh cyAzLjE2eCBvZiB0aGUgcHJldmlvdXMgY29tcGxleGl0eS4gVGhpcyBwYXRjaCBjaGFuZ2VzIHRo YXQgdG8gMS43OHggb2YgdGhlIHByZXZpb3VzCisgICAgICAgIGNvbXBsZXhpdHkgZm9yIGNvbXBs ZXhpdGllcyBhYm92ZSA1MCwgYW5kIDEuMzN4IGZvciBjb21wbGV4aXRpZXMgYWJvdmUgMTAsMDAw LgorCisgICAgICAgICogTW90aW9uTWFyay90ZXN0cy9yZXNvdXJjZXMvbWFpbi5qczoKKyAgICAg ICAgKGZpbHRlck91dE91dGxpZXJzKToKKyAgICAgICAgKF9tZWFzdXJlQW5kUmVzZXRJbnRlcnZh bCk6CisgICAgICAgICh1cGRhdGUpOgorICAgICAgICAocmVnaXN0ZXJGcmFtZVRpbWUpOgorICAg ICAgICAoaW50ZXJ2YWxIYXNDb25jbHVkZWQpOgorICAgICAgICAoc3RhcnQpOgorICAgICAgICAo ZGlkRmluaXNoSW50ZXJ2YWwpOgorCiAyMDIxLTAyLTI2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBh cHBsZS5jb20+CiAKICAgICAgICAgW1BlcmZvcm1hbmNlIHRlc3RdW0xpbmUgbGF5b3V0XSBBZGQg dGVzdCB3aXRoIGlubGluZSBib3hlcwpkaWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rp b25NYXJrL3Rlc3RzL3Jlc291cmNlcy9tYWluLmpzIGIvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25N YXJrL3Rlc3RzL3Jlc291cmNlcy9tYWluLmpzCmluZGV4IDZmYzQ2YjRhZjBmMzE5OTBkZTI3NDBk YjFlYzliYmM0MGQ1YWVmMGUuLjMxMTA4YzI3ZjI3Y2VhZTFhNjFkNzZmYjdkNmM2ZWFmZTQ3Nzk4 MjkgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9yZXNvdXJj ZXMvbWFpbi5qcworKysgYi9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvdGVzdHMvcmVzb3Vy Y2VzL21haW4uanMKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE1LTIw MjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDE1 LTIwMjEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAog ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCkBAIC0xMTAsMTQgKzExMCwzMyBAQCBDb250cm9sbGVyID0gVXRpbGl0aWVz LmNyZWF0ZUNsYXNzKAogICAgICAgICByZXR1cm4gY29tbWVudCBpbiB0aGlzLl9tYXJrczsKICAg ICB9LAogCisgICAgZmlsdGVyT3V0T3V0bGllcnM6IGZ1bmN0aW9uKGFycmF5KQorICAgIHsKKyAg ICAgICAgaWYgKGFycmF5Lmxlbmd0aCA9PSAwKQorICAgICAgICAgICAgcmV0dXJuIFtdOworCisg ICAgICAgIGFycmF5LnNvcnQoKTsKKyAgICAgICAgdmFyIHExID0gYXJyYXlbTWF0aC5taW4oTWF0 aC5yb3VuZChhcnJheS5sZW5ndGggKiAxIC8gNCksIGFycmF5Lmxlbmd0aCAtIDEpXTsKKyAgICAg ICAgdmFyIHEzID0gYXJyYXlbTWF0aC5taW4oTWF0aC5yb3VuZChhcnJheS5sZW5ndGggKiAzIC8g NCksIGFycmF5Lmxlbmd0aCAtIDEpXTsKKyAgICAgICAgdmFyIGludGVycXVhcnRpbGVSYW5nZSA9 IHEzIC0gcTE7CisgICAgICAgIHZhciBtaW5pbXVtID0gcTEgLSBpbnRlcnF1YXJ0aWxlUmFuZ2Ug KiAxLjU7CisgICAgICAgIHZhciBtYXhpbXVtID0gcTMgKyBpbnRlcnF1YXJ0aWxlUmFuZ2UgKiAx LjU7CisgICAgICAgIHJldHVybiBhcnJheS5maWx0ZXIoeCA9PiB4ID49IG1pbmltdW0gJiYgeCA8 PSBtYXhpbXVtKTsKKyAgICB9LAorCiAgICAgX21lYXN1cmVBbmRSZXNldEludGVydmFsOiBmdW5j dGlvbihjdXJyZW50VGltZXN0YW1wKQogICAgIHsKICAgICAgICAgdmFyIHNhbXBsZUNvdW50ID0g dGhpcy5fc2FtcGxlci5zYW1wbGVDb3VudDsKICAgICAgICAgdmFyIGF2ZXJhZ2VGcmFtZUxlbmd0 aCA9IDA7CiAKICAgICAgICAgaWYgKHRoaXMuX2ludGVydmFsRW5kVGltZXN0YW1wKSB7Ci0gICAg ICAgICAgICB2YXIgaW50ZXJ2YWxTdGFydFRpbWVzdGFtcCA9IHRoaXMuX3NhbXBsZXIuc2FtcGxl c1swXVt0aGlzLl9pbnRlcnZhbFN0YXJ0SW5kZXhdOwotICAgICAgICAgICAgYXZlcmFnZUZyYW1l TGVuZ3RoID0gKGN1cnJlbnRUaW1lc3RhbXAgLSBpbnRlcnZhbFN0YXJ0VGltZXN0YW1wKSAvIChz YW1wbGVDb3VudCAtIHRoaXMuX2ludGVydmFsU3RhcnRJbmRleCk7CisgICAgICAgICAgICB2YXIg ZHVyYXRpb25zID0gW107CisgICAgICAgICAgICBmb3IgKHZhciBpID0gTWF0aC5tYXgodGhpcy5f aW50ZXJ2YWxTdGFydEluZGV4LCAxKTsgaSA8IHNhbXBsZUNvdW50OyArK2kpIHsKKyAgICAgICAg ICAgICAgICBkdXJhdGlvbnMucHVzaCh0aGlzLl9zYW1wbGVyLnNhbXBsZXNbMF1baV0gLSB0aGlz Ll9zYW1wbGVyLnNhbXBsZXNbMF1baSAtIDFdKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg IHZhciBmaWx0ZXJlZER1cmF0aW9ucyA9IHRoaXMuZmlsdGVyT3V0T3V0bGllcnMoZHVyYXRpb25z KTsKKyAgICAgICAgICAgIGlmIChmaWx0ZXJlZER1cmF0aW9ucy5sZW5ndGggPiAwKQorICAgICAg ICAgICAgICAgIGF2ZXJhZ2VGcmFtZUxlbmd0aCA9IGZpbHRlcmVkRHVyYXRpb25zLnJlZHVjZSgo YSwgYikgPT4gYSArIGIsIDApIC8gZmlsdGVyZWREdXJhdGlvbnMubGVuZ3RoOwogICAgICAgICB9 CiAKICAgICAgICAgdGhpcy5faW50ZXJ2YWxTdGFydEluZGV4ID0gc2FtcGxlQ291bnQ7CkBAIC0x MzgsMjEgKzE1NywzNCBAQCBDb250cm9sbGVyID0gVXRpbGl0aWVzLmNyZWF0ZUNsYXNzKAogICAg ICAgICAgICAgICAgIHRoaXMuX2ZyYW1lTGVuZ3RoRXN0aW1hdG9yLnNhbXBsZShsYXN0RnJhbWVM ZW5ndGgpOwogICAgICAgICAgICAgICAgIGZyYW1lTGVuZ3RoRXN0aW1hdGUgPSB0aGlzLl9mcmFt ZUxlbmd0aEVzdGltYXRvci5lc3RpbWF0ZTsKICAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNl IGlmICh0aW1lc3RhbXAgPj0gdGhpcy5faW50ZXJ2YWxFbmRUaW1lc3RhbXApIHsKLSAgICAgICAg ICAgIHZhciBpbnRlcnZhbFN0YXJ0VGltZXN0YW1wID0gdGhpcy5fc2FtcGxlci5zYW1wbGVzWzBd W3RoaXMuX2ludGVydmFsU3RhcnRJbmRleF07Ci0gICAgICAgICAgICBpbnRlcnZhbEF2ZXJhZ2VG cmFtZUxlbmd0aCA9IHRoaXMuX21lYXN1cmVBbmRSZXNldEludGVydmFsKHRpbWVzdGFtcCk7Ci0g ICAgICAgICAgICBpZiAodGhpcy5faXNGcmFtZUxlbmd0aEVzdGltYXRvckVuYWJsZWQpIHsKLSAg ICAgICAgICAgICAgICB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5zYW1wbGUoaW50ZXJ2YWxB dmVyYWdlRnJhbWVMZW5ndGgpOwotICAgICAgICAgICAgICAgIGZyYW1lTGVuZ3RoRXN0aW1hdGUg PSB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5lc3RpbWF0ZTsKKyAgICAgICAgfSBlbHNlIHsK KyAgICAgICAgICAgIHRoaXMucmVnaXN0ZXJGcmFtZVRpbWUobGFzdEZyYW1lTGVuZ3RoKTsKKyAg ICAgICAgICAgIGlmICh0aGlzLmludGVydmFsSGFzQ29uY2x1ZGVkKHRpbWVzdGFtcCkpIHsKKyAg ICAgICAgICAgICAgICB2YXIgaW50ZXJ2YWxTdGFydFRpbWVzdGFtcCA9IHRoaXMuX3NhbXBsZXIu c2FtcGxlc1swXVt0aGlzLl9pbnRlcnZhbFN0YXJ0SW5kZXhdOworICAgICAgICAgICAgICAgIGlu dGVydmFsQXZlcmFnZUZyYW1lTGVuZ3RoID0gdGhpcy5fbWVhc3VyZUFuZFJlc2V0SW50ZXJ2YWwo dGltZXN0YW1wKTsKKyAgICAgICAgICAgICAgICBpZiAodGhpcy5faXNGcmFtZUxlbmd0aEVzdGlt YXRvckVuYWJsZWQpIHsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fZnJhbWVMZW5ndGhFc3Rp bWF0b3Iuc2FtcGxlKGludGVydmFsQXZlcmFnZUZyYW1lTGVuZ3RoKTsKKyAgICAgICAgICAgICAg ICAgICAgZnJhbWVMZW5ndGhFc3RpbWF0ZSA9IHRoaXMuX2ZyYW1lTGVuZ3RoRXN0aW1hdG9yLmVz dGltYXRlOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBkaWRGaW5pc2hJbnRl cnZhbCA9IHRydWU7CisgICAgICAgICAgICAgICAgdGhpcy5kaWRGaW5pc2hJbnRlcnZhbCh0aW1l c3RhbXAsIHN0YWdlLCBpbnRlcnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCk7CisgICAgICAgICAgICAg ICAgdGhpcy5fZnJhbWVMZW5ndGhFc3RpbWF0b3IucmVzZXQoKTsKICAgICAgICAgICAgIH0KLSAg ICAgICAgICAgIGRpZEZpbmlzaEludGVydmFsID0gdHJ1ZTsKLSAgICAgICAgICAgIHRoaXMuZGlk RmluaXNoSW50ZXJ2YWwodGltZXN0YW1wLCBzdGFnZSwgaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5n dGgpOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fc2FtcGxlci5yZWNvcmQodGltZXN0YW1w LCBzdGFnZS5jb21wbGV4aXR5KCksIGZyYW1lTGVuZ3RoRXN0aW1hdGUpOwogICAgICAgICB0aGlz LnR1bmUodGltZXN0YW1wLCBzdGFnZSwgbGFzdEZyYW1lTGVuZ3RoLCBkaWRGaW5pc2hJbnRlcnZh bCwgaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpOwogICAgIH0sCiAKKyAgICByZWdpc3RlckZy YW1lVGltZTogZnVuY3Rpb24obGFzdEZyYW1lTGVuZ3RoKQorICAgIHsKKyAgICB9LAorCisgICAg aW50ZXJ2YWxIYXNDb25jbHVkZWQ6IGZ1bmN0aW9uKHRpbWVzdGFtcCkKKyAgICB7CisgICAgICAg IHJldHVybiB0aW1lc3RhbXAgPj0gdGhpcy5faW50ZXJ2YWxFbmRUaW1lc3RhbXA7CisgICAgfSwK KwogICAgIGRpZEZpbmlzaEludGVydmFsOiBmdW5jdGlvbih0aW1lc3RhbXAsIHN0YWdlLCBpbnRl cnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCkKICAgICB7CiAgICAgfSwKQEAgLTMzNiw2ICszNjgsOCBA QCBSYW1wQ29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhDb250cm9sbGVyLAog ICAgIHRpZXJGYXN0VGVzdExlbmd0aDogMjUwLAogICAgIC8vIElmIHRoZSBlbmdpbmUgaXMgdW5k ZXIgc3RyZXNzLCBsZXQgdGhlIHRlc3QgcnVuIGEgbGl0dGxlIGxvbmdlciB0byBsZXQgdGhlIG1l YXN1cmVtZW50IHNldHRsZQogICAgIHRpZXJTbG93VGVzdExlbmd0aDogNzUwLAorICAgIC8vIFRp ZXIgaW50ZXJ2YWxzIG11c3QgaGF2ZSB0aGlzIG51bWJlciBvZiBub24tb3V0bGllciBmcmFtZXMg aW4gb3JkZXIgdG8gZW5kLgorICAgIG51bWJlck9mRnJhbWVzUmVxdWlyZWRJbkludGVydmFsOiA5 LAogCiAgICAgcmFtcFdhcm11cExlbmd0aDogMjAwLAogCkBAIC0zNTUsMTAgKzM4OSwyNSBAQCBS YW1wQ29udHJvbGxlciA9IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhDb250cm9sbGVyLAogICAg ICAgICBDb250cm9sbGVyLnByb3RvdHlwZS5zdGFydC5jYWxsKHRoaXMsIHN0YXJ0VGltZXN0YW1w LCBzdGFnZSk7CiAgICAgICAgIHRoaXMuX3JhbXBTdGFydFRpbWVzdGFtcCA9IDA7CiAgICAgICAg IHRoaXMuaW50ZXJ2YWxTYW1wbGluZ0xlbmd0aCA9IDEwMDsKKyAgICAgICAgdGhpcy5fZnJhbWVU aW1lSGlzdG9yeSA9IFtdOworICAgIH0sCisKKyAgICByZWdpc3RlckZyYW1lVGltZTogZnVuY3Rp b24obGFzdEZyYW1lTGVuZ3RoKQorICAgIHsKKyAgICAgICAgdGhpcy5fZnJhbWVUaW1lSGlzdG9y eS5wdXNoKGxhc3RGcmFtZUxlbmd0aCk7CisgICAgfSwKKworICAgIGludGVydmFsSGFzQ29uY2x1 ZGVkOiBmdW5jdGlvbih0aW1lc3RhbXApCisgICAgeworICAgICAgICBpZiAoIUNvbnRyb2xsZXIu cHJvdG90eXBlLmludGVydmFsSGFzQ29uY2x1ZGVkLmNhbGwodGhpcywgdGltZXN0YW1wKSkKKyAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICByZXR1cm4gdGhpcy5fZmluaXNoZWRU aWVyU2FtcGxpbmcgfHwgdGhpcy5maWx0ZXJPdXRPdXRsaWVycyh0aGlzLl9mcmFtZVRpbWVIaXN0 b3J5KS5sZW5ndGggPiB0aGlzLm51bWJlck9mRnJhbWVzUmVxdWlyZWRJbkludGVydmFsOwogICAg IH0sCiAKICAgICBkaWRGaW5pc2hJbnRlcnZhbDogZnVuY3Rpb24odGltZXN0YW1wLCBzdGFnZSwg aW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpCiAgICAgeworICAgICAgICB0aGlzLl9mcmFtZVRp bWVIaXN0b3J5ID0gW107CiAgICAgICAgIGlmICghdGhpcy5fZmluaXNoZWRUaWVyU2FtcGxpbmcp IHsKICAgICAgICAgICAgIGlmICh0aGlzLl90aWVyU3RhcnRUaW1lc3RhbXAgPiAwICYmIHRpbWVz dGFtcCA8IHRoaXMuX3RpZXJTdGFydFRpbWVzdGFtcCArIHRoaXMudGllckZhc3RUZXN0TGVuZ3Ro KQogICAgICAgICAgICAgICAgIHJldHVybjsKQEAgLTM3OCw5ICs0MjcsMTQgQEAgUmFtcENvbnRy b2xsZXIgPSBVdGlsaXRpZXMuY3JlYXRlU3ViY2xhc3MoQ29udHJvbGxlciwKICAgICAgICAgICAg ICAgICB0aGlzLl9sYXN0VGllckNvbXBsZXhpdHkgPSBjdXJyZW50Q29tcGxleGl0eTsKICAgICAg ICAgICAgICAgICB0aGlzLl9sYXN0VGllckZyYW1lTGVuZ3RoID0gY3VycmVudEZyYW1lTGVuZ3Ro OwogCi0gICAgICAgICAgICAgICAgdGhpcy5fdGllciArPSAuNTsKKyAgICAgICAgICAgICAgICBp ZiAoY3VycmVudENvbXBsZXhpdHkgPD0gNTApCisgICAgICAgICAgICAgICAgICAgIHRoaXMuX3Rp ZXIgKz0gMS8yOworICAgICAgICAgICAgICAgIGVsc2UgaWYgKGN1cnJlbnRDb21wbGV4aXR5IDw9 IDEwMDAwKQorICAgICAgICAgICAgICAgICAgICB0aGlzLl90aWVyICs9IDEvNDsKKyAgICAgICAg ICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIHRoaXMuX3RpZXIgKz0gMS84OwogICAg ICAgICAgICAgICAgIHRoaXMuX2VuZFRpbWVzdGFtcCA9IHRpbWVzdGFtcCArIHRoaXMuX3Rlc3RM ZW5ndGg7Ci0gICAgICAgICAgICAgICAgdmFyIG5leHRUaWVyQ29tcGxleGl0eSA9IE1hdGgucm91 bmQoTWF0aC5wb3coMTAsIHRoaXMuX3RpZXIpKTsKKyAgICAgICAgICAgICAgICB2YXIgbmV4dFRp ZXJDb21wbGV4aXR5ID0gTWF0aC5tYXgoTWF0aC5yb3VuZChNYXRoLnBvdygxMCwgdGhpcy5fdGll cikpLCBjdXJyZW50Q29tcGxleGl0eSArIDEpOwogICAgICAgICAgICAgICAgIHN0YWdlLnR1bmUo bmV4dFRpZXJDb21wbGV4aXR5IC0gY3VycmVudENvbXBsZXhpdHkpOwogCiAgICAgICAgICAgICAg ICAgLy8gU29tZSB0ZXN0cyBtYXkgYmUgdW5hYmxlIHRvIGdvIGJleW9uZCBhIGNlcnRhaW4gY2Fw YWNpdHkuIElmIHNvLCBkb24ndCBrZWVwIG1vdmluZyB1cCB0aWVycwo= 422757 2021-03-09 14:16:57 -0800 2021-03-09 15:08:48 -0800 Patch for committing bug-220847-20210309141656.patch text/plain 8413 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDYxCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZlZmQzYTRmMjBj MGZjOGE0ZmRmNjliMGExZjQ0MjYyNDhiZGIxMTIuLjkyYzNiYTdkYzQ3YjJiYjk2YTFjODFkMTI1 ZDE0ZWYyYWMyMTFhZGUgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMjEtMDMt MDcgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBN b3Rpb25NYXJrIHNjb3JlcyBhcmUgc3VwZXIgc2Vuc2l0aXZlIHRvIGEgc2luZ2xlIGxvbmcgZnJh bWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDg0 NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQxNTI3NDM+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgSm9uIExlZS4KKworICAgICAgICBDdXJyZW50bHksICJyYW1wIiB0ZXN0cyBoYXZlIHRocmVl IHBoYXNlcy4gVGhlIG1pZGRsZSBwaGFzZSBpcyB3aGVyZSB0aGV5IHRyeSB0byBkZXRlcm1pbmUg YSBtYXhpbXVtIHJlYXNvbmFibGUKKyAgICAgICAgY29tcGxleGl0eSwgYW5kIHRoZSB0aGlyZCBv bmUgaXMgd2hlcmUgdGhleSB0cnkgdmFyaW91cyBjb21wbGV4aXRpZXMgYmV0d2VlbiAwIGFuZCB0 aGUgbWF4aW11bS4gVGhlIGNhbGN1bGF0aW9uCisgICAgICAgIG9mIHRoaXMgbWF4aW11bSByZWFz b25hYmxlIGNvbXBsZXhpdHkgaXMgY3VycmVudGx5IHZlcnkgc2Vuc2l0aXZlIHRvIG91dGxpZXIg ZnJhbWUgdGltZXMuIElmIHRoZXJlIGlzIGEgc2luZ2xlCisgICAgICAgIG91dGxpZXIgZnJhbWUg dGltZSwgdGhlIGZhaWx1cmUgbW9kZSBpcyB0byBhc3N1bWUgdGhhdCB0aGUgbWF4aW11bSBjb21w bGV4aXR5IGlzIH4xMC4gU28sIHRoZSBzb2x1dGlvbiBpcyB0bworICAgICAgICBpZ25vcmUgb3V0 bGllciBmcmFtZSB0aW1lcyBkdXJpbmcgdGhpcyBmaXJzdCBwaGFzZSwgYW5kIHRvIGVuc3VyZSB0 aGF0IHRoZXJlIGFyZSBhdCBsZWFzdCA5IGZyYW1lcyBtZWFzdXJlZCB0aGF0CisgICAgICAgIGhh dmUgbm9uLW91dGxpZXIgdGltZXMuCisKKyAgICAgICAgVGhpcyB0ZXN0IGFsc28gY2hhbmdlcyB0 aGUgc3BlZWQgb2YgdGhlIG1pZGRsZSBwaGFzZS4gUHJldmlvdXNseSwgZWFjaCBpbnRlcnZhbCBk dXJpbmcgdGhpcyBwaGFzZSBoYWQKKyAgICAgICAgYSBjb21wbGV4aXR5IHRoYXQgd2FzIDMuMTZ4 IG9mIHRoZSBwcmV2aW91cyBjb21wbGV4aXR5LiBUaGlzIHBhdGNoIGNoYW5nZXMgdGhhdCB0byAx Ljc4eCBvZiB0aGUgcHJldmlvdXMKKyAgICAgICAgY29tcGxleGl0eSBmb3IgY29tcGxleGl0aWVz IGFib3ZlIDUwLCBhbmQgMS4zM3ggZm9yIGNvbXBsZXhpdGllcyBhYm92ZSAxMCwwMDAuCisKKyAg ICAgICAgKiBNb3Rpb25NYXJrL3Rlc3RzL3Jlc291cmNlcy9tYWluLmpzOgorICAgICAgICAoZmls dGVyT3V0T3V0bGllcnMpOgorICAgICAgICAoX21lYXN1cmVBbmRSZXNldEludGVydmFsKToKKyAg ICAgICAgKHVwZGF0ZSk6CisgICAgICAgIChyZWdpc3RlckZyYW1lVGltZSk6CisgICAgICAgIChp bnRlcnZhbEhhc0NvbmNsdWRlZCk6CisgICAgICAgIChzdGFydCk6CisgICAgICAgIChkaWRGaW5p c2hJbnRlcnZhbCk6CisKIDIwMjEtMDItMjYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBbUGVyZm9ybWFuY2UgdGVzdF1bTGluZSBsYXlvdXRdIEFkZCB0ZXN0IHdp dGggaW5saW5lIGJveGVzCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsv dGVzdHMvcmVzb3VyY2VzL21haW4uanMgYi9QZXJmb3JtYW5jZVRlc3RzL01vdGlvbk1hcmsvdGVz dHMvcmVzb3VyY2VzL21haW4uanMKaW5kZXggNmZjNDZiNGFmMGYzMTk5MGRlMjc0MGRiMWVjOWJi YzQwZDVhZWYwZS4uMzExMDhjMjdmMjdjZWFlMWE2MWQ3NmZiN2Q2YzZlYWZlNDc3OTgyOSAxMDA2 NDQKLS0tIGEvUGVyZm9ybWFuY2VUZXN0cy9Nb3Rpb25NYXJrL3Rlc3RzL3Jlc291cmNlcy9tYWlu LmpzCisrKyBiL1BlcmZvcm1hbmNlVGVzdHMvTW90aW9uTWFyay90ZXN0cy9yZXNvdXJjZXMvbWFp bi5qcwpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAyMCBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTUtMjAyMSBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKQEAgLTExMCwxNCArMTEwLDMzIEBAIENvbnRyb2xsZXIgPSBVdGlsaXRpZXMuY3JlYXRl Q2xhc3MoCiAgICAgICAgIHJldHVybiBjb21tZW50IGluIHRoaXMuX21hcmtzOwogICAgIH0sCiAK KyAgICBmaWx0ZXJPdXRPdXRsaWVyczogZnVuY3Rpb24oYXJyYXkpCisgICAgeworICAgICAgICBp ZiAoYXJyYXkubGVuZ3RoID09IDApCisgICAgICAgICAgICByZXR1cm4gW107CisKKyAgICAgICAg YXJyYXkuc29ydCgpOworICAgICAgICB2YXIgcTEgPSBhcnJheVtNYXRoLm1pbihNYXRoLnJvdW5k KGFycmF5Lmxlbmd0aCAqIDEgLyA0KSwgYXJyYXkubGVuZ3RoIC0gMSldOworICAgICAgICB2YXIg cTMgPSBhcnJheVtNYXRoLm1pbihNYXRoLnJvdW5kKGFycmF5Lmxlbmd0aCAqIDMgLyA0KSwgYXJy YXkubGVuZ3RoIC0gMSldOworICAgICAgICB2YXIgaW50ZXJxdWFydGlsZVJhbmdlID0gcTMgLSBx MTsKKyAgICAgICAgdmFyIG1pbmltdW0gPSBxMSAtIGludGVycXVhcnRpbGVSYW5nZSAqIDEuNTsK KyAgICAgICAgdmFyIG1heGltdW0gPSBxMyArIGludGVycXVhcnRpbGVSYW5nZSAqIDEuNTsKKyAg ICAgICAgcmV0dXJuIGFycmF5LmZpbHRlcih4ID0+IHggPj0gbWluaW11bSAmJiB4IDw9IG1heGlt dW0pOworICAgIH0sCisKICAgICBfbWVhc3VyZUFuZFJlc2V0SW50ZXJ2YWw6IGZ1bmN0aW9uKGN1 cnJlbnRUaW1lc3RhbXApCiAgICAgewogICAgICAgICB2YXIgc2FtcGxlQ291bnQgPSB0aGlzLl9z YW1wbGVyLnNhbXBsZUNvdW50OwogICAgICAgICB2YXIgYXZlcmFnZUZyYW1lTGVuZ3RoID0gMDsK IAogICAgICAgICBpZiAodGhpcy5faW50ZXJ2YWxFbmRUaW1lc3RhbXApIHsKLSAgICAgICAgICAg IHZhciBpbnRlcnZhbFN0YXJ0VGltZXN0YW1wID0gdGhpcy5fc2FtcGxlci5zYW1wbGVzWzBdW3Ro aXMuX2ludGVydmFsU3RhcnRJbmRleF07Ci0gICAgICAgICAgICBhdmVyYWdlRnJhbWVMZW5ndGgg PSAoY3VycmVudFRpbWVzdGFtcCAtIGludGVydmFsU3RhcnRUaW1lc3RhbXApIC8gKHNhbXBsZUNv dW50IC0gdGhpcy5faW50ZXJ2YWxTdGFydEluZGV4KTsKKyAgICAgICAgICAgIHZhciBkdXJhdGlv bnMgPSBbXTsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSBNYXRoLm1heCh0aGlzLl9pbnRlcnZh bFN0YXJ0SW5kZXgsIDEpOyBpIDwgc2FtcGxlQ291bnQ7ICsraSkgeworICAgICAgICAgICAgICAg IGR1cmF0aW9ucy5wdXNoKHRoaXMuX3NhbXBsZXIuc2FtcGxlc1swXVtpXSAtIHRoaXMuX3NhbXBs ZXIuc2FtcGxlc1swXVtpIC0gMV0pOworICAgICAgICAgICAgfQorICAgICAgICAgICAgdmFyIGZp bHRlcmVkRHVyYXRpb25zID0gdGhpcy5maWx0ZXJPdXRPdXRsaWVycyhkdXJhdGlvbnMpOworICAg ICAgICAgICAgaWYgKGZpbHRlcmVkRHVyYXRpb25zLmxlbmd0aCA+IDApCisgICAgICAgICAgICAg ICAgYXZlcmFnZUZyYW1lTGVuZ3RoID0gZmlsdGVyZWREdXJhdGlvbnMucmVkdWNlKChhLCBiKSA9 PiBhICsgYiwgMCkgLyBmaWx0ZXJlZER1cmF0aW9ucy5sZW5ndGg7CiAgICAgICAgIH0KIAogICAg ICAgICB0aGlzLl9pbnRlcnZhbFN0YXJ0SW5kZXggPSBzYW1wbGVDb3VudDsKQEAgLTEzOCwyMSAr MTU3LDM0IEBAIENvbnRyb2xsZXIgPSBVdGlsaXRpZXMuY3JlYXRlQ2xhc3MoCiAgICAgICAgICAg ICAgICAgdGhpcy5fZnJhbWVMZW5ndGhFc3RpbWF0b3Iuc2FtcGxlKGxhc3RGcmFtZUxlbmd0aCk7 CiAgICAgICAgICAgICAgICAgZnJhbWVMZW5ndGhFc3RpbWF0ZSA9IHRoaXMuX2ZyYW1lTGVuZ3Ro RXN0aW1hdG9yLmVzdGltYXRlOwogICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UgaWYgKHRp bWVzdGFtcCA+PSB0aGlzLl9pbnRlcnZhbEVuZFRpbWVzdGFtcCkgewotICAgICAgICAgICAgdmFy IGludGVydmFsU3RhcnRUaW1lc3RhbXAgPSB0aGlzLl9zYW1wbGVyLnNhbXBsZXNbMF1bdGhpcy5f aW50ZXJ2YWxTdGFydEluZGV4XTsKLSAgICAgICAgICAgIGludGVydmFsQXZlcmFnZUZyYW1lTGVu Z3RoID0gdGhpcy5fbWVhc3VyZUFuZFJlc2V0SW50ZXJ2YWwodGltZXN0YW1wKTsKLSAgICAgICAg ICAgIGlmICh0aGlzLl9pc0ZyYW1lTGVuZ3RoRXN0aW1hdG9yRW5hYmxlZCkgewotICAgICAgICAg ICAgICAgIHRoaXMuX2ZyYW1lTGVuZ3RoRXN0aW1hdG9yLnNhbXBsZShpbnRlcnZhbEF2ZXJhZ2VG cmFtZUxlbmd0aCk7Ci0gICAgICAgICAgICAgICAgZnJhbWVMZW5ndGhFc3RpbWF0ZSA9IHRoaXMu X2ZyYW1lTGVuZ3RoRXN0aW1hdG9yLmVzdGltYXRlOworICAgICAgICB9IGVsc2UgeworICAgICAg ICAgICAgdGhpcy5yZWdpc3RlckZyYW1lVGltZShsYXN0RnJhbWVMZW5ndGgpOworICAgICAgICAg ICAgaWYgKHRoaXMuaW50ZXJ2YWxIYXNDb25jbHVkZWQodGltZXN0YW1wKSkgeworICAgICAgICAg ICAgICAgIHZhciBpbnRlcnZhbFN0YXJ0VGltZXN0YW1wID0gdGhpcy5fc2FtcGxlci5zYW1wbGVz WzBdW3RoaXMuX2ludGVydmFsU3RhcnRJbmRleF07CisgICAgICAgICAgICAgICAgaW50ZXJ2YWxB dmVyYWdlRnJhbWVMZW5ndGggPSB0aGlzLl9tZWFzdXJlQW5kUmVzZXRJbnRlcnZhbCh0aW1lc3Rh bXApOworICAgICAgICAgICAgICAgIGlmICh0aGlzLl9pc0ZyYW1lTGVuZ3RoRXN0aW1hdG9yRW5h YmxlZCkgeworICAgICAgICAgICAgICAgICAgICB0aGlzLl9mcmFtZUxlbmd0aEVzdGltYXRvci5z YW1wbGUoaW50ZXJ2YWxBdmVyYWdlRnJhbWVMZW5ndGgpOworICAgICAgICAgICAgICAgICAgICBm cmFtZUxlbmd0aEVzdGltYXRlID0gdGhpcy5fZnJhbWVMZW5ndGhFc3RpbWF0b3IuZXN0aW1hdGU7 CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGRpZEZpbmlzaEludGVydmFsID0g dHJ1ZTsKKyAgICAgICAgICAgICAgICB0aGlzLmRpZEZpbmlzaEludGVydmFsKHRpbWVzdGFtcCwg c3RhZ2UsIGludGVydmFsQXZlcmFnZUZyYW1lTGVuZ3RoKTsKKyAgICAgICAgICAgICAgICB0aGlz Ll9mcmFtZUxlbmd0aEVzdGltYXRvci5yZXNldCgpOwogICAgICAgICAgICAgfQotICAgICAgICAg ICAgZGlkRmluaXNoSW50ZXJ2YWwgPSB0cnVlOwotICAgICAgICAgICAgdGhpcy5kaWRGaW5pc2hJ bnRlcnZhbCh0aW1lc3RhbXAsIHN0YWdlLCBpbnRlcnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCk7CiAg ICAgICAgIH0KIAogICAgICAgICB0aGlzLl9zYW1wbGVyLnJlY29yZCh0aW1lc3RhbXAsIHN0YWdl LmNvbXBsZXhpdHkoKSwgZnJhbWVMZW5ndGhFc3RpbWF0ZSk7CiAgICAgICAgIHRoaXMudHVuZSh0 aW1lc3RhbXAsIHN0YWdlLCBsYXN0RnJhbWVMZW5ndGgsIGRpZEZpbmlzaEludGVydmFsLCBpbnRl cnZhbEF2ZXJhZ2VGcmFtZUxlbmd0aCk7CiAgICAgfSwKIAorICAgIHJlZ2lzdGVyRnJhbWVUaW1l OiBmdW5jdGlvbihsYXN0RnJhbWVMZW5ndGgpCisgICAgeworICAgIH0sCisKKyAgICBpbnRlcnZh bEhhc0NvbmNsdWRlZDogZnVuY3Rpb24odGltZXN0YW1wKQorICAgIHsKKyAgICAgICAgcmV0dXJu IHRpbWVzdGFtcCA+PSB0aGlzLl9pbnRlcnZhbEVuZFRpbWVzdGFtcDsKKyAgICB9LAorCiAgICAg ZGlkRmluaXNoSW50ZXJ2YWw6IGZ1bmN0aW9uKHRpbWVzdGFtcCwgc3RhZ2UsIGludGVydmFsQXZl cmFnZUZyYW1lTGVuZ3RoKQogICAgIHsKICAgICB9LApAQCAtMzM2LDYgKzM2OCw4IEBAIFJhbXBD b250cm9sbGVyID0gVXRpbGl0aWVzLmNyZWF0ZVN1YmNsYXNzKENvbnRyb2xsZXIsCiAgICAgdGll ckZhc3RUZXN0TGVuZ3RoOiAyNTAsCiAgICAgLy8gSWYgdGhlIGVuZ2luZSBpcyB1bmRlciBzdHJl c3MsIGxldCB0aGUgdGVzdCBydW4gYSBsaXR0bGUgbG9uZ2VyIHRvIGxldCB0aGUgbWVhc3VyZW1l bnQgc2V0dGxlCiAgICAgdGllclNsb3dUZXN0TGVuZ3RoOiA3NTAsCisgICAgLy8gVGllciBpbnRl cnZhbHMgbXVzdCBoYXZlIHRoaXMgbnVtYmVyIG9mIG5vbi1vdXRsaWVyIGZyYW1lcyBpbiBvcmRl ciB0byBlbmQuCisgICAgbnVtYmVyT2ZGcmFtZXNSZXF1aXJlZEluSW50ZXJ2YWw6IDksCiAKICAg ICByYW1wV2FybXVwTGVuZ3RoOiAyMDAsCiAKQEAgLTM1NSwxMCArMzg5LDI1IEBAIFJhbXBDb250 cm9sbGVyID0gVXRpbGl0aWVzLmNyZWF0ZVN1YmNsYXNzKENvbnRyb2xsZXIsCiAgICAgICAgIENv bnRyb2xsZXIucHJvdG90eXBlLnN0YXJ0LmNhbGwodGhpcywgc3RhcnRUaW1lc3RhbXAsIHN0YWdl KTsKICAgICAgICAgdGhpcy5fcmFtcFN0YXJ0VGltZXN0YW1wID0gMDsKICAgICAgICAgdGhpcy5p bnRlcnZhbFNhbXBsaW5nTGVuZ3RoID0gMTAwOworICAgICAgICB0aGlzLl9mcmFtZVRpbWVIaXN0 b3J5ID0gW107CisgICAgfSwKKworICAgIHJlZ2lzdGVyRnJhbWVUaW1lOiBmdW5jdGlvbihsYXN0 RnJhbWVMZW5ndGgpCisgICAgeworICAgICAgICB0aGlzLl9mcmFtZVRpbWVIaXN0b3J5LnB1c2go bGFzdEZyYW1lTGVuZ3RoKTsKKyAgICB9LAorCisgICAgaW50ZXJ2YWxIYXNDb25jbHVkZWQ6IGZ1 bmN0aW9uKHRpbWVzdGFtcCkKKyAgICB7CisgICAgICAgIGlmICghQ29udHJvbGxlci5wcm90b3R5 cGUuaW50ZXJ2YWxIYXNDb25jbHVkZWQuY2FsbCh0aGlzLCB0aW1lc3RhbXApKQorICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIHJldHVybiB0aGlzLl9maW5pc2hlZFRpZXJTYW1w bGluZyB8fCB0aGlzLmZpbHRlck91dE91dGxpZXJzKHRoaXMuX2ZyYW1lVGltZUhpc3RvcnkpLmxl bmd0aCA+IHRoaXMubnVtYmVyT2ZGcmFtZXNSZXF1aXJlZEluSW50ZXJ2YWw7CiAgICAgfSwKIAog ICAgIGRpZEZpbmlzaEludGVydmFsOiBmdW5jdGlvbih0aW1lc3RhbXAsIHN0YWdlLCBpbnRlcnZh bEF2ZXJhZ2VGcmFtZUxlbmd0aCkKICAgICB7CisgICAgICAgIHRoaXMuX2ZyYW1lVGltZUhpc3Rv cnkgPSBbXTsKICAgICAgICAgaWYgKCF0aGlzLl9maW5pc2hlZFRpZXJTYW1wbGluZykgewogICAg ICAgICAgICAgaWYgKHRoaXMuX3RpZXJTdGFydFRpbWVzdGFtcCA+IDAgJiYgdGltZXN0YW1wIDwg dGhpcy5fdGllclN0YXJ0VGltZXN0YW1wICsgdGhpcy50aWVyRmFzdFRlc3RMZW5ndGgpCiAgICAg ICAgICAgICAgICAgcmV0dXJuOwpAQCAtMzc4LDkgKzQyNywxNCBAQCBSYW1wQ29udHJvbGxlciA9 IFV0aWxpdGllcy5jcmVhdGVTdWJjbGFzcyhDb250cm9sbGVyLAogICAgICAgICAgICAgICAgIHRo aXMuX2xhc3RUaWVyQ29tcGxleGl0eSA9IGN1cnJlbnRDb21wbGV4aXR5OwogICAgICAgICAgICAg ICAgIHRoaXMuX2xhc3RUaWVyRnJhbWVMZW5ndGggPSBjdXJyZW50RnJhbWVMZW5ndGg7CiAKLSAg ICAgICAgICAgICAgICB0aGlzLl90aWVyICs9IC41OworICAgICAgICAgICAgICAgIGlmIChjdXJy ZW50Q29tcGxleGl0eSA8PSA1MCkKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fdGllciArPSAx LzI7CisgICAgICAgICAgICAgICAgZWxzZSBpZiAoY3VycmVudENvbXBsZXhpdHkgPD0gMTAwMDAp CisgICAgICAgICAgICAgICAgICAgIHRoaXMuX3RpZXIgKz0gMS80OworICAgICAgICAgICAgICAg IGVsc2UKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fdGllciArPSAxLzg7CiAgICAgICAgICAg ICAgICAgdGhpcy5fZW5kVGltZXN0YW1wID0gdGltZXN0YW1wICsgdGhpcy5fdGVzdExlbmd0aDsK LSAgICAgICAgICAgICAgICB2YXIgbmV4dFRpZXJDb21wbGV4aXR5ID0gTWF0aC5yb3VuZChNYXRo LnBvdygxMCwgdGhpcy5fdGllcikpOworICAgICAgICAgICAgICAgIHZhciBuZXh0VGllckNvbXBs ZXhpdHkgPSBNYXRoLm1heChNYXRoLnJvdW5kKE1hdGgucG93KDEwLCB0aGlzLl90aWVyKSksIGN1 cnJlbnRDb21wbGV4aXR5ICsgMSk7CiAgICAgICAgICAgICAgICAgc3RhZ2UudHVuZShuZXh0VGll ckNvbXBsZXhpdHkgLSBjdXJyZW50Q29tcGxleGl0eSk7CiAKICAgICAgICAgICAgICAgICAvLyBT b21lIHRlc3RzIG1heSBiZSB1bmFibGUgdG8gZ28gYmV5b25kIGEgY2VydGFpbiBjYXBhY2l0eS4g SWYgc28sIGRvbid0IGtlZXAgbW92aW5nIHVwIHRpZXJzCg==