199519 2019-07-05 09:16:50 -0700 [iOS] Local capture MediaStreamTrack does not render in portrait mode 2019-07-05 11:54:22 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson ews-watchlist webkit-bug-importer youennf oldest_to_newest 1550388 0 youennf 2019-07-05 09:16:50 -0700 [iOS] Local capture MediaStreamTrack does not render locally in portrait mode Rendering works fine in landscape mode. 1550389 1 youennf 2019-07-05 09:16:56 -0700 This might be a regression due to https://trac.webkit.org/changeset/246644 1550390 2 webkit-bug-importer 2019-07-05 09:18:49 -0700 <rdar://problem/52689720> 1550391 3 webkit-bug-importer 2019-07-05 09:18:50 -0700 <rdar://problem/52689721> 1550426 4 373511 youennf 2019-07-05 10:34:09 -0700 Created attachment 373511 Patch 1550427 5 ews-watchlist 2019-07-05 10:38:41 -0700 Attachment 373511 did not pass style-queue: ERROR: Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp:483: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1550429 6 373512 youennf 2019-07-05 10:39:52 -0700 Created attachment 373512 Patch 1550454 7 373512 commit-queue 2019-07-05 11:54:20 -0700 Comment on attachment 373512 Patch Clearing flags on attachment: 373512 Committed r247165: <https://trac.webkit.org/changeset/247165> 1550455 8 commit-queue 2019-07-05 11:54:22 -0700 All reviewed patches have been landed. Closing bug. 373511 2019-07-05 10:34:09 -0700 2019-07-05 10:39:51 -0700 Patch bug-199519-20190705103408.patch text/plain 16922 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjRjYjYyZmM1NGZlY2Ex NDcyZmQ2Y2JiNjUyYThiMGRjZjg3ZDBjNy4uYWRhOGIzMDNjYzFkYTRjODU2NTQ5YWE0NDAwZTQ5 YzFmZGM5ZjZlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA3LTA1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBMb2NhbCBjYXB0 dXJlIE1lZGlhU3RyZWFtVHJhY2sgZG9lcyBub3QgcmVuZGVyIGluIHBvcnRyYWl0IG1vZGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTUxOQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNTI2ODk3MjA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVhbHRpbWVWaWRlb1NvdXJjZSB3YXMgYmFkbHkgY29t cHV0aW5nIGl0cyBzaXplIGluIGNhc2Ugb2Ygcm90YXRpb24uCisgICAgICAgIFdoZW5ldmVyIGl0 cyB1bmRlcmx5aW5nIHNvdXJjZSBpcyBub3RpZnlpbmcgb2Ygc2V0dGluZ3MgY2hhbmdlLAorICAg ICAgICBjb21wdXRlIHRoZSBzaXplIGFuZCB0cmFuc3Bvc2UgaXQgb25seSBpbiBsZWZ0L3JpZ2h0 IGNhc2UuCisKKyAgICAgICAgVXBkYXRlIG1vY2sgdmlkZW8gc291cmNlIHRvIGNvdmVyIHRoYXQg Y2FzZS4KKyAgICAgICAgQ292ZXJlZCBieSB1cGRhdGVkIHRlc3QuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZVZpZGVvU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlYWx0aW1lVmlkZW9Tb3VyY2U6OnNvdXJjZVNldHRpbmdzQ2hhbmdlZCk6CisgICAgICAg ICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL01vY2tSZWFsdGltZVZpZGVvU291cmNlTWFjLmg6 CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL01vY2tSZWFsdGltZVZpZGVvU291 cmNlTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6TW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2VNYWM6 OnVwZGF0ZVNhbXBsZUJ1ZmZlcik6CisgICAgICAgICogcGxhdGZvcm0vbW9jay9Nb2NrUmVhbHRp bWVWaWRlb1NvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNb2NrUmVhbHRpbWVWaWRlb1Nv dXJjZTo6c2V0dGluZ3MpOgorICAgICAgICAoV2ViQ29yZTo6TW9ja1JlYWx0aW1lVmlkZW9Tb3Vy Y2U6Om9yaWVudGF0aW9uQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpNb2NrUmVhbHRpbWVW aWRlb1NvdXJjZTo6bW9uaXRvck9yaWVudGF0aW9uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tb2Nr L01vY2tSZWFsdGltZVZpZGVvU291cmNlLmg6CisKIDIwMTktMDctMDUgIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBmZXRjaCBxdWlyayBmb3Igd3d3LmJu ei5jby5uegpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v UmVhbHRpbWVWaWRlb1NvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9SZWFsdGltZVZpZGVvU291cmNlLmNwcAppbmRleCAxNDM3ZDJkMjFiMzQyNjFjNzY5ZGY1 MmUzNmE5NGIyNDk3N2U0MzhkLi5lYzkzNzA1NDc1MTZlNDdiMjUzNzE3ZDdjMmJkYTRjNjVkNjA5 M2NhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFs dGltZVZpZGVvU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9SZWFsdGltZVZpZGVvU291cmNlLmNwcApAQCAtOTIsMTIgKzkyLDEzIEBAIHZvaWQgUmVh bHRpbWVWaWRlb1NvdXJjZTo6c291cmNlTXV0ZWRDaGFuZ2VkKCkKIHZvaWQgUmVhbHRpbWVWaWRl b1NvdXJjZTo6c291cmNlU2V0dGluZ3NDaGFuZ2VkKCkKIHsKICAgICBhdXRvIHJvdGF0aW9uID0g bV9zb3VyY2UtPnNhbXBsZVJvdGF0aW9uKCk7Ci0gICAgaWYgKHJvdGF0aW9uID09IE1lZGlhU2Ft cGxlOjpWaWRlb1JvdGF0aW9uOjpMZWZ0IHx8IHJvdGF0aW9uID09IE1lZGlhU2FtcGxlOjpWaWRl b1JvdGF0aW9uOjpSaWdodCkgewotICAgICAgICBhdXRvIHNpemUgPSB0aGlzLT5zaXplKCk7Cisg ICAgYXV0byBzaXplID0gdGhpcy0+c2l6ZSgpOworICAgIGlmIChzaXplLmlzRW1wdHkoKSkKKyAg ICAgICAgc2l6ZSA9IG1fc291cmNlLT5zaXplKCk7CisgICAgaWYgKHJvdGF0aW9uID09IE1lZGlh U2FtcGxlOjpWaWRlb1JvdGF0aW9uOjpMZWZ0IHx8IHJvdGF0aW9uID09IE1lZGlhU2FtcGxlOjpW aWRlb1JvdGF0aW9uOjpSaWdodCkKICAgICAgICAgc2l6ZSA9IHNpemUudHJhbnNwb3NlZFNpemUo KTsKLSAgICAgICAgbV9jdXJyZW50U2V0dGluZ3Muc2V0V2lkdGgoc2l6ZS53aWR0aCgpKTsKLSAg ICAgICAgbV9jdXJyZW50U2V0dGluZ3Muc2V0SGVpZ2h0KHNpemUuaGVpZ2h0KCkpOwotICAgIH0K KyAgICBtX2N1cnJlbnRTZXR0aW5ncy5zZXRXaWR0aChzaXplLndpZHRoKCkpOworICAgIG1fY3Vy cmVudFNldHRpbmdzLnNldEhlaWdodChzaXplLmhlaWdodCgpKTsKIAogICAgIGZvckVhY2hPYnNl cnZlcihbJl0oYXV0byYgb2JzZXJ2ZXIpIHsKICAgICAgICAgb2JzZXJ2ZXIuc291cmNlU2V0dGlu Z3NDaGFuZ2VkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9tYWMvTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2VNYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL21hYy9Nb2NrUmVhbHRpbWVWaWRlb1NvdXJjZU1hYy5oCmluZGV4 IDUzOThiNDNhMWFiYjMxZWI3OTljMGQ2YjhiZmY3NjQ3ZTM2MDRlYmQuLjk1YThjZjBhZTUzMzgw ZWQ1NzczYTI3MmQ2YmRjNTQzNTQ4Yjk5NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL21hYy9Nb2NrUmVhbHRpbWVWaWRlb1NvdXJjZU1hYy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Nb2NrUmVhbHRpbWVWaWRl b1NvdXJjZU1hYy5oCkBAIC0zMyw3ICszMyw2IEBACiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkK IAogI2luY2x1ZGUgIk1vY2tSZWFsdGltZVZpZGVvU291cmNlLmgiCi0jaW5jbHVkZSAiT3JpZW50 YXRpb25Ob3RpZmllci5oIgogI2luY2x1ZGUgIlBpeGVsQnVmZmVyQ29uZm9ybWVyQ1YuaCIKIAog dHlwZWRlZiBzdHJ1Y3QgX19DVkJ1ZmZlciAqQ1ZCdWZmZXJSZWY7CkBAIC00NSw3ICs0NCw3IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgSW1hZ2VUcmFuc2ZlclNlc3Npb25WVDsKIAot Y2xhc3MgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2VNYWMgZmluYWwgOiBwdWJsaWMgTW9ja1JlYWx0 aW1lVmlkZW9Tb3VyY2UsIHByaXZhdGUgT3JpZW50YXRpb25Ob3RpZmllcjo6T2JzZXJ2ZXIgewor Y2xhc3MgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2VNYWMgZmluYWwgOiBwdWJsaWMgTW9ja1JlYWx0 aW1lVmlkZW9Tb3VyY2UgewogcHVibGljOgogICAgIHZpcnR1YWwgfk1vY2tSZWFsdGltZVZpZGVv U291cmNlTWFjKCkgPSBkZWZhdWx0OwogCkBAIC01NywxMSArNTYsNiBAQCBwcml2YXRlOgogICAg IHZvaWQgdXBkYXRlU2FtcGxlQnVmZmVyKCkgZmluYWw7CiAgICAgYm9vbCBjYW5SZXNpemVWaWRl b0ZyYW1lcygpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHRydWU7IH0KIAotICAgIHZvaWQgb3JpZW50 YXRpb25DaGFuZ2VkKGludCBvcmllbnRhdGlvbikgZmluYWw7Ci0gICAgdm9pZCBtb25pdG9yT3Jp ZW50YXRpb24oT3JpZW50YXRpb25Ob3RpZmllciYpIGZpbmFsOwotICAgIE1lZGlhU2FtcGxlOjpW aWRlb1JvdGF0aW9uIHNhbXBsZVJvdGF0aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9kZXZp Y2VPcmllbnRhdGlvbjsgfQotCi0gICAgTWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb24gbV9kZXZp Y2VPcmllbnRhdGlvbiB7IE1lZGlhU2FtcGxlOjpWaWRlb1JvdGF0aW9uOjpOb25lIH07CiAgICAg c3RkOjp1bmlxdWVfcHRyPEltYWdlVHJhbnNmZXJTZXNzaW9uVlQ+IG1faW1hZ2VUcmFuc2ZlclNl c3Npb247CiAgICAgSW50U2l6ZSBtX3ByZXNldFNpemU7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL01vY2tSZWFsdGltZVZpZGVvU291cmNl TWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL01vY2tSZWFs dGltZVZpZGVvU291cmNlTWFjLm1tCmluZGV4IDgzYzYzYjE3N2I2ZTgwZjA0NDhhYzFmMWFlMWJj ZTM0N2YzNzgzZjAuLjlkZGZmNDBjMWM1MjNiYTIxZTRkYzQ2ZGI2OTExZDgxMTUxM2M2MzUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Nb2NrUmVh bHRpbWVWaWRlb1NvdXJjZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9tYWMvTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2VNYWMubW0KQEAgLTg1LDQxICs4NSwx MyBAQCB2b2lkIE1vY2tSZWFsdGltZVZpZGVvU291cmNlTWFjOjp1cGRhdGVTYW1wbGVCdWZmZXIo KQogICAgICAgICBtX2ltYWdlVHJhbnNmZXJTZXNzaW9uID0gSW1hZ2VUcmFuc2ZlclNlc3Npb25W VDo6Y3JlYXRlKHByZWZlcmVkUGl4ZWxCdWZmZXJGb3JtYXQoKSk7CiAKICAgICBhdXRvIHNhbXBs ZVRpbWUgPSBNZWRpYVRpbWU6OmNyZWF0ZVdpdGhEb3VibGUoKGVsYXBzZWRUaW1lKCkgKyAxMDBf bXMpLnNlY29uZHMoKSk7Ci0gICAgYXV0byBzYW1wbGVCdWZmZXIgPSBtX2ltYWdlVHJhbnNmZXJT ZXNzaW9uLT5jcmVhdGVNZWRpYVNhbXBsZShpbWFnZUJ1ZmZlci0+Y29weUltYWdlKCktPm5hdGl2 ZUltYWdlKCkuZ2V0KCksIHNhbXBsZVRpbWUsIHNpemUoKSwgbV9kZXZpY2VPcmllbnRhdGlvbik7 CisgICAgYXV0byBzYW1wbGVCdWZmZXIgPSBtX2ltYWdlVHJhbnNmZXJTZXNzaW9uLT5jcmVhdGVN ZWRpYVNhbXBsZShpbWFnZUJ1ZmZlci0+Y29weUltYWdlKCktPm5hdGl2ZUltYWdlKCkuZ2V0KCks IHNhbXBsZVRpbWUsIHNpemUoKSwgc2FtcGxlUm90YXRpb24oKSk7CiAgICAgaWYgKCFzYW1wbGVC dWZmZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIC8vIFdlIHVzZSBtX2RldmljZU9yaWVudGF0 aW9uIHRvIGVtdWxhdGUgc2Vuc29yIG9yaWVudGF0aW9uCiAgICAgZGlzcGF0Y2hNZWRpYVNhbXBs ZVRvT2JzZXJ2ZXJzKCpzYW1wbGVCdWZmZXIpOwogfQogCi12b2lkIE1vY2tSZWFsdGltZVZpZGVv U291cmNlTWFjOjpvcmllbnRhdGlvbkNoYW5nZWQoaW50IG9yaWVudGF0aW9uKQotewotICAgIC8v IEZJWE1FOiBEbyBzb21ldGhpbmcgd2l0aCBtX2RldmljZU9yaWVudGF0aW9uLiBTZWUgYnVnIDE2 OTgyMi4KLSAgICBzd2l0Y2ggKG9yaWVudGF0aW9uKSB7Ci0gICAgY2FzZSAwOgotICAgICAgICBt X2RldmljZU9yaWVudGF0aW9uID0gTWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb246Ok5vbmU7Ci0g ICAgICAgIGJyZWFrOwotICAgIGNhc2UgOTA6Ci0gICAgICAgIG1fZGV2aWNlT3JpZW50YXRpb24g PSBNZWRpYVNhbXBsZTo6VmlkZW9Sb3RhdGlvbjo6UmlnaHQ7Ci0gICAgICAgIGJyZWFrOwotICAg IGNhc2UgLTkwOgotICAgICAgICBtX2RldmljZU9yaWVudGF0aW9uID0gTWVkaWFTYW1wbGU6OlZp ZGVvUm90YXRpb246OkxlZnQ7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgMTgwOgotICAgICAg ICBtX2RldmljZU9yaWVudGF0aW9uID0gTWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb246OlVwc2lk ZURvd247Ci0gICAgICAgIGJyZWFrOwotICAgIGRlZmF1bHQ6Ci0gICAgICAgIHJldHVybjsKLSAg ICB9Ci19Ci0KLXZvaWQgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2VNYWM6Om1vbml0b3JPcmllbnRh dGlvbihPcmllbnRhdGlvbk5vdGlmaWVyJiBub3RpZmllcikKLXsKLSAgICBub3RpZmllci5hZGRP YnNlcnZlcigqdGhpcyk7Ci0gICAgb3JpZW50YXRpb25DaGFuZ2VkKG5vdGlmaWVyLm9yaWVudGF0 aW9uKCkpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUo TUVESUFfU1RSRUFNKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9N b2NrUmVhbHRpbWVWaWRlb1NvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2Nr L01vY2tSZWFsdGltZVZpZGVvU291cmNlLmNwcAppbmRleCA0OWE0OGJlMGZhYTI5OWZhNGZhNjkz ZDc0MjM0OGIzMDQ0YzVlMzhmLi5kNzY4YjJmZTBhOWYzZmY3ODBhOTViNDIwN2Q0ZDE3Njc1ZDA1 NTQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tSZWFsdGlt ZVZpZGVvU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tS ZWFsdGltZVZpZGVvU291cmNlLmNwcApAQCAtMTU3LDcgKzE1NywxMSBAQCBjb25zdCBSZWFsdGlt ZU1lZGlhU291cmNlU2V0dGluZ3MmIE1vY2tSZWFsdGltZVZpZGVvU291cmNlOjpzZXR0aW5ncygp CiAgICAgICAgIHNldHRpbmdzLnNldExvZ2ljYWxTdXJmYWNlKGZhbHNlKTsKICAgICB9CiAgICAg c2V0dGluZ3Muc2V0RnJhbWVSYXRlKGZyYW1lUmF0ZSgpKTsKLSAgICBhdXRvJiBzaXplID0gdGhp cy0+c2l6ZSgpOworICAgIGF1dG8gc2l6ZSA9IHRoaXMtPnNpemUoKTsKKyAgICBpZiAobW9ja0Nh bWVyYSgpKSB7CisgICAgICAgIGlmIChtX2RldmljZU9yaWVudGF0aW9uID09IE1lZGlhU2FtcGxl OjpWaWRlb1JvdGF0aW9uOjpMZWZ0IHx8IG1fZGV2aWNlT3JpZW50YXRpb24gPT0gTWVkaWFTYW1w bGU6OlZpZGVvUm90YXRpb246OlJpZ2h0KQorICAgICAgICAgICAgc2l6ZSA9IHNpemUudHJhbnNw b3NlZFNpemUoKTsKKyAgICB9CiAgICAgc2V0dGluZ3Muc2V0V2lkdGgoc2l6ZS53aWR0aCgpKTsK ICAgICBzZXR0aW5ncy5zZXRIZWlnaHQoc2l6ZS5oZWlnaHQoKSk7CiAgICAgaWYgKGFzcGVjdFJh dGlvKCkpCkBAIC00NzIsNiArNDc2LDQxIEBAIGJvb2wgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6 Om1vY2tEaXNwbGF5VHlwZShDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlIHR5cGUpIGNvCiAgICAg cmV0dXJuIFdURjo6Z2V0PE1vY2tEaXNwbGF5UHJvcGVydGllcz4obV9kZXZpY2UucHJvcGVydGll cykudHlwZSA9PSB0eXBlOwogfQogCit2b2lkIE1vY2tSZWFsdGltZVZpZGVvU291cmNlOjpvcmll bnRhdGlvbkNoYW5nZWQoaW50IG9yaWVudGF0aW9uKQoreworICAgIGF1dG8gZGV2aWNlT3JpZW50 YXRpb24gPSBtX2RldmljZU9yaWVudGF0aW9uOworICAgIHN3aXRjaCAob3JpZW50YXRpb24pIHsK KyAgICAgICAgY2FzZSAwOgorICAgICAgICAgICAgbV9kZXZpY2VPcmllbnRhdGlvbiA9IE1lZGlh U2FtcGxlOjpWaWRlb1JvdGF0aW9uOjpOb25lOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAg IGNhc2UgOTA6CisgICAgICAgICAgICBtX2RldmljZU9yaWVudGF0aW9uID0gTWVkaWFTYW1wbGU6 OlZpZGVvUm90YXRpb246OlJpZ2h0OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2Ug LTkwOgorICAgICAgICAgICAgbV9kZXZpY2VPcmllbnRhdGlvbiA9IE1lZGlhU2FtcGxlOjpWaWRl b1JvdGF0aW9uOjpMZWZ0OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgMTgwOgor ICAgICAgICAgICAgbV9kZXZpY2VPcmllbnRhdGlvbiA9IE1lZGlhU2FtcGxlOjpWaWRlb1JvdGF0 aW9uOjpVcHNpZGVEb3duOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6Cisg ICAgICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGRldmljZU9yaWVudGF0aW9uID09 IG1fZGV2aWNlT3JpZW50YXRpb24pCisgICAgICAgIHJldHVybjsKKworICAgIG5vdGlmeVNldHRp bmdzRGlkQ2hhbmdlT2JzZXJ2ZXJzKHsgUmVhbHRpbWVNZWRpYVNvdXJjZVNldHRpbmdzOjpGbGFn OjpXaWR0aCwgUmVhbHRpbWVNZWRpYVNvdXJjZVNldHRpbmdzOjpGbGFnOjpIZWlnaHQgfSk7Cit9 CisKK3ZvaWQgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6Om1vbml0b3JPcmllbnRhdGlvbihPcmll bnRhdGlvbk5vdGlmaWVyJiBub3RpZmllcikKK3sKKyAgICBpZiAoIW1vY2tDYW1lcmEoKSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgbm90aWZpZXIuYWRkT2JzZXJ2ZXIoKnRoaXMpOworICAgIG9y aWVudGF0aW9uQ2hhbmdlZChub3RpZmllci5vcmllbnRhdGlvbigpKTsKK30KKwogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRU5BQkxFKE1FRElBX1NUUkVBTSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21vY2svTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2Uu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21vY2svTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2Uu aAppbmRleCBjYmUxYTAwNGFiN2YyZjQxNWE4NWMwNzVjYzVhNWZiNWFhNDg5MDk3Li5lNTk5MDc2 YjRmNzRjYzU0ODhjNGIzOWZiY2UwMTNhYjJmODAxM2M5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tb2NrL01vY2tSZWFsdGltZVZpZGVvU291cmNlLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbW9jay9Nb2NrUmVhbHRpbWVWaWRlb1NvdXJjZS5oCkBAIC0zNiw2 ICszNiw3IEBACiAjaW5jbHVkZSAiRm9udENhc2NhZGUuaCIKICNpbmNsdWRlICJJbWFnZUJ1ZmZl ci5oIgogI2luY2x1ZGUgIk1vY2tNZWRpYURldmljZS5oIgorI2luY2x1ZGUgIk9yaWVudGF0aW9u Tm90aWZpZXIuaCIKICNpbmNsdWRlICJSZWFsdGltZU1lZGlhU291cmNlRmFjdG9yeS5oIgogI2lu Y2x1ZGUgIlJlYWx0aW1lVmlkZW9DYXB0dXJlU291cmNlLmgiCiAjaW5jbHVkZSA8d3RmL1J1bkxv b3AuaD4KQEAgLTQ1LDcgKzQ2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgRmxvYXRS ZWN0OwogY2xhc3MgR3JhcGhpY3NDb250ZXh0OwogCi1jbGFzcyBNb2NrUmVhbHRpbWVWaWRlb1Nv dXJjZSA6IHB1YmxpYyBSZWFsdGltZVZpZGVvQ2FwdHVyZVNvdXJjZSB7CitjbGFzcyBNb2NrUmVh bHRpbWVWaWRlb1NvdXJjZSA6IHB1YmxpYyBSZWFsdGltZVZpZGVvQ2FwdHVyZVNvdXJjZSwgcHJp dmF0ZSBPcmllbnRhdGlvbk5vdGlmaWVyOjpPYnNlcnZlciB7CiBwdWJsaWM6CiAKICAgICBzdGF0 aWMgQ2FwdHVyZVNvdXJjZU9yRXJyb3IgY3JlYXRlKFN0cmluZyYmIGRldmljZUlELCBTdHJpbmcm JiBuYW1lLCBTdHJpbmcmJiBoYXNoU2FsdCwgY29uc3QgTWVkaWFDb25zdHJhaW50cyopOwpAQCAt NjAsNiArNjEsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICBTZWNvbmRzIGVsYXBzZWRUaW1lKCk7CiAg ICAgdm9pZCBzZXR0aW5nc0RpZENoYW5nZShPcHRpb25TZXQ8UmVhbHRpbWVNZWRpYVNvdXJjZVNl dHRpbmdzOjpGbGFnPikgb3ZlcnJpZGU7CisgICAgTWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb24g c2FtcGxlUm90YXRpb24oKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX2RldmljZU9yaWVudGF0aW9u OyB9CiAKIHByaXZhdGU6CiAgICAgY29uc3QgUmVhbHRpbWVNZWRpYVNvdXJjZUNhcGFiaWxpdGll cyYgY2FwYWJpbGl0aWVzKCkgZmluYWw7CkBAIC03Niw2ICs3OCwxMCBAQCBwcml2YXRlOgogCiAg ICAgdm9pZCBnZW5lcmF0ZVByZXNldHMoKSBmaW5hbDsKIAorICAgIC8vIE9yaWVudGF0aW9uTm90 aWZpZXI6Ok9ic2VydmVyCisgICAgdm9pZCBvcmllbnRhdGlvbkNoYW5nZWQoaW50IG9yaWVudGF0 aW9uKSBmaW5hbDsKKyAgICB2b2lkIG1vbml0b3JPcmllbnRhdGlvbihPcmllbnRhdGlvbk5vdGlm aWVyJikgZmluYWw7CisKICAgICB2b2lkIGRyYXdBbmltYXRpb24oR3JhcGhpY3NDb250ZXh0Jik7 CiAgICAgdm9pZCBkcmF3VGV4dChHcmFwaGljc0NvbnRleHQmKTsKICAgICB2b2lkIGRyYXdCb3hl cyhHcmFwaGljc0NvbnRleHQmKTsKQEAgLTgzLDcgKzg5LDcgQEAgcHJpdmF0ZToKICAgICB2b2lk IGdlbmVyYXRlRnJhbWUoKTsKICAgICB2b2lkIHN0YXJ0Q2FwdHVyZVRpbWVyKCk7CiAKLSAgICB2 b2lkIGRlbGF5U2FtcGxlcyhTZWNvbmRzKSBvdmVycmlkZTsKKyAgICB2b2lkIGRlbGF5U2FtcGxl cyhTZWNvbmRzKSBmaW5hbDsKIAogICAgIGJvb2wgbW9ja0NhbWVyYSgpIGNvbnN0IHsgcmV0dXJu IFdURjo6aG9sZHNfYWx0ZXJuYXRpdmU8TW9ja0NhbWVyYVByb3BlcnRpZXM+KG1fZGV2aWNlLnBy b3BlcnRpZXMpOyB9CiAgICAgYm9vbCBtb2NrRGlzcGxheSgpIGNvbnN0IHsgcmV0dXJuIFdURjo6 aG9sZHNfYWx0ZXJuYXRpdmU8TW9ja0Rpc3BsYXlQcm9wZXJ0aWVzPihtX2RldmljZS5wcm9wZXJ0 aWVzKTsgfQpAQCAtMTEyLDYgKzExOCw3IEBAIHByaXZhdGU6CiAgICAgQ29sb3IgbV9maWxsQ29s b3IgeyBDb2xvcjo6YmxhY2sgfTsKICAgICBNb2NrTWVkaWFEZXZpY2UgbV9kZXZpY2U7CiAgICAg UmVmUHRyPFZpZGVvUHJlc2V0PiBtX3ByZXNldDsKKyAgICBNZWRpYVNhbXBsZTo6VmlkZW9Sb3Rh dGlvbiBtX2RldmljZU9yaWVudGF0aW9uIHsgTWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb246Ok5v bmUgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxYjEzMDM5MDM5YzBi YzJlYjNiODJhYjU4ZjdkY2E4NjVlYmI3OTNjLi43OGQxOGY5OTk4ODQ2ZWQ0MWRlNjI4NDZiZWUw MmMxMjc5YzY5MGUyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDctMDUgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIExvY2FsIGNhcHR1cmUg TWVkaWFTdHJlYW1UcmFjayBkb2VzIG5vdCByZW5kZXIgaW4gcG9ydHJhaXQgbW9kZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5NTE5CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS81MjY4OTcyMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHdlYnJ0Yy92aWRlby1yb3RhdGlvbi1leHBlY3RlZC50eHQ6 CisgICAgICAgICogd2VicnRjL3ZpZGVvLXJvdGF0aW9uLmh0bWw6CisKIDIwMTktMDctMDIgIEFu ZHJlcyBHb256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAgIEVuaGFuY2Ug c3VwcG9ydCBvZiBhcmlhLWhhc3BvcHVwIHBlciBBUklBIDEuMSBzcGVjaWZpY2F0aW9uLgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXJvdGF0aW9uLWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1yb3RhdGlvbi1leHBlY3RlZC50eHQKaW5kZXggNzBk ZDRmY2JkYWE5ZDlhZjM4NWQ5YjAyNGQ1ZDQyMjE5NjMwYTUwOC4uNGVlM2ZmYTBkY2RmMDRkNzk1 ZDFhYzg4YzQ3YTk2MTk3OTg5NzE2ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvd2VicnRjL3Zp ZGVvLXJvdGF0aW9uLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8t cm90YXRpb24tZXhwZWN0ZWQudHh0CkBAIC0xLDcgKzEsOCBAQAotICAKKyAgICAKIAogUEFTUyBT ZXR0aW5nIHZpZGVvIGV4Y2hhbmdlIAogUEFTUyBUcmFjayBpcyBlbmFibGVkLCB2aWRlbyBzaG91 bGQgbm90IGJlIGJsYWNrIAotUEFTUyBUcmFjayBpcyBlbmFibGVkIGFuZCByb3RhdGVkLCB2aWRl byBzaG91bGQgbm90IGJlIGJsYWNrIGFuZCBzaG91bGQgY2hhbmdlIHNpemUgCitQQVNTIFRyYWNr IGlzIGVuYWJsZWQgYW5kIHJvdGF0ZWQsIGxvY2FsIHZpZGVvIHNob3VsZCBub3QgYmUgYmxhY2sg YW5kIHNob3VsZCBjaGFuZ2Ugc2l6ZSAKK1BBU1MgVHJhY2sgaXMgZW5hYmxlZCBhbmQgcm90YXRl ZCwgcmVtb3RlIHZpZGVvIHNob3VsZCBub3QgYmUgYmxhY2sgYW5kIHNob3VsZCBjaGFuZ2Ugc2l6 ZSAKIFBBU1MgVHJhY2sgaXMgZW5hYmxlZCBhbmQgcm90YXRlZCBhZ2FpbiwgdmlkZW8gc2hvdWxk IG5vdCBiZSBibGFjayBhbmQgc2hvdWxkIGNoYW5nZSBzaXplIAogCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy93ZWJydGMvdmlkZW8tcm90YXRpb24uaHRtbCBiL0xheW91dFRlc3RzL3dlYnJ0Yy92 aWRlby1yb3RhdGlvbi5odG1sCmluZGV4IGE4NzY5OGRjMWQ3ZWNmMjM4YWFjYWQwOWZhZDk3ZmMw NWE1ODQwMDAuLjU4NDA1NmM5MzI1NjVjN2I3ZGMzOGRkNjViMzYzNGRhY2FlMmUzOGQgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1yb3RhdGlvbi5odG1sCisrKyBiL0xheW91 dFRlc3RzL3dlYnJ0Yy92aWRlby1yb3RhdGlvbi5odG1sCkBAIC03LDE1ICs3LDE3IEBACiAgICAg ICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2Ny aXB0PgogICAgIDwvaGVhZD4KICAgICA8Ym9keT4KLSAgICAgICAgPHZpZGVvIGlkPSJ2aWRlbyIg YXV0b3BsYXkgcGxheXNJbmxpbmUgd2lkdGg9IjMyMCIgaGVpZ2h0PSIyNDAiPjwvdmlkZW8+Cisg ICAgICAgIDx2aWRlbyBpZD0ibG9jYWxWaWRlbyIgYXV0b3BsYXkgcGxheXNJbmxpbmUgd2lkdGg9 IjMyMCIgaGVpZ2h0PSIyNDAiPjwvdmlkZW8+CisgICAgICAgIDx2aWRlbyBpZD0icmVtb3RlVmlk ZW8iIGF1dG9wbGF5IHBsYXlzSW5saW5lIHdpZHRoPSIzMjAiIGhlaWdodD0iMjQwIj48L3ZpZGVv PgorICAgICAgICA8Y2FudmFzIGlkPSJjYW52YXMwIiB3aWR0aD0iMzIwIiBoZWlnaHQ9IjI0MCI+ PC9jYW52YXM+CiAgICAgICAgIDxjYW52YXMgaWQ9ImNhbnZhczEiIHdpZHRoPSIzMjAiIGhlaWdo dD0iMjQwIj48L2NhbnZhcz4KICAgICAgICAgPGNhbnZhcyBpZD0iY2FudmFzMiIgd2lkdGg9IjMy MCIgaGVpZ2h0PSIyNDAiPjwvY2FudmFzPgogICAgICAgICA8Y2FudmFzIGlkPSJjYW52YXMzIiB3 aWR0aD0iMzIwIiBoZWlnaHQ9IjI0MCI+PC9jYW52YXM+CiAgICAgICAgIDxzY3JpcHQgc3JjID0i cm91dGluZXMuanMiPjwvc2NyaXB0PgogICAgICAgICA8c2NyaXB0PgotZnVuY3Rpb24gaXNWaWRl b0JsYWNrKGlkKQorZnVuY3Rpb24gaXNWaWRlb0JsYWNrKHZpZGVvLCBjYW52YXNJZCkKIHsKLSAg ICB2YXIgY2FudmFzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoaWQpOworICAgIHZhciBjYW52 YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZChjYW52YXNJZCk7CiAgICAgY2FudmFzLndpZHRo ID0gdmlkZW8udmlkZW9XaWR0aDsKICAgICBjYW52YXMuaGVpZ2h0ID0gdmlkZW8udmlkZW9IZWln aHQ7CiAgICAgY2FudmFzLmdldENvbnRleHQoJzJkJykuZHJhd0ltYWdlKHZpZGVvLCAwLCAwLCBj YW52YXMud2lkdGgsIGNhbnZhcy5oZWlnaHQpOwpAQCAtMzAsMjEgKzMyLDIxIEBAIGZ1bmN0aW9u IGlzVmlkZW9CbGFjayhpZCkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotZnVuY3Rpb24gcG9sbFZp ZGVvQmxhY2tDaGVjayhleHBlY3RlZCwgaWQsIHJlc29sdmUpCitmdW5jdGlvbiBwb2xsVmlkZW9C bGFja0NoZWNrKGV4cGVjdGVkLCB2aWRlbywgY2FudmFzSWQsIHJlc29sdmUpCiB7Ci0gICAgaWYg KGlzVmlkZW9CbGFjayhpZCkgPT09IGV4cGVjdGVkKSB7CisgICAgaWYgKGlzVmlkZW9CbGFjayh2 aWRlbywgY2FudmFzSWQpID09PSBleHBlY3RlZCkgewogICAgICAgICByZXNvbHZlKCk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBzZXRUaW1lb3V0KCgpID0+IHBvbGxWaWRlb0JsYWNr Q2hlY2soZXhwZWN0ZWQsIGlkLCByZXNvbHZlKSwgMTAwKTsKKyAgICBzZXRUaW1lb3V0KCgpID0+ IHBvbGxWaWRlb0JsYWNrQ2hlY2soZXhwZWN0ZWQsIHZpZGVvLCBjYW52YXNJZCwgcmVzb2x2ZSks IDEwMCk7CiB9CiAKLWZ1bmN0aW9uIGNoZWNrVmlkZW9CbGFjayhleHBlY3RlZCwgaWQpCitmdW5j dGlvbiBjaGVja1ZpZGVvQmxhY2soZXhwZWN0ZWQsIHZpZGVvLCBjYW52YXNJZCkKIHsKICAgICBy ZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUsIHJlamVjdCkgPT4gewotICAgICAgICBwb2xsVmlk ZW9CbGFja0NoZWNrKGV4cGVjdGVkLCBpZCwgcmVzb2x2ZSk7Ci0gICAgICAgIHNldFRpbWVvdXQo KCkgPT4gcmVqZWN0KCJjaGVja1ZpZGVvQmxhY2sgdGltZWQgb3V0IGZvciAnIiArIGlkICsgIics IGV4cGVjdGVkICIgKyBleHBlY3RlZCksIDUwMDApOworICAgICAgICBwb2xsVmlkZW9CbGFja0No ZWNrKGV4cGVjdGVkLCB2aWRlbywgY2FudmFzSWQsIHJlc29sdmUpOworICAgICAgICBzZXRUaW1l b3V0KCgpID0+IHJlamVjdCgiY2hlY2tWaWRlb0JsYWNrIHRpbWVkIG91dCBmb3IgJyIgKyBjYW52 YXNJZCArICInLCBleHBlY3RlZCAiICsgZXhwZWN0ZWQpLCA1MDAwKTsKICAgICB9KTsKIH0KIApA QCAtNTQsNiArNTYsNyBAQCBwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKICAgICAgICAgdGVzdFJ1 bm5lci5zZXRVc2VyTWVkaWFQZXJtaXNzaW9uKHRydWUpOwogCiAgICAgcmV0dXJuIG5hdmlnYXRv ci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHt2aWRlbzoge3dpZHRoOiAzMjAsIGhlaWdodDog MjQwLCBmYWNpbmdNb2RlOiAiZW52aXJvbm1lbnQifX0pLnRoZW4oKGxvY2FsU3RyZWFtKSA9PiB7 CisgICAgICAgIGxvY2FsVmlkZW8uc3JjT2JqZWN0ID0gbG9jYWxTdHJlYW07CiAgICAgICAgIHJl dHVybiBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CiAgICAgICAgICAgICB0cmFj ayA9IGxvY2FsU3RyZWFtLmdldFZpZGVvVHJhY2tzKClbMF07CiAKQEAgLTY5LDMwICs3Miw0MiBA QCBwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKICAgICAgICAgICAgIHNldFRpbWVvdXQoKCkgPT4g cmVqZWN0KCJUZXN0IHRpbWVkIG91dCIpLCA1MDAwKTsKICAgICAgICAgfSk7CiAgICAgfSkudGhl bigocmVtb3RlU3RyZWFtKSA9PiB7Ci0gICAgICAgIHZpZGVvLnNyY09iamVjdCA9IHJlbW90ZVN0 cmVhbTsKLSAgICAgICAgcmV0dXJuIHZpZGVvLnBsYXkoKTsKKyAgICAgICAgcmVtb3RlVmlkZW8u c3JjT2JqZWN0ID0gcmVtb3RlU3RyZWFtOworICAgICAgICByZXR1cm4gcmVtb3RlVmlkZW8ucGxh eSgpOwogICAgIH0pOwogfSwgIlNldHRpbmcgdmlkZW8gZXhjaGFuZ2UiKTsKIAotcHJvbWlzZV90 ZXN0KCh0ZXN0KSA9PiB7Ci0gICByZXR1cm4gY2hlY2tWaWRlb0JsYWNrKGZhbHNlLCAiY2FudmFz MSIpOworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICBhd2FpdCBjaGVja1ZpZGVv QmxhY2soZmFsc2UsIHJlbW90ZVZpZGVvLCAiY2FudmFzMCIpOworICAgYXdhaXQgd2FpdEZvclZp ZGVvU2l6ZShyZW1vdGVWaWRlbywgMzIwLCAyNDApOwogfSwgIlRyYWNrIGlzIGVuYWJsZWQsIHZp ZGVvIHNob3VsZCBub3QgYmUgYmxhY2siKTsKIAorcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9 PiB7CisgICAgYXdhaXQgY2hlY2tWaWRlb0JsYWNrKGZhbHNlLCBsb2NhbFZpZGVvLCAiY2FudmFz MCIpOworICAgIGF3YWl0IHdhaXRGb3JWaWRlb1NpemUobG9jYWxWaWRlbywgMzIwLCAyNDApOwor CisgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAgIHdpbmRvdy5pbnRlcm5hbHMuc2V0 Q2FtZXJhTWVkaWFTdHJlYW1UcmFja09yaWVudGF0aW9uKHRyYWNrLCA5MCk7CisKKyAgICBhd2Fp dCBjaGVja1ZpZGVvQmxhY2soZmFsc2UsIGxvY2FsVmlkZW8sICJjYW52YXMxIik7CisgICAgYXdh aXQgd2FpdEZvclZpZGVvU2l6ZShsb2NhbFZpZGVvLCAyNDAsIDMyMCk7Cit9LCAiVHJhY2sgaXMg ZW5hYmxlZCBhbmQgcm90YXRlZCwgbG9jYWwgdmlkZW8gc2hvdWxkIG5vdCBiZSBibGFjayBhbmQg c2hvdWxkIGNoYW5nZSBzaXplIik7CisKIHByb21pc2VfdGVzdCgodGVzdCkgPT4gewogICAgIGlm ICh3aW5kb3cuaW50ZXJuYWxzKQogICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldENhbWVyYU1l ZGlhU3RyZWFtVHJhY2tPcmllbnRhdGlvbih0cmFjaywgOTApOwogCi0gICAgcmV0dXJuIGNoZWNr VmlkZW9CbGFjayhmYWxzZSwgImNhbnZhczEiKS50aGVuKCgpID0+IHsKLSAgICAgICAgcmV0dXJu IHdhaXRGb3JWaWRlb1NpemUodmlkZW8sIDI0MCwgMzIwKTsKKyAgICByZXR1cm4gY2hlY2tWaWRl b0JsYWNrKGZhbHNlLCByZW1vdGVWaWRlbywgImNhbnZhczIiKS50aGVuKCgpID0+IHsKKyAgICAg ICAgcmV0dXJuIHdhaXRGb3JWaWRlb1NpemUocmVtb3RlVmlkZW8sIDI0MCwgMzIwKTsKICAgICB9 KTsKLX0sICJUcmFjayBpcyBlbmFibGVkIGFuZCByb3RhdGVkLCB2aWRlbyBzaG91bGQgbm90IGJl IGJsYWNrIGFuZCBzaG91bGQgY2hhbmdlIHNpemUiKTsKK30sICJUcmFjayBpcyBlbmFibGVkIGFu ZCByb3RhdGVkLCByZW1vdGUgdmlkZW8gc2hvdWxkIG5vdCBiZSBibGFjayBhbmQgc2hvdWxkIGNo YW5nZSBzaXplIik7CiAKIHByb21pc2VfdGVzdCgodGVzdCkgPT4gewogICAgIGlmICh3aW5kb3cu aW50ZXJuYWxzKQogICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldENhbWVyYU1lZGlhU3RyZWFt VHJhY2tPcmllbnRhdGlvbih0cmFjaywgMTgwKTsKIAotICAgIHJldHVybiBjaGVja1ZpZGVvQmxh Y2soZmFsc2UsICJjYW52YXMxIikudGhlbigoKSA9PiB7Ci0gICAgICAgIHJldHVybiB3YWl0Rm9y VmlkZW9TaXplKHZpZGVvLCAzMjAsIDI0MCk7CisgICAgcmV0dXJuIGNoZWNrVmlkZW9CbGFjayhm YWxzZSwgcmVtb3RlVmlkZW8sICJjYW52YXMzIikudGhlbigoKSA9PiB7CisgICAgICAgIHJldHVy biB3YWl0Rm9yVmlkZW9TaXplKHJlbW90ZVZpZGVvLCAzMjAsIDI0MCk7CiAgICAgfSk7CiB9LCAi VHJhY2sgaXMgZW5hYmxlZCBhbmQgcm90YXRlZCBhZ2FpbiwgdmlkZW8gc2hvdWxkIG5vdCBiZSBi bGFjayBhbmQgc2hvdWxkIGNoYW5nZSBzaXplIik7CiAgICAgICAgIDwvc2NyaXB0Pgo= 373512 2019-07-05 10:39:52 -0700 2019-07-05 11:54:20 -0700 Patch bug-199519-20190705103951.patch text/plain 16866 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MDczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjRjYjYyZmM1NGZlY2Ex NDcyZmQ2Y2JiNjUyYThiMGRjZjg3ZDBjNy4uYWRhOGIzMDNjYzFkYTRjODU2NTQ5YWE0NDAwZTQ5 YzFmZGM5ZjZlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA3LTA1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBMb2NhbCBjYXB0 dXJlIE1lZGlhU3RyZWFtVHJhY2sgZG9lcyBub3QgcmVuZGVyIGluIHBvcnRyYWl0IG1vZGUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTUxOQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNTI2ODk3MjA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVhbHRpbWVWaWRlb1NvdXJjZSB3YXMgYmFkbHkgY29t cHV0aW5nIGl0cyBzaXplIGluIGNhc2Ugb2Ygcm90YXRpb24uCisgICAgICAgIFdoZW5ldmVyIGl0 cyB1bmRlcmx5aW5nIHNvdXJjZSBpcyBub3RpZnlpbmcgb2Ygc2V0dGluZ3MgY2hhbmdlLAorICAg ICAgICBjb21wdXRlIHRoZSBzaXplIGFuZCB0cmFuc3Bvc2UgaXQgb25seSBpbiBsZWZ0L3JpZ2h0 IGNhc2UuCisKKyAgICAgICAgVXBkYXRlIG1vY2sgdmlkZW8gc291cmNlIHRvIGNvdmVyIHRoYXQg Y2FzZS4KKyAgICAgICAgQ292ZXJlZCBieSB1cGRhdGVkIHRlc3QuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZVZpZGVvU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlYWx0aW1lVmlkZW9Tb3VyY2U6OnNvdXJjZVNldHRpbmdzQ2hhbmdlZCk6CisgICAgICAg ICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL01vY2tSZWFsdGltZVZpZGVvU291cmNlTWFjLmg6 CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL01vY2tSZWFsdGltZVZpZGVvU291 cmNlTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6TW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2VNYWM6 OnVwZGF0ZVNhbXBsZUJ1ZmZlcik6CisgICAgICAgICogcGxhdGZvcm0vbW9jay9Nb2NrUmVhbHRp bWVWaWRlb1NvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNb2NrUmVhbHRpbWVWaWRlb1Nv dXJjZTo6c2V0dGluZ3MpOgorICAgICAgICAoV2ViQ29yZTo6TW9ja1JlYWx0aW1lVmlkZW9Tb3Vy Y2U6Om9yaWVudGF0aW9uQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpNb2NrUmVhbHRpbWVW aWRlb1NvdXJjZTo6bW9uaXRvck9yaWVudGF0aW9uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tb2Nr L01vY2tSZWFsdGltZVZpZGVvU291cmNlLmg6CisKIDIwMTktMDctMDUgIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBmZXRjaCBxdWlyayBmb3Igd3d3LmJu ei5jby5uegpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v UmVhbHRpbWVWaWRlb1NvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9SZWFsdGltZVZpZGVvU291cmNlLmNwcAppbmRleCAxNDM3ZDJkMjFiMzQyNjFjNzY5ZGY1 MmUzNmE5NGIyNDk3N2U0MzhkLi5lYzkzNzA1NDc1MTZlNDdiMjUzNzE3ZDdjMmJkYTRjNjVkNjA5 M2NhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFs dGltZVZpZGVvU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9SZWFsdGltZVZpZGVvU291cmNlLmNwcApAQCAtOTIsMTIgKzkyLDEzIEBAIHZvaWQgUmVh bHRpbWVWaWRlb1NvdXJjZTo6c291cmNlTXV0ZWRDaGFuZ2VkKCkKIHZvaWQgUmVhbHRpbWVWaWRl b1NvdXJjZTo6c291cmNlU2V0dGluZ3NDaGFuZ2VkKCkKIHsKICAgICBhdXRvIHJvdGF0aW9uID0g bV9zb3VyY2UtPnNhbXBsZVJvdGF0aW9uKCk7Ci0gICAgaWYgKHJvdGF0aW9uID09IE1lZGlhU2Ft cGxlOjpWaWRlb1JvdGF0aW9uOjpMZWZ0IHx8IHJvdGF0aW9uID09IE1lZGlhU2FtcGxlOjpWaWRl b1JvdGF0aW9uOjpSaWdodCkgewotICAgICAgICBhdXRvIHNpemUgPSB0aGlzLT5zaXplKCk7Cisg ICAgYXV0byBzaXplID0gdGhpcy0+c2l6ZSgpOworICAgIGlmIChzaXplLmlzRW1wdHkoKSkKKyAg ICAgICAgc2l6ZSA9IG1fc291cmNlLT5zaXplKCk7CisgICAgaWYgKHJvdGF0aW9uID09IE1lZGlh U2FtcGxlOjpWaWRlb1JvdGF0aW9uOjpMZWZ0IHx8IHJvdGF0aW9uID09IE1lZGlhU2FtcGxlOjpW aWRlb1JvdGF0aW9uOjpSaWdodCkKICAgICAgICAgc2l6ZSA9IHNpemUudHJhbnNwb3NlZFNpemUo KTsKLSAgICAgICAgbV9jdXJyZW50U2V0dGluZ3Muc2V0V2lkdGgoc2l6ZS53aWR0aCgpKTsKLSAg ICAgICAgbV9jdXJyZW50U2V0dGluZ3Muc2V0SGVpZ2h0KHNpemUuaGVpZ2h0KCkpOwotICAgIH0K KyAgICBtX2N1cnJlbnRTZXR0aW5ncy5zZXRXaWR0aChzaXplLndpZHRoKCkpOworICAgIG1fY3Vy cmVudFNldHRpbmdzLnNldEhlaWdodChzaXplLmhlaWdodCgpKTsKIAogICAgIGZvckVhY2hPYnNl cnZlcihbJl0oYXV0byYgb2JzZXJ2ZXIpIHsKICAgICAgICAgb2JzZXJ2ZXIuc291cmNlU2V0dGlu Z3NDaGFuZ2VkKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9tYWMvTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2VNYWMuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL21hYy9Nb2NrUmVhbHRpbWVWaWRlb1NvdXJjZU1hYy5oCmluZGV4 IDUzOThiNDNhMWFiYjMxZWI3OTljMGQ2YjhiZmY3NjQ3ZTM2MDRlYmQuLjk1YThjZjBhZTUzMzgw ZWQ1NzczYTI3MmQ2YmRjNTQzNTQ4Yjk5NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21lZGlhc3RyZWFtL21hYy9Nb2NrUmVhbHRpbWVWaWRlb1NvdXJjZU1hYy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Nb2NrUmVhbHRpbWVWaWRl b1NvdXJjZU1hYy5oCkBAIC0zMyw3ICszMyw2IEBACiAjaWYgRU5BQkxFKE1FRElBX1NUUkVBTSkK IAogI2luY2x1ZGUgIk1vY2tSZWFsdGltZVZpZGVvU291cmNlLmgiCi0jaW5jbHVkZSAiT3JpZW50 YXRpb25Ob3RpZmllci5oIgogI2luY2x1ZGUgIlBpeGVsQnVmZmVyQ29uZm9ybWVyQ1YuaCIKIAog dHlwZWRlZiBzdHJ1Y3QgX19DVkJ1ZmZlciAqQ1ZCdWZmZXJSZWY7CkBAIC00NSw3ICs0NCw3IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgSW1hZ2VUcmFuc2ZlclNlc3Npb25WVDsKIAot Y2xhc3MgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2VNYWMgZmluYWwgOiBwdWJsaWMgTW9ja1JlYWx0 aW1lVmlkZW9Tb3VyY2UsIHByaXZhdGUgT3JpZW50YXRpb25Ob3RpZmllcjo6T2JzZXJ2ZXIgewor Y2xhc3MgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2VNYWMgZmluYWwgOiBwdWJsaWMgTW9ja1JlYWx0 aW1lVmlkZW9Tb3VyY2UgewogcHVibGljOgogICAgIHZpcnR1YWwgfk1vY2tSZWFsdGltZVZpZGVv U291cmNlTWFjKCkgPSBkZWZhdWx0OwogCkBAIC01NywxMSArNTYsNiBAQCBwcml2YXRlOgogICAg IHZvaWQgdXBkYXRlU2FtcGxlQnVmZmVyKCkgZmluYWw7CiAgICAgYm9vbCBjYW5SZXNpemVWaWRl b0ZyYW1lcygpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHRydWU7IH0KIAotICAgIHZvaWQgb3JpZW50 YXRpb25DaGFuZ2VkKGludCBvcmllbnRhdGlvbikgZmluYWw7Ci0gICAgdm9pZCBtb25pdG9yT3Jp ZW50YXRpb24oT3JpZW50YXRpb25Ob3RpZmllciYpIGZpbmFsOwotICAgIE1lZGlhU2FtcGxlOjpW aWRlb1JvdGF0aW9uIHNhbXBsZVJvdGF0aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9kZXZp Y2VPcmllbnRhdGlvbjsgfQotCi0gICAgTWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb24gbV9kZXZp Y2VPcmllbnRhdGlvbiB7IE1lZGlhU2FtcGxlOjpWaWRlb1JvdGF0aW9uOjpOb25lIH07CiAgICAg c3RkOjp1bmlxdWVfcHRyPEltYWdlVHJhbnNmZXJTZXNzaW9uVlQ+IG1faW1hZ2VUcmFuc2ZlclNl c3Npb247CiAgICAgSW50U2l6ZSBtX3ByZXNldFNpemU7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL01vY2tSZWFsdGltZVZpZGVvU291cmNl TWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL01vY2tSZWFs dGltZVZpZGVvU291cmNlTWFjLm1tCmluZGV4IDgzYzYzYjE3N2I2ZTgwZjA0NDhhYzFmMWFlMWJj ZTM0N2YzNzgzZjAuLjlkZGZmNDBjMWM1MjNiYTIxZTRkYzQ2ZGI2OTExZDgxMTUxM2M2MzUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Nb2NrUmVh bHRpbWVWaWRlb1NvdXJjZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9tYWMvTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2VNYWMubW0KQEAgLTg1LDQxICs4NSwx MyBAQCB2b2lkIE1vY2tSZWFsdGltZVZpZGVvU291cmNlTWFjOjp1cGRhdGVTYW1wbGVCdWZmZXIo KQogICAgICAgICBtX2ltYWdlVHJhbnNmZXJTZXNzaW9uID0gSW1hZ2VUcmFuc2ZlclNlc3Npb25W VDo6Y3JlYXRlKHByZWZlcmVkUGl4ZWxCdWZmZXJGb3JtYXQoKSk7CiAKICAgICBhdXRvIHNhbXBs ZVRpbWUgPSBNZWRpYVRpbWU6OmNyZWF0ZVdpdGhEb3VibGUoKGVsYXBzZWRUaW1lKCkgKyAxMDBf bXMpLnNlY29uZHMoKSk7Ci0gICAgYXV0byBzYW1wbGVCdWZmZXIgPSBtX2ltYWdlVHJhbnNmZXJT ZXNzaW9uLT5jcmVhdGVNZWRpYVNhbXBsZShpbWFnZUJ1ZmZlci0+Y29weUltYWdlKCktPm5hdGl2 ZUltYWdlKCkuZ2V0KCksIHNhbXBsZVRpbWUsIHNpemUoKSwgbV9kZXZpY2VPcmllbnRhdGlvbik7 CisgICAgYXV0byBzYW1wbGVCdWZmZXIgPSBtX2ltYWdlVHJhbnNmZXJTZXNzaW9uLT5jcmVhdGVN ZWRpYVNhbXBsZShpbWFnZUJ1ZmZlci0+Y29weUltYWdlKCktPm5hdGl2ZUltYWdlKCkuZ2V0KCks IHNhbXBsZVRpbWUsIHNpemUoKSwgc2FtcGxlUm90YXRpb24oKSk7CiAgICAgaWYgKCFzYW1wbGVC dWZmZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIC8vIFdlIHVzZSBtX2RldmljZU9yaWVudGF0 aW9uIHRvIGVtdWxhdGUgc2Vuc29yIG9yaWVudGF0aW9uCiAgICAgZGlzcGF0Y2hNZWRpYVNhbXBs ZVRvT2JzZXJ2ZXJzKCpzYW1wbGVCdWZmZXIpOwogfQogCi12b2lkIE1vY2tSZWFsdGltZVZpZGVv U291cmNlTWFjOjpvcmllbnRhdGlvbkNoYW5nZWQoaW50IG9yaWVudGF0aW9uKQotewotICAgIC8v IEZJWE1FOiBEbyBzb21ldGhpbmcgd2l0aCBtX2RldmljZU9yaWVudGF0aW9uLiBTZWUgYnVnIDE2 OTgyMi4KLSAgICBzd2l0Y2ggKG9yaWVudGF0aW9uKSB7Ci0gICAgY2FzZSAwOgotICAgICAgICBt X2RldmljZU9yaWVudGF0aW9uID0gTWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb246Ok5vbmU7Ci0g ICAgICAgIGJyZWFrOwotICAgIGNhc2UgOTA6Ci0gICAgICAgIG1fZGV2aWNlT3JpZW50YXRpb24g PSBNZWRpYVNhbXBsZTo6VmlkZW9Sb3RhdGlvbjo6UmlnaHQ7Ci0gICAgICAgIGJyZWFrOwotICAg IGNhc2UgLTkwOgotICAgICAgICBtX2RldmljZU9yaWVudGF0aW9uID0gTWVkaWFTYW1wbGU6OlZp ZGVvUm90YXRpb246OkxlZnQ7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgMTgwOgotICAgICAg ICBtX2RldmljZU9yaWVudGF0aW9uID0gTWVkaWFTYW1wbGU6OlZpZGVvUm90YXRpb246OlVwc2lk ZURvd247Ci0gICAgICAgIGJyZWFrOwotICAgIGRlZmF1bHQ6Ci0gICAgICAgIHJldHVybjsKLSAg ICB9Ci19Ci0KLXZvaWQgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2VNYWM6Om1vbml0b3JPcmllbnRh dGlvbihPcmllbnRhdGlvbk5vdGlmaWVyJiBub3RpZmllcikKLXsKLSAgICBub3RpZmllci5hZGRP YnNlcnZlcigqdGhpcyk7Ci0gICAgb3JpZW50YXRpb25DaGFuZ2VkKG5vdGlmaWVyLm9yaWVudGF0 aW9uKCkpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUo TUVESUFfU1RSRUFNKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbW9jay9N b2NrUmVhbHRpbWVWaWRlb1NvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2Nr L01vY2tSZWFsdGltZVZpZGVvU291cmNlLmNwcAppbmRleCA0OWE0OGJlMGZhYTI5OWZhNGZhNjkz ZDc0MjM0OGIzMDQ0YzVlMzhmLi4wNGVlM2I0YTkwNjJiOGFlOWJkYTE2MjE4MTEzZjFlMzY3ZjY3 NmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tSZWFsdGlt ZVZpZGVvU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tS ZWFsdGltZVZpZGVvU291cmNlLmNwcApAQCAtMTU3LDcgKzE1NywxMSBAQCBjb25zdCBSZWFsdGlt ZU1lZGlhU291cmNlU2V0dGluZ3MmIE1vY2tSZWFsdGltZVZpZGVvU291cmNlOjpzZXR0aW5ncygp CiAgICAgICAgIHNldHRpbmdzLnNldExvZ2ljYWxTdXJmYWNlKGZhbHNlKTsKICAgICB9CiAgICAg c2V0dGluZ3Muc2V0RnJhbWVSYXRlKGZyYW1lUmF0ZSgpKTsKLSAgICBhdXRvJiBzaXplID0gdGhp cy0+c2l6ZSgpOworICAgIGF1dG8gc2l6ZSA9IHRoaXMtPnNpemUoKTsKKyAgICBpZiAobW9ja0Nh bWVyYSgpKSB7CisgICAgICAgIGlmIChtX2RldmljZU9yaWVudGF0aW9uID09IE1lZGlhU2FtcGxl OjpWaWRlb1JvdGF0aW9uOjpMZWZ0IHx8IG1fZGV2aWNlT3JpZW50YXRpb24gPT0gTWVkaWFTYW1w bGU6OlZpZGVvUm90YXRpb246OlJpZ2h0KQorICAgICAgICAgICAgc2l6ZSA9IHNpemUudHJhbnNw b3NlZFNpemUoKTsKKyAgICB9CiAgICAgc2V0dGluZ3Muc2V0V2lkdGgoc2l6ZS53aWR0aCgpKTsK ICAgICBzZXR0aW5ncy5zZXRIZWlnaHQoc2l6ZS5oZWlnaHQoKSk7CiAgICAgaWYgKGFzcGVjdFJh dGlvKCkpCkBAIC00NzIsNiArNDc2LDQxIEBAIGJvb2wgTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2U6 Om1vY2tEaXNwbGF5VHlwZShDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlIHR5cGUpIGNvCiAgICAg cmV0dXJuIFdURjo6Z2V0PE1vY2tEaXNwbGF5UHJvcGVydGllcz4obV9kZXZpY2UucHJvcGVydGll cykudHlwZSA9PSB0eXBlOwogfQogCit2b2lkIE1vY2tSZWFsdGltZVZpZGVvU291cmNlOjpvcmll bnRhdGlvbkNoYW5nZWQoaW50IG9yaWVudGF0aW9uKQoreworICAgIGF1dG8gZGV2aWNlT3JpZW50 YXRpb24gPSBtX2RldmljZU9yaWVudGF0aW9uOworICAgIHN3aXRjaCAob3JpZW50YXRpb24pIHsK KyAgICBjYXNlIDA6CisgICAgICAgIG1fZGV2aWNlT3JpZW50YXRpb24gPSBNZWRpYVNhbXBsZTo6 VmlkZW9Sb3RhdGlvbjo6Tm9uZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSA5MDoKKyAgICAg ICAgbV9kZXZpY2VPcmllbnRhdGlvbiA9IE1lZGlhU2FtcGxlOjpWaWRlb1JvdGF0aW9uOjpSaWdo dDsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSAtOTA6CisgICAgICAgIG1fZGV2aWNlT3JpZW50 YXRpb24gPSBNZWRpYVNhbXBsZTo6VmlkZW9Sb3RhdGlvbjo6TGVmdDsKKyAgICAgICAgYnJlYWs7 CisgICAgY2FzZSAxODA6CisgICAgICAgIG1fZGV2aWNlT3JpZW50YXRpb24gPSBNZWRpYVNhbXBs ZTo6VmlkZW9Sb3RhdGlvbjo6VXBzaWRlRG93bjsKKyAgICAgICAgYnJlYWs7CisgICAgZGVmYXVs dDoKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGlmIChkZXZpY2VPcmllbnRhdGlvbiA9 PSBtX2RldmljZU9yaWVudGF0aW9uKQorICAgICAgICByZXR1cm47CisKKyAgICBub3RpZnlTZXR0 aW5nc0RpZENoYW5nZU9ic2VydmVycyh7IFJlYWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5nczo6Rmxh Zzo6V2lkdGgsIFJlYWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5nczo6RmxhZzo6SGVpZ2h0IH0pOwor fQorCit2b2lkIE1vY2tSZWFsdGltZVZpZGVvU291cmNlOjptb25pdG9yT3JpZW50YXRpb24oT3Jp ZW50YXRpb25Ob3RpZmllciYgbm90aWZpZXIpCit7CisgICAgaWYgKCFtb2NrQ2FtZXJhKCkpCisg ICAgICAgIHJldHVybjsKKworICAgIG5vdGlmaWVyLmFkZE9ic2VydmVyKCp0aGlzKTsKKyAgICBv cmllbnRhdGlvbkNoYW5nZWQobm90aWZpZXIub3JpZW50YXRpb24oKSk7Cit9CisKIH0gLy8gbmFt ZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIEVOQUJMRShNRURJQV9TVFJFQU0pCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tSZWFsdGltZVZpZGVvU291cmNl LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tb2NrL01vY2tSZWFsdGltZVZpZGVvU291cmNl LmgKaW5kZXggY2JlMWEwMDRhYjdmMmY0MTVhODVjMDc1Y2M1YTVmYjVhYTQ4OTA5Ny4uZTU5OTA3 NmI0Zjc0Y2M1NDg4YzRiMzlmYmNlMDEzYWIyZjgwMTNjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbW9jay9Nb2NrUmVhbHRpbWVWaWRlb1NvdXJjZS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21vY2svTW9ja1JlYWx0aW1lVmlkZW9Tb3VyY2UuaApAQCAtMzYs NiArMzYsNyBAQAogI2luY2x1ZGUgIkZvbnRDYXNjYWRlLmgiCiAjaW5jbHVkZSAiSW1hZ2VCdWZm ZXIuaCIKICNpbmNsdWRlICJNb2NrTWVkaWFEZXZpY2UuaCIKKyNpbmNsdWRlICJPcmllbnRhdGlv bk5vdGlmaWVyLmgiCiAjaW5jbHVkZSAiUmVhbHRpbWVNZWRpYVNvdXJjZUZhY3RvcnkuaCIKICNp bmNsdWRlICJSZWFsdGltZVZpZGVvQ2FwdHVyZVNvdXJjZS5oIgogI2luY2x1ZGUgPHd0Zi9SdW5M b29wLmg+CkBAIC00NSw3ICs0Niw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEZsb2F0 UmVjdDsKIGNsYXNzIEdyYXBoaWNzQ29udGV4dDsKIAotY2xhc3MgTW9ja1JlYWx0aW1lVmlkZW9T b3VyY2UgOiBwdWJsaWMgUmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2UgeworY2xhc3MgTW9ja1Jl YWx0aW1lVmlkZW9Tb3VyY2UgOiBwdWJsaWMgUmVhbHRpbWVWaWRlb0NhcHR1cmVTb3VyY2UsIHBy aXZhdGUgT3JpZW50YXRpb25Ob3RpZmllcjo6T2JzZXJ2ZXIgewogcHVibGljOgogCiAgICAgc3Rh dGljIENhcHR1cmVTb3VyY2VPckVycm9yIGNyZWF0ZShTdHJpbmcmJiBkZXZpY2VJRCwgU3RyaW5n JiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQsIGNvbnN0IE1lZGlhQ29uc3RyYWludHMqKTsKQEAg LTYwLDYgKzYxLDcgQEAgcHJvdGVjdGVkOgogCiAgICAgU2Vjb25kcyBlbGFwc2VkVGltZSgpOwog ICAgIHZvaWQgc2V0dGluZ3NEaWRDaGFuZ2UoT3B0aW9uU2V0PFJlYWx0aW1lTWVkaWFTb3VyY2VT ZXR0aW5nczo6RmxhZz4pIG92ZXJyaWRlOworICAgIE1lZGlhU2FtcGxlOjpWaWRlb1JvdGF0aW9u IHNhbXBsZVJvdGF0aW9uKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9kZXZpY2VPcmllbnRhdGlv bjsgfQogCiBwcml2YXRlOgogICAgIGNvbnN0IFJlYWx0aW1lTWVkaWFTb3VyY2VDYXBhYmlsaXRp ZXMmIGNhcGFiaWxpdGllcygpIGZpbmFsOwpAQCAtNzYsNiArNzgsMTAgQEAgcHJpdmF0ZToKIAog ICAgIHZvaWQgZ2VuZXJhdGVQcmVzZXRzKCkgZmluYWw7CiAKKyAgICAvLyBPcmllbnRhdGlvbk5v dGlmaWVyOjpPYnNlcnZlcgorICAgIHZvaWQgb3JpZW50YXRpb25DaGFuZ2VkKGludCBvcmllbnRh dGlvbikgZmluYWw7CisgICAgdm9pZCBtb25pdG9yT3JpZW50YXRpb24oT3JpZW50YXRpb25Ob3Rp ZmllciYpIGZpbmFsOworCiAgICAgdm9pZCBkcmF3QW5pbWF0aW9uKEdyYXBoaWNzQ29udGV4dCYp OwogICAgIHZvaWQgZHJhd1RleHQoR3JhcGhpY3NDb250ZXh0Jik7CiAgICAgdm9pZCBkcmF3Qm94 ZXMoR3JhcGhpY3NDb250ZXh0Jik7CkBAIC04Myw3ICs4OSw3IEBAIHByaXZhdGU6CiAgICAgdm9p ZCBnZW5lcmF0ZUZyYW1lKCk7CiAgICAgdm9pZCBzdGFydENhcHR1cmVUaW1lcigpOwogCi0gICAg dm9pZCBkZWxheVNhbXBsZXMoU2Vjb25kcykgb3ZlcnJpZGU7CisgICAgdm9pZCBkZWxheVNhbXBs ZXMoU2Vjb25kcykgZmluYWw7CiAKICAgICBib29sIG1vY2tDYW1lcmEoKSBjb25zdCB7IHJldHVy biBXVEY6OmhvbGRzX2FsdGVybmF0aXZlPE1vY2tDYW1lcmFQcm9wZXJ0aWVzPihtX2RldmljZS5w cm9wZXJ0aWVzKTsgfQogICAgIGJvb2wgbW9ja0Rpc3BsYXkoKSBjb25zdCB7IHJldHVybiBXVEY6 OmhvbGRzX2FsdGVybmF0aXZlPE1vY2tEaXNwbGF5UHJvcGVydGllcz4obV9kZXZpY2UucHJvcGVy dGllcyk7IH0KQEAgLTExMiw2ICsxMTgsNyBAQCBwcml2YXRlOgogICAgIENvbG9yIG1fZmlsbENv bG9yIHsgQ29sb3I6OmJsYWNrIH07CiAgICAgTW9ja01lZGlhRGV2aWNlIG1fZGV2aWNlOwogICAg IFJlZlB0cjxWaWRlb1ByZXNldD4gbV9wcmVzZXQ7CisgICAgTWVkaWFTYW1wbGU6OlZpZGVvUm90 YXRpb24gbV9kZXZpY2VPcmllbnRhdGlvbiB7IE1lZGlhU2FtcGxlOjpWaWRlb1JvdGF0aW9uOjpO b25lIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMWIxMzAzOTAzOWMw YmMyZWIzYjgyYWI1OGY3ZGNhODY1ZWJiNzkzYy4uNzhkMThmOTk5ODg0NmVkNDFkZTYyODQ2YmVl MDJjMTI3OWM2OTBlMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA3LTA1ICBZb3Vlbm4g RmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBMb2NhbCBjYXB0dXJl IE1lZGlhU3RyZWFtVHJhY2sgZG9lcyBub3QgcmVuZGVyIGluIHBvcnRyYWl0IG1vZGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTUxOQorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNTI2ODk3MjA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiB3ZWJydGMvdmlkZW8tcm90YXRpb24tZXhwZWN0ZWQudHh0 OgorICAgICAgICAqIHdlYnJ0Yy92aWRlby1yb3RhdGlvbi5odG1sOgorCiAyMDE5LTA3LTAyICBB bmRyZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmhhbmNl IHN1cHBvcnQgb2YgYXJpYS1oYXNwb3B1cCBwZXIgQVJJQSAxLjEgc3BlY2lmaWNhdGlvbi4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby1yb3RhdGlvbi1leHBlY3RlZC50eHQg Yi9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tcm90YXRpb24tZXhwZWN0ZWQudHh0CmluZGV4IDcw ZGQ0ZmNiZGFhOWQ5YWYzODVkOWIwMjRkNWQ0MjIxOTYzMGE1MDguLjRlZTNmZmEwZGNkZjA0ZDc5 NWQxYWM4OGM0N2E5NjE5Nzk4OTcxNmYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3dlYnJ0Yy92 aWRlby1yb3RhdGlvbi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVv LXJvdGF0aW9uLWV4cGVjdGVkLnR4dApAQCAtMSw3ICsxLDggQEAKLSAgCisgICAgCiAKIFBBU1Mg U2V0dGluZyB2aWRlbyBleGNoYW5nZSAKIFBBU1MgVHJhY2sgaXMgZW5hYmxlZCwgdmlkZW8gc2hv dWxkIG5vdCBiZSBibGFjayAKLVBBU1MgVHJhY2sgaXMgZW5hYmxlZCBhbmQgcm90YXRlZCwgdmlk ZW8gc2hvdWxkIG5vdCBiZSBibGFjayBhbmQgc2hvdWxkIGNoYW5nZSBzaXplIAorUEFTUyBUcmFj ayBpcyBlbmFibGVkIGFuZCByb3RhdGVkLCBsb2NhbCB2aWRlbyBzaG91bGQgbm90IGJlIGJsYWNr IGFuZCBzaG91bGQgY2hhbmdlIHNpemUgCitQQVNTIFRyYWNrIGlzIGVuYWJsZWQgYW5kIHJvdGF0 ZWQsIHJlbW90ZSB2aWRlbyBzaG91bGQgbm90IGJlIGJsYWNrIGFuZCBzaG91bGQgY2hhbmdlIHNp emUgCiBQQVNTIFRyYWNrIGlzIGVuYWJsZWQgYW5kIHJvdGF0ZWQgYWdhaW4sIHZpZGVvIHNob3Vs ZCBub3QgYmUgYmxhY2sgYW5kIHNob3VsZCBjaGFuZ2Ugc2l6ZSAKIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXJvdGF0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy93ZWJydGMv dmlkZW8tcm90YXRpb24uaHRtbAppbmRleCBhODc2OThkYzFkN2VjZjIzOGFhY2FkMDlmYWQ5N2Zj MDVhNTg0MDAwLi41ODQwNTZjOTMyNTY1YzdiN2RjMzhkZDY1YjM2MzRkYWNhZTJlMzhkIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8tcm90YXRpb24uaHRtbAorKysgYi9MYXlv dXRUZXN0cy93ZWJydGMvdmlkZW8tcm90YXRpb24uaHRtbApAQCAtNywxNSArNywxNyBAQAogICAg ICAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3Nj cmlwdD4KICAgICA8L2hlYWQ+CiAgICAgPGJvZHk+Ci0gICAgICAgIDx2aWRlbyBpZD0idmlkZW8i IGF1dG9wbGF5IHBsYXlzSW5saW5lIHdpZHRoPSIzMjAiIGhlaWdodD0iMjQwIj48L3ZpZGVvPgor ICAgICAgICA8dmlkZW8gaWQ9ImxvY2FsVmlkZW8iIGF1dG9wbGF5IHBsYXlzSW5saW5lIHdpZHRo PSIzMjAiIGhlaWdodD0iMjQwIj48L3ZpZGVvPgorICAgICAgICA8dmlkZW8gaWQ9InJlbW90ZVZp ZGVvIiBhdXRvcGxheSBwbGF5c0lubGluZSB3aWR0aD0iMzIwIiBoZWlnaHQ9IjI0MCI+PC92aWRl bz4KKyAgICAgICAgPGNhbnZhcyBpZD0iY2FudmFzMCIgd2lkdGg9IjMyMCIgaGVpZ2h0PSIyNDAi PjwvY2FudmFzPgogICAgICAgICA8Y2FudmFzIGlkPSJjYW52YXMxIiB3aWR0aD0iMzIwIiBoZWln aHQ9IjI0MCI+PC9jYW52YXM+CiAgICAgICAgIDxjYW52YXMgaWQ9ImNhbnZhczIiIHdpZHRoPSIz MjAiIGhlaWdodD0iMjQwIj48L2NhbnZhcz4KICAgICAgICAgPGNhbnZhcyBpZD0iY2FudmFzMyIg d2lkdGg9IjMyMCIgaGVpZ2h0PSIyNDAiPjwvY2FudmFzPgogICAgICAgICA8c2NyaXB0IHNyYyA9 InJvdXRpbmVzLmpzIj48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdD4KLWZ1bmN0aW9uIGlzVmlk ZW9CbGFjayhpZCkKK2Z1bmN0aW9uIGlzVmlkZW9CbGFjayh2aWRlbywgY2FudmFzSWQpCiB7Ci0g ICAgdmFyIGNhbnZhcyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKGlkKTsKKyAgICB2YXIgY2Fu dmFzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoY2FudmFzSWQpOwogICAgIGNhbnZhcy53aWR0 aCA9IHZpZGVvLnZpZGVvV2lkdGg7CiAgICAgY2FudmFzLmhlaWdodCA9IHZpZGVvLnZpZGVvSGVp Z2h0OwogICAgIGNhbnZhcy5nZXRDb250ZXh0KCcyZCcpLmRyYXdJbWFnZSh2aWRlbywgMCwgMCwg Y2FudmFzLndpZHRoLCBjYW52YXMuaGVpZ2h0KTsKQEAgLTMwLDIxICszMiwyMSBAQCBmdW5jdGlv biBpc1ZpZGVvQmxhY2soaWQpCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWZ1bmN0aW9uIHBvbGxW aWRlb0JsYWNrQ2hlY2soZXhwZWN0ZWQsIGlkLCByZXNvbHZlKQorZnVuY3Rpb24gcG9sbFZpZGVv QmxhY2tDaGVjayhleHBlY3RlZCwgdmlkZW8sIGNhbnZhc0lkLCByZXNvbHZlKQogewotICAgIGlm IChpc1ZpZGVvQmxhY2soaWQpID09PSBleHBlY3RlZCkgeworICAgIGlmIChpc1ZpZGVvQmxhY2so dmlkZW8sIGNhbnZhc0lkKSA9PT0gZXhwZWN0ZWQpIHsKICAgICAgICAgcmVzb2x2ZSgpOwogICAg ICAgICByZXR1cm47CiAgICAgfQogCi0gICAgc2V0VGltZW91dCgoKSA9PiBwb2xsVmlkZW9CbGFj a0NoZWNrKGV4cGVjdGVkLCBpZCwgcmVzb2x2ZSksIDEwMCk7CisgICAgc2V0VGltZW91dCgoKSA9 PiBwb2xsVmlkZW9CbGFja0NoZWNrKGV4cGVjdGVkLCB2aWRlbywgY2FudmFzSWQsIHJlc29sdmUp LCAxMDApOwogfQogCi1mdW5jdGlvbiBjaGVja1ZpZGVvQmxhY2soZXhwZWN0ZWQsIGlkKQorZnVu Y3Rpb24gY2hlY2tWaWRlb0JsYWNrKGV4cGVjdGVkLCB2aWRlbywgY2FudmFzSWQpCiB7CiAgICAg cmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlLCByZWplY3QpID0+IHsKLSAgICAgICAgcG9sbFZp ZGVvQmxhY2tDaGVjayhleHBlY3RlZCwgaWQsIHJlc29sdmUpOwotICAgICAgICBzZXRUaW1lb3V0 KCgpID0+IHJlamVjdCgiY2hlY2tWaWRlb0JsYWNrIHRpbWVkIG91dCBmb3IgJyIgKyBpZCArICIn LCBleHBlY3RlZCAiICsgZXhwZWN0ZWQpLCA1MDAwKTsKKyAgICAgICAgcG9sbFZpZGVvQmxhY2tD aGVjayhleHBlY3RlZCwgdmlkZW8sIGNhbnZhc0lkLCByZXNvbHZlKTsKKyAgICAgICAgc2V0VGlt ZW91dCgoKSA9PiByZWplY3QoImNoZWNrVmlkZW9CbGFjayB0aW1lZCBvdXQgZm9yICciICsgY2Fu dmFzSWQgKyAiJywgZXhwZWN0ZWQgIiArIGV4cGVjdGVkKSwgNTAwMCk7CiAgICAgfSk7CiB9CiAK QEAgLTU0LDYgKzU2LDcgQEAgcHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7CiAgICAgICAgIHRlc3RS dW5uZXIuc2V0VXNlck1lZGlhUGVybWlzc2lvbih0cnVlKTsKIAogICAgIHJldHVybiBuYXZpZ2F0 b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7dmlkZW86IHt3aWR0aDogMzIwLCBoZWlnaHQ6 IDI0MCwgZmFjaW5nTW9kZTogImVudmlyb25tZW50In19KS50aGVuKChsb2NhbFN0cmVhbSkgPT4g eworICAgICAgICBsb2NhbFZpZGVvLnNyY09iamVjdCA9IGxvY2FsU3RyZWFtOwogICAgICAgICBy ZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUsIHJlamVjdCkgPT4gewogICAgICAgICAgICAgdHJh Y2sgPSBsb2NhbFN0cmVhbS5nZXRWaWRlb1RyYWNrcygpWzBdOwogCkBAIC02OSwzMCArNzIsNDIg QEAgcHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7CiAgICAgICAgICAgICBzZXRUaW1lb3V0KCgpID0+ IHJlamVjdCgiVGVzdCB0aW1lZCBvdXQiKSwgNTAwMCk7CiAgICAgICAgIH0pOwogICAgIH0pLnRo ZW4oKHJlbW90ZVN0cmVhbSkgPT4gewotICAgICAgICB2aWRlby5zcmNPYmplY3QgPSByZW1vdGVT dHJlYW07Ci0gICAgICAgIHJldHVybiB2aWRlby5wbGF5KCk7CisgICAgICAgIHJlbW90ZVZpZGVv LnNyY09iamVjdCA9IHJlbW90ZVN0cmVhbTsKKyAgICAgICAgcmV0dXJuIHJlbW90ZVZpZGVvLnBs YXkoKTsKICAgICB9KTsKIH0sICJTZXR0aW5nIHZpZGVvIGV4Y2hhbmdlIik7CiAKLXByb21pc2Vf dGVzdCgodGVzdCkgPT4gewotICAgcmV0dXJuIGNoZWNrVmlkZW9CbGFjayhmYWxzZSwgImNhbnZh czEiKTsKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4geworICAgYXdhaXQgY2hlY2tWaWRl b0JsYWNrKGZhbHNlLCByZW1vdGVWaWRlbywgImNhbnZhczAiKTsKKyAgIGF3YWl0IHdhaXRGb3JW aWRlb1NpemUocmVtb3RlVmlkZW8sIDMyMCwgMjQwKTsKIH0sICJUcmFjayBpcyBlbmFibGVkLCB2 aWRlbyBzaG91bGQgbm90IGJlIGJsYWNrIik7CiAKK3Byb21pc2VfdGVzdChhc3luYyAodGVzdCkg PT4geworICAgIGF3YWl0IGNoZWNrVmlkZW9CbGFjayhmYWxzZSwgbG9jYWxWaWRlbywgImNhbnZh czAiKTsKKyAgICBhd2FpdCB3YWl0Rm9yVmlkZW9TaXplKGxvY2FsVmlkZW8sIDMyMCwgMjQwKTsK KworICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNl dENhbWVyYU1lZGlhU3RyZWFtVHJhY2tPcmllbnRhdGlvbih0cmFjaywgOTApOworCisgICAgYXdh aXQgY2hlY2tWaWRlb0JsYWNrKGZhbHNlLCBsb2NhbFZpZGVvLCAiY2FudmFzMSIpOworICAgIGF3 YWl0IHdhaXRGb3JWaWRlb1NpemUobG9jYWxWaWRlbywgMjQwLCAzMjApOworfSwgIlRyYWNrIGlz IGVuYWJsZWQgYW5kIHJvdGF0ZWQsIGxvY2FsIHZpZGVvIHNob3VsZCBub3QgYmUgYmxhY2sgYW5k IHNob3VsZCBjaGFuZ2Ugc2l6ZSIpOworCiBwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKICAgICBp ZiAod2luZG93LmludGVybmFscykKICAgICAgICAgd2luZG93LmludGVybmFscy5zZXRDYW1lcmFN ZWRpYVN0cmVhbVRyYWNrT3JpZW50YXRpb24odHJhY2ssIDkwKTsKIAotICAgIHJldHVybiBjaGVj a1ZpZGVvQmxhY2soZmFsc2UsICJjYW52YXMxIikudGhlbigoKSA9PiB7Ci0gICAgICAgIHJldHVy biB3YWl0Rm9yVmlkZW9TaXplKHZpZGVvLCAyNDAsIDMyMCk7CisgICAgcmV0dXJuIGNoZWNrVmlk ZW9CbGFjayhmYWxzZSwgcmVtb3RlVmlkZW8sICJjYW52YXMyIikudGhlbigoKSA9PiB7CisgICAg ICAgIHJldHVybiB3YWl0Rm9yVmlkZW9TaXplKHJlbW90ZVZpZGVvLCAyNDAsIDMyMCk7CiAgICAg fSk7Ci19LCAiVHJhY2sgaXMgZW5hYmxlZCBhbmQgcm90YXRlZCwgdmlkZW8gc2hvdWxkIG5vdCBi ZSBibGFjayBhbmQgc2hvdWxkIGNoYW5nZSBzaXplIik7Cit9LCAiVHJhY2sgaXMgZW5hYmxlZCBh bmQgcm90YXRlZCwgcmVtb3RlIHZpZGVvIHNob3VsZCBub3QgYmUgYmxhY2sgYW5kIHNob3VsZCBj aGFuZ2Ugc2l6ZSIpOwogCiBwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKICAgICBpZiAod2luZG93 LmludGVybmFscykKICAgICAgICAgd2luZG93LmludGVybmFscy5zZXRDYW1lcmFNZWRpYVN0cmVh bVRyYWNrT3JpZW50YXRpb24odHJhY2ssIDE4MCk7CiAKLSAgICByZXR1cm4gY2hlY2tWaWRlb0Js YWNrKGZhbHNlLCAiY2FudmFzMSIpLnRoZW4oKCkgPT4gewotICAgICAgICByZXR1cm4gd2FpdEZv clZpZGVvU2l6ZSh2aWRlbywgMzIwLCAyNDApOworICAgIHJldHVybiBjaGVja1ZpZGVvQmxhY2so ZmFsc2UsIHJlbW90ZVZpZGVvLCAiY2FudmFzMyIpLnRoZW4oKCkgPT4geworICAgICAgICByZXR1 cm4gd2FpdEZvclZpZGVvU2l6ZShyZW1vdGVWaWRlbywgMzIwLCAyNDApOwogICAgIH0pOwogfSwg IlRyYWNrIGlzIGVuYWJsZWQgYW5kIHJvdGF0ZWQgYWdhaW4sIHZpZGVvIHNob3VsZCBub3QgYmUg YmxhY2sgYW5kIHNob3VsZCBjaGFuZ2Ugc2l6ZSIpOwogICAgICAgICA8L3NjcmlwdD4K