193614 2019-01-19 13:01:15 -0800 getUserMedia with an ideal deviceId constraint doesn't always select the correct device 2019-02-13 17:25:46 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue eric.carlson jer.noble webkit-bug-importer youennf oldest_to_newest 1496260 0 eric.carlson 2019-01-19 13:01:15 -0800 getUserMedia with an ideal deviceId constraint doesn't always select the correct device 1505817 1 361932 youennf 2019-02-13 12:50:53 -0800 Created attachment 361932 Patch 1505839 2 361934 youennf 2019-02-13 13:50:03 -0800 Created attachment 361934 Patch 1505860 3 webkit-bug-importer 2019-02-13 14:36:44 -0800 <rdar://problem/48052903> 1505970 4 361934 commit-queue 2019-02-13 17:25:44 -0800 Comment on attachment 361934 Patch Clearing flags on attachment: 361934 Committed r241489: <https://trac.webkit.org/changeset/241489> 1505971 5 commit-queue 2019-02-13 17:25:46 -0800 All reviewed patches have been landed. Closing bug. 361932 2019-02-13 12:50:53 -0800 2019-02-13 13:50:02 -0800 Patch bug-193614-20190213125051.patch text/plain 16738 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxMTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmQ0YTQ5Y2QwZTRlNjIy MDJhYTgxYjg2OTc2YzMwMzNlYmRkZDU4Yy4uOWY0YjAzMjA3YzUwNDA3NzYwODEyMDhmNDZhYmI3 YjM1YjJiZTZjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE5LTAyLTEzICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPiBhbmQgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgZ2V0VXNlck1lZGlhIHdpdGggYW4gaWRlYWwgZGV2 aWNlSWQgY29uc3RyYWludCBkb2Vzbid0IGFsd2F5cyBzZWxlY3QgdGhlIGNvcnJlY3QgZGV2aWNl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTM2MTQK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21wdXRl IGEgZml0bmVzcyBzY29yZSBiYXNlZCBvbiBjb25zdHJhaW50cy4KKyAgICAgICAgRm9yIGVhY2gg Y29uc3RyYWludCwgYSBmaXRuZXNzIHNjb3JlIGlzIGNvbXB1dGVkIGZyb20gdGhlIGRpc3RhbmNl LgorICAgICAgICBUaGUgc21hbGxlciB0aGUgZGlzdGFuY2UsIHRoZSBoaWdoZXIgdGhlIHNjb3Jl LgorICAgICAgICBGaXRuZXNzIHNjb3JlcyBhcmUgdGhlbiBzdW1tZWQgdG8gZ2l2ZSBhIGRldmlj ZSBmaXRuZXNzIHNjb3JlLgorICAgICAgICBNYXRjaGluZyBkZXZpY2VzIGFyZSB0aGVuIHNvcnRl ZCBhY2NvcmRpbmcgdGhlIGZpdG5lc3Mgc2NvcmUuCisKKyAgICAgICAgRm9yIGltcG9ydGFudCBj b25zdHJhaW50cywgZGV2aWNlSWQgYW5kIGZhY2luZ01vZGUsIGFkZCBhIG1vcmUgaW1wb3J0YW50 IHdlaWdodC4KKyAgICAgICAgVGhpcyBlbnN1cmVzIHRoYXQgc2hvdWxkIGFueSBvZiB0aGVzZSBp ZGVhbCBjb25zdHJhaW50cyBhcmUgc2V0LCB0aGV5IHdpbGwgYmUgcmVzcGVjdGVkLgorCisgICAg ICAgIFJlc3RyaWN0IG91ciBhdXRvbWF0aWMgc2V0dGluZyBvZiBkZWZhdWx0IGNvbnN0cmFpbnRz IHRvIG5vdCBhZGQgYSBkZWZhdWx0IGlkZWFsIGZhY2luZ01vZGUgaW4gY2FzZSBvZiBleGlzdGlu ZyBkZXZpY2VJZCBjb25zdHJhaW50LgorICAgICAgICBEbyBub3Qgc2V0IGEgZGVmYXVsdCBpZGVh bCBmcmFtZVJhdGUgaWYgd2lkdGggYW5kIGhlaWdodCBhcmUgYWxyZWFkeSBzZXQuCisKKyAgICAg ICAgQ292ZXJlZCBieSB1cGRhdGVkIHRlc3QuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0 cmVhbS9NZWRpYUNvbnN0cmFpbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZsYXR0ZW5lZENv bnN0cmFpbnQ6OnNldCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnN0cmFpbnRzOjpzZXRE ZWZhdWx0VmlkZW9Db25zdHJhaW50cyk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0v UmVhbHRpbWVNZWRpYVNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGltZU1lZGlh U291cmNlOjpmaXRuZXNzRGlzdGFuY2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVhbHRpbWVNZWRp YVNvdXJjZTo6c2VsZWN0U2V0dGluZ3MpOgorICAgICAgICAoV2ViQ29yZTo6UmVhbHRpbWVNZWRp YVNvdXJjZTo6c3VwcG9ydHNDb25zdHJhaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGlt ZU1lZGlhU291cmNlOjphcHBseUNvbnN0cmFpbnRzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRp YXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmg6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFz dHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZWFsdGltZU1lZGlhU291cmNlQ2VudGVyOjp2YWxpZGF0ZVJlcXVlc3RDb25zdHJhaW50cyk6CisK IDIwMTktMDItMDggIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAg IE1ha2UgUmVxdWVzdCBjb25zdHJ1Y3RvciB0aHJvdyBpZiBGZXRjaFJlcXVlc3RJbml0LnNpZ25h bCBpcyBub3QgdW5kZWZpbmVkLCBudWxsIG9yIGFuIEFib3J0U2lnbmFsIG9iamVjdApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFDb25zdHJhaW50 cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYUNvbnN0cmFp bnRzLmNwcAppbmRleCA2MGRlYTcxYTJmOTliNTE4MDMzZTFlODFkMWQ4ODI3ZWE4NmI1ZWQzLi43 YzQwZTIzZGIyOWM0MDdlYzY2ZjhiYjM5ZGI4NDM2OTVkMmE1MzAxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYUNvbnN0cmFpbnRzLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYUNvbnN0cmFpbnRzLmNw cApAQCAtMTIzLDEwICsxMjMsOCBAQCB2b2lkIFN0cmluZ0NvbnN0cmFpbnQ6Om1lcmdlKGNvbnN0 IE1lZGlhQ29uc3RyYWludCYgb3RoZXIpCiAKIHZvaWQgRmxhdHRlbmVkQ29uc3RyYWludDo6c2V0 KGNvbnN0IE1lZGlhQ29uc3RyYWludCYgY29uc3RyYWludCkKIHsKLSAgICBmb3IgKGF1dG8mIHZh cmlhbnQgOiBtX3ZhcmlhbnRzKSB7Ci0gICAgICAgIGlmICh2YXJpYW50LmNvbnN0cmFpbnRUeXBl KCkgPT0gY29uc3RyYWludC5jb25zdHJhaW50VHlwZSgpKQotICAgICAgICAgICAgcmV0dXJuOwot ICAgIH0KKyAgICBpZiAoZmluZChjb25zdHJhaW50LmNvbnN0cmFpbnRUeXBlKCkpKQorICAgICAg ICByZXR1cm47CiAKICAgICBhcHBlbmQoY29uc3RyYWludCk7CiB9CkBAIC0zOTEsMjMgKzM4OSwy MCBAQCBib29sIE1lZGlhQ29uc3RyYWludHM6OmlzQ29uc3RyYWludFNldChjb25zdCBXVEY6OkZ1 bmN0aW9uPGJvb2woY29uc3QgTWVkaWFUcmFjawogCiB2b2lkIE1lZGlhQ29uc3RyYWludHM6OnNl dERlZmF1bHRWaWRlb0NvbnN0cmFpbnRzKCkKIHsKLSAgICAvLyA2NDB4NDgwLCAzMGZwcywgZm9u dC1mYWNpbmcgY2FtZXJhCi0gICAgYm9vbCBoYXNGcmFtZVJhdGVDb25zdHJhaW50cyA9IGlzQ29u c3RyYWludFNldChbXShjb25zdCBNZWRpYVRyYWNrQ29uc3RyYWludFNldE1hcCYgY29uc3RyYWlu dCkgewotICAgICAgICByZXR1cm4gISFjb25zdHJhaW50LmZyYW1lUmF0ZSgpOworICAgIC8vIDY0 MHg0ODAsIDMwZnBzLCBmcm9udC1mYWNpbmcgY2FtZXJhCisgICAgYm9vbCBuZWVkc0ZyYW1lUmF0 ZUNvbnN0cmFpbnRzID0gIWlzQ29uc3RyYWludFNldChbXShjb25zdCBNZWRpYVRyYWNrQ29uc3Ry YWludFNldE1hcCYgY29uc3RyYWludCkgeworICAgICAgICByZXR1cm4gISFjb25zdHJhaW50LmZy YW1lUmF0ZSgpIHx8ICEhY29uc3RyYWludC53aWR0aCgpIHx8ICEhY29uc3RyYWludC5oZWlnaHQo KTsKICAgICB9KTsKICAgICAKLSAgICBib29sIGhhc1NpemVDb25zdHJhaW50cyA9IGlzQ29uc3Ry YWludFNldChbXShjb25zdCBNZWRpYVRyYWNrQ29uc3RyYWludFNldE1hcCYgY29uc3RyYWludCkg eworICAgIGJvb2wgbmVlZHNTaXplQ29uc3RyYWludHMgPSAhaXNDb25zdHJhaW50U2V0KFtdKGNv bnN0IE1lZGlhVHJhY2tDb25zdHJhaW50U2V0TWFwJiBjb25zdHJhaW50KSB7CiAgICAgICAgIHJl dHVybiAhIWNvbnN0cmFpbnQud2lkdGgoKSB8fCAhIWNvbnN0cmFpbnQuaGVpZ2h0KCk7CiAgICAg fSk7CiAgICAgCi0gICAgYm9vbCBoYXNGYWNpbmdNb2RlQ29uc3RyYWludHMgPSBpc0NvbnN0cmFp bnRTZXQoW10oY29uc3QgTWVkaWFUcmFja0NvbnN0cmFpbnRTZXRNYXAmIGNvbnN0cmFpbnQpIHsK LSAgICAgICAgcmV0dXJuICEhY29uc3RyYWludC5mYWNpbmdNb2RlKCk7CisgICAgYm9vbCBuZWVk c0ZhY2luZ01vZGVDb25zdHJhaW50cyA9ICFpc0NvbnN0cmFpbnRTZXQoW10oY29uc3QgTWVkaWFU cmFja0NvbnN0cmFpbnRTZXRNYXAmIGNvbnN0cmFpbnQpIHsKKyAgICAgICAgcmV0dXJuICEhY29u c3RyYWludC5mYWNpbmdNb2RlKCkgfHwgISFjb25zdHJhaW50LmRldmljZUlkKCk7CiAgICAgfSk7 CiAgICAgCi0gICAgaWYgKGhhc0ZyYW1lUmF0ZUNvbnN0cmFpbnRzICYmIGhhc1NpemVDb25zdHJh aW50cyAmJiBoYXNGYWNpbmdNb2RlQ29uc3RyYWludHMpCi0gICAgICAgIHJldHVybjsKLSAgICAK LSAgICBhZGREZWZhdWx0VmlkZW9Db25zdHJhaW50cyhtYW5kYXRvcnlDb25zdHJhaW50cywgIWhh c0ZyYW1lUmF0ZUNvbnN0cmFpbnRzLCAhaGFzU2l6ZUNvbnN0cmFpbnRzLCAhaGFzRmFjaW5nTW9k ZUNvbnN0cmFpbnRzKTsKKyAgICBhZGREZWZhdWx0VmlkZW9Db25zdHJhaW50cyhtYW5kYXRvcnlD b25zdHJhaW50cywgbmVlZHNGcmFtZVJhdGVDb25zdHJhaW50cywgbmVlZHNTaXplQ29uc3RyYWlu dHMsIG5lZWRzRmFjaW5nTW9kZUNvbnN0cmFpbnRzKTsKIH0KICAgICAKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNv dXJjZS5jcHAKaW5kZXggN2YzOWRiMjE2ZGE4YWJlZWM3NjM0NDM3OWU1MWIxYTdlOTQxODUyZC4u Mzc0MjE1MmY2ODU5ZjYwMzM4NWVlNWQ2MTJlMmExZDc2NmMyOGE4MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNv dXJjZS5jcHAKQEAgLTQxMiw3ICs0MTIsOCBAQCBkb3VibGUgUmVhbHRpbWVNZWRpYVNvdXJjZTo6 Zml0bmVzc0Rpc3RhbmNlKGNvbnN0IE1lZGlhQ29uc3RyYWludCYgY29uc3RyYWludCkKICAgICB9 CiAKICAgICBjYXNlIE1lZGlhQ29uc3RyYWludFR5cGU6OkRldmljZUlkOgotICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgQVNTRVJUKCFtX2hhc2hlZElELmlzRW1wdHkoKSk7 CisgICAgICAgIHJldHVybiBkb3duY2FzdDxTdHJpbmdDb25zdHJhaW50Pihjb25zdHJhaW50KS5m aXRuZXNzRGlzdGFuY2UobV9oYXNoZWRJRCk7CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBN ZWRpYUNvbnN0cmFpbnRUeXBlOjpHcm91cElkOiB7CkBAIC01NjgsOSArNTY5LDkgQEAgdm9pZCBS ZWFsdGltZU1lZGlhU291cmNlOjphcHBseUNvbnN0cmFpbnQoY29uc3QgTWVkaWFDb25zdHJhaW50 JiBjb25zdHJhaW50KQogICAgIH0KIH0KIAotYm9vbCBSZWFsdGltZU1lZGlhU291cmNlOjpzZWxl Y3RTZXR0aW5ncyhjb25zdCBNZWRpYUNvbnN0cmFpbnRzJiBjb25zdHJhaW50cywgRmxhdHRlbmVk Q29uc3RyYWludCYgY2FuZGlkYXRlcywgU3RyaW5nJiBmYWlsZWRDb25zdHJhaW50LCBTZWxlY3RU eXBlIHR5cGUpCitib29sIFJlYWx0aW1lTWVkaWFTb3VyY2U6OnNlbGVjdFNldHRpbmdzKGNvbnN0 IE1lZGlhQ29uc3RyYWludHMmIGNvbnN0cmFpbnRzLCBGbGF0dGVuZWRDb25zdHJhaW50JiBjYW5k aWRhdGVzLCBTdHJpbmcmIGZhaWxlZENvbnN0cmFpbnQpCiB7Ci0gICAgbV9maXRuZXNzU2NvcmUg PSBzdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46OmluZmluaXR5KCk7CisgICAgZG91YmxlIG1p bmltdW1EaXN0YW5jZSA9IHN0ZDo6bnVtZXJpY19saW1pdHM8ZG91YmxlPjo6aW5maW5pdHkoKTsK IAogICAgIC8vIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby9tZWRpYWNhcHR1cmUtbWFpbi8jZGZuLXNl bGVjdHNldHRpbmdzCiAgICAgLy8KQEAgLTU5NSw3ICs1OTYsNyBAQCBib29sIFJlYWx0aW1lTWVk aWFTb3VyY2U6OnNlbGVjdFNldHRpbmdzKGNvbnN0IE1lZGlhQ29uc3RyYWludHMmIGNvbnN0cmFp bnRzLCBGbAogCiAgICAgLy8gQ2hlY2sgd2lkdGgsIGhlaWdodCBhbmQgZnJhbWUgcmF0ZSBqb2lu dGx5LCBiZWNhdXNlIHdoaWxlIHRoZXkgbWF5IGJlIHN1cHBvcnRlZCBpbmRpdmlkdWFsbHkgdGhl IGNvbWJpbmF0aW9uIG1heSBub3QgYmUgc3VwcG9ydGVkLgogICAgIGRvdWJsZSBkaXN0YW5jZSA9 IHN0ZDo6bnVtZXJpY19saW1pdHM8ZG91YmxlPjo6aW5maW5pdHkoKTsKLSAgICBpZiAoIXN1cHBv cnRzU2l6ZUFuZEZyYW1lUmF0ZShjb25zdHJhaW50cy5tYW5kYXRvcnlDb25zdHJhaW50cy53aWR0 aCgpLCBjb25zdHJhaW50cy5tYW5kYXRvcnlDb25zdHJhaW50cy5oZWlnaHQoKSwgY29uc3RyYWlu dHMubWFuZGF0b3J5Q29uc3RyYWludHMuZnJhbWVSYXRlKCksIGZhaWxlZENvbnN0cmFpbnQsIG1f Zml0bmVzc1Njb3JlKSkKKyAgICBpZiAoIXN1cHBvcnRzU2l6ZUFuZEZyYW1lUmF0ZShjb25zdHJh aW50cy5tYW5kYXRvcnlDb25zdHJhaW50cy53aWR0aCgpLCBjb25zdHJhaW50cy5tYW5kYXRvcnlD b25zdHJhaW50cy5oZWlnaHQoKSwgY29uc3RyYWludHMubWFuZGF0b3J5Q29uc3RyYWludHMuZnJh bWVSYXRlKCksIGZhaWxlZENvbnN0cmFpbnQsIG1pbmltdW1EaXN0YW5jZSkpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAogICAgIGNvbnN0cmFpbnRzLm1hbmRhdG9yeUNvbnN0cmFpbnRzLmZpbHRl cihbJl0oY29uc3QgTWVkaWFDb25zdHJhaW50JiBjb25zdHJhaW50KSB7CkBAIC02MDcsMjUgKzYw OCw2IEBAIGJvb2wgUmVhbHRpbWVNZWRpYVNvdXJjZTo6c2VsZWN0U2V0dGluZ3MoY29uc3QgTWVk aWFDb25zdHJhaW50cyYgY29uc3RyYWludHMsIEZsCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgIH0KIAotICAgICAgICAvLyBUaGUgZGV2aWNlSWQgY2FuJ3QgYmUgY2hhbmdlZCwg YW5kIHRoZSBjb25zdHJhaW50IHZhbHVlIGlzIHRoZSBoYXNoZWQgZGV2aWNlIElELCBzbyB2ZXJp ZnkgdGhhdCB0aGUKLSAgICAgICAgLy8gZGV2aWNlJ3MgdW5pcXVlIElEIGhhc2hlcyB0byB0aGUg Y29uc3RyYWludCB2YWx1ZSBidXQgZG9uJ3QgaW5jbHVkZSB0aGUgY29uc3RyYWludCBpbiB0aGUg ZmxhdHRlbmVkCi0gICAgICAgIC8vIGNvbnN0cmFpbnQgc2V0LgotICAgICAgICBpZiAoY29uc3Ry YWludC5jb25zdHJhaW50VHlwZSgpID09IE1lZGlhQ29uc3RyYWludFR5cGU6OkRldmljZUlkKSB7 Ci0gICAgICAgICAgICBpZiAodHlwZSA9PSBTZWxlY3RUeXBlOjpGb3JBcHBseUNvbnN0cmFpbnRz KQotICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICAgICAgQVNTRVJUKGNv bnN0cmFpbnQuaXNTdHJpbmcoKSk7Ci0gICAgICAgICAgICBBU1NFUlQoIW1faGFzaGVkSUQuaXNF bXB0eSgpKTsKLQotICAgICAgICAgICAgZG91YmxlIGNvbnN0cmFpbnREaXN0YW5jZSA9IGRvd25j YXN0PFN0cmluZ0NvbnN0cmFpbnQ+KGNvbnN0cmFpbnQpLmZpdG5lc3NEaXN0YW5jZShtX2hhc2hl ZElEKTsKLSAgICAgICAgICAgIGlmIChzdGQ6OmlzaW5mKGNvbnN0cmFpbnREaXN0YW5jZSkpIHsK LSAgICAgICAgICAgICAgICBmYWlsZWRDb25zdHJhaW50ID0gY29uc3RyYWludC5uYW1lKCk7Ci0g ICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICAgICAgfQotCiAgICAgICAgIGRvdWJsZSBjb25zdHJhaW50RGlz dGFuY2UgPSBmaXRuZXNzRGlzdGFuY2UoY29uc3RyYWludCk7CiAgICAgICAgIGlmIChzdGQ6Omlz aW5mKGNvbnN0cmFpbnREaXN0YW5jZSkpIHsKICAgICAgICAgICAgIGZhaWxlZENvbnN0cmFpbnQg PSBjb25zdHJhaW50Lm5hbWUoKTsKQEAgLTY0MCw3ICs2MjIsNyBAQCBib29sIFJlYWx0aW1lTWVk aWFTb3VyY2U6OnNlbGVjdFNldHRpbmdzKGNvbnN0IE1lZGlhQ29uc3RyYWludHMmIGNvbnN0cmFp bnRzLCBGbAogICAgIGlmICghZmFpbGVkQ29uc3RyYWludC5pc0VtcHR5KCkpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAotICAgIG1fZml0bmVzc1Njb3JlID0gZGlzdGFuY2U7CisgICAgbWluaW11 bURpc3RhbmNlID0gZGlzdGFuY2U7CiAKICAgICAvLyA0LiBJZiBjYW5kaWRhdGVzIGlzIGVtcHR5 LCByZXR1cm4gdW5kZWZpbmVkIGFzIHRoZSByZXN1bHQgb2YgdGhlIFNlbGVjdFNldHRpbmdzKCkg YWxnb3JpdGhtLgogICAgIGlmIChjYW5kaWRhdGVzLmlzRW1wdHkoKSkKQEAgLTY3Niw3ICs2NTgs NyBAQCBib29sIFJlYWx0aW1lTWVkaWFTb3VyY2U6OnNlbGVjdFNldHRpbmdzKGNvbnN0IE1lZGlh Q29uc3RyYWludHMmIGNvbnN0cmFpbnRzLCBGbAogICAgICAgICAgICAgICAgIHN1cHBvcnRlZCA9 IHRydWU7CiAgICAgICAgIH0pOwogCi0gICAgICAgIG1fZml0bmVzc1Njb3JlID0gc3RkOjptaW4o bV9maXRuZXNzU2NvcmUsIGNvbnN0cmFpbnREaXN0YW5jZSk7CisgICAgICAgIG1pbmltdW1EaXN0 YW5jZSA9IHN0ZDo6bWluKG1pbmltdW1EaXN0YW5jZSwgY29uc3RyYWludERpc3RhbmNlKTsKIAog ICAgICAgICAvLyA1LjIgSWYgdGhlIGZpdG5lc3MgZGlzdGFuY2UgaXMgZmluaXRlIGZvciBvbmUg b3IgbW9yZSBzZXR0aW5ncyBkaWN0aW9uYXJpZXMgaW4gY2FuZGlkYXRlcywga2VlcCB0aG9zZQog ICAgICAgICAvLyAgICAgc2V0dGluZ3MgZGljdGlvbmFyaWVzIGluIGNhbmRpZGF0ZXMsIGRpc2Nh cmRpbmcgb3RoZXJzLgpAQCAtNjg5LDcgKzY3MSw3IEBAIGJvb2wgUmVhbHRpbWVNZWRpYVNvdXJj ZTo6c2VsZWN0U2V0dGluZ3MoY29uc3QgTWVkaWFDb25zdHJhaW50cyYgY29uc3RyYWludHMsIEZs CiAgICAgLy8gICAgVGhlIFVBIHNob3VsZCB1c2UgdGhlIG9uZSB3aXRoIHRoZSBzbWFsbGVzdCBm aXRuZXNzIGRpc3RhbmNlLCBhcyBjYWxjdWxhdGVkIGluIHN0ZXAgMy4KICAgICBpZiAoIXN1cHBv cnRlZENvbnN0cmFpbnRzLmlzRW1wdHkoKSkgewogICAgICAgICBzdXBwb3J0ZWRDb25zdHJhaW50 cy5yZW1vdmVBbGxNYXRjaGluZyhbJl0oY29uc3Qgc3RkOjpwYWlyPGRvdWJsZSwgTWVkaWFUcmFj a0NvbnN0cmFpbnRTZXRNYXA+JiBwYWlyKSAtPiBib29sIHsKLSAgICAgICAgICAgIHJldHVybiBz dGQ6OmlzaW5mKHBhaXIuZmlyc3QpIHx8IHBhaXIuZmlyc3QgPiBtX2ZpdG5lc3NTY29yZTsKKyAg ICAgICAgICAgIHJldHVybiBzdGQ6OmlzaW5mKHBhaXIuZmlyc3QpIHx8IHBhaXIuZmlyc3QgPiBt aW5pbXVtRGlzdGFuY2U7CiAgICAgICAgIH0pOwogCiAgICAgICAgIGlmICghc3VwcG9ydGVkQ29u c3RyYWludHMuaXNFbXB0eSgpKSB7CkBAIC02OTgsNyArNjgwLDcgQEAgYm9vbCBSZWFsdGltZU1l ZGlhU291cmNlOjpzZWxlY3RTZXR0aW5ncyhjb25zdCBNZWRpYUNvbnN0cmFpbnRzJiBjb25zdHJh aW50cywgRmwKICAgICAgICAgICAgICAgICBjYW5kaWRhdGVzLm1lcmdlKGNvbnN0cmFpbnQpOwog ICAgICAgICAgICAgfSk7CiAKLSAgICAgICAgICAgIG1fZml0bmVzc1Njb3JlID0gc3RkOjptaW4o bV9maXRuZXNzU2NvcmUsIHN1cHBvcnRlZENvbnN0cmFpbnRzWzBdLmZpcnN0KTsKKyAgICAgICAg ICAgIG1pbmltdW1EaXN0YW5jZSA9IHN0ZDo6bWluKG1pbmltdW1EaXN0YW5jZSwgc3VwcG9ydGVk Q29uc3RyYWludHNbMF0uZmlyc3QpOwogICAgICAgICB9CiAgICAgfQogCkBAIC03ODcsOSArNzY5 LDM1IEBAIGJvb2wgUmVhbHRpbWVNZWRpYVNvdXJjZTo6c3VwcG9ydHNDb25zdHJhaW50cyhjb25z dCBNZWRpYUNvbnN0cmFpbnRzJiBjb25zdHJhaW50CiAgICAgQVNTRVJUKGNvbnN0cmFpbnRzLmlz VmFsaWQpOwogCiAgICAgRmxhdHRlbmVkQ29uc3RyYWludCBjYW5kaWRhdGVzOwotICAgIGlmICgh c2VsZWN0U2V0dGluZ3MoY29uc3RyYWludHMsIGNhbmRpZGF0ZXMsIGludmFsaWRDb25zdHJhaW50 LCBTZWxlY3RUeXBlOjpGb3JTdXBwb3J0c0NvbnN0cmFpbnRzKSkKKyAgICBpZiAoIXNlbGVjdFNl dHRpbmdzKGNvbnN0cmFpbnRzLCBjYW5kaWRhdGVzLCBpbnZhbGlkQ29uc3RyYWludCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKLSAgICAKKworICAgIG1fZml0bmVzc1Njb3JlID0gMDsKKyAgICBm b3IgKGF1dG8mIHZhcmlhbnQgOiBjYW5kaWRhdGVzKSB7CisgICAgICAgIGRvdWJsZSBkaXN0YW5j ZSA9IGZpdG5lc3NEaXN0YW5jZSh2YXJpYW50KTsKKyAgICAgICAgc3dpdGNoICh2YXJpYW50LmNv bnN0cmFpbnRUeXBlKCkpIHsKKyAgICAgICAgY2FzZSBNZWRpYUNvbnN0cmFpbnRUeXBlOjpEZXZp Y2VJZDoKKyAgICAgICAgY2FzZSBNZWRpYUNvbnN0cmFpbnRUeXBlOjpGYWNpbmdNb2RlOgorICAg ICAgICAgICAgbV9maXRuZXNzU2NvcmUgKz0gZGlzdGFuY2UgPyAxIDogMzI7CisgICAgICAgICAg ICBicmVhazsKKworICAgICAgICBjYXNlIE1lZGlhQ29uc3RyYWludFR5cGU6OldpZHRoOgorICAg ICAgICBjYXNlIE1lZGlhQ29uc3RyYWludFR5cGU6OkhlaWdodDoKKyAgICAgICAgY2FzZSBNZWRp YUNvbnN0cmFpbnRUeXBlOjpGcmFtZVJhdGU6CisgICAgICAgIGNhc2UgTWVkaWFDb25zdHJhaW50 VHlwZTo6QXNwZWN0UmF0aW86CisgICAgICAgIGNhc2UgTWVkaWFDb25zdHJhaW50VHlwZTo6Vm9s dW1lOgorICAgICAgICBjYXNlIE1lZGlhQ29uc3RyYWludFR5cGU6OlNhbXBsZVJhdGU6CisgICAg ICAgIGNhc2UgTWVkaWFDb25zdHJhaW50VHlwZTo6U2FtcGxlU2l6ZToKKyAgICAgICAgY2FzZSBN ZWRpYUNvbnN0cmFpbnRUeXBlOjpFY2hvQ2FuY2VsbGF0aW9uOgorICAgICAgICBjYXNlIE1lZGlh Q29uc3RyYWludFR5cGU6Okdyb3VwSWQ6CisgICAgICAgIGNhc2UgTWVkaWFDb25zdHJhaW50VHlw ZTo6RGlzcGxheVN1cmZhY2U6CisgICAgICAgIGNhc2UgTWVkaWFDb25zdHJhaW50VHlwZTo6TG9n aWNhbFN1cmZhY2U6CisgICAgICAgIGNhc2UgTWVkaWFDb25zdHJhaW50VHlwZTo6VW5rbm93bjoK KyAgICAgICAgICAgIG1fZml0bmVzc1Njb3JlICs9IGRpc3RhbmNlID8gMSA6IDI7CisgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KKwogICAgIHJldHVybiB0cnVlOwogfQogCkBA IC04NDgsNyArODU2LDcgQEAgT3B0aW9uYWw8c3RkOjpwYWlyPFN0cmluZywgU3RyaW5nPj4gUmVh bHRpbWVNZWRpYVNvdXJjZTo6YXBwbHlDb25zdHJhaW50cyhjb25zdAogCiAgICAgRmxhdHRlbmVk Q29uc3RyYWludCBjYW5kaWRhdGVzOwogICAgIFN0cmluZyBmYWlsZWRDb25zdHJhaW50OwotICAg IGlmICghc2VsZWN0U2V0dGluZ3MoY29uc3RyYWludHMsIGNhbmRpZGF0ZXMsIGZhaWxlZENvbnN0 cmFpbnQsIFNlbGVjdFR5cGU6OkZvckFwcGx5Q29uc3RyYWludHMpKQorICAgIGlmICghc2VsZWN0 U2V0dGluZ3MoY29uc3RyYWludHMsIGNhbmRpZGF0ZXMsIGZhaWxlZENvbnN0cmFpbnQpKQogICAg ICAgICByZXR1cm4geyB7IGZhaWxlZENvbnN0cmFpbnQsICJDb25zdHJhaW50IG5vdCBzdXBwb3J0 ZWQiX3MgfSB9OwogCiAgICAgYXBwbHlDb25zdHJhaW50cyhjYW5kaWRhdGVzKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3Vy Y2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFT b3VyY2UuaAppbmRleCA3OWE3OWUxMDU4ODZkZjVjOTkwODk0MTA1ZjJlMTA4ODdjZWIyZDAwLi5l ODYyYWFjZjdiNTAxNzVkZDI4ZmY0MDg0ODgwYjAxZjY4Y2U2YzFkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJj ZS5oCkBAIC0xODUsOCArMTg1LDcgQEAgcHJvdGVjdGVkOgogICAgIHZpcnR1YWwgdm9pZCBiZWdp bkNvbmZpZ3VyYXRpb24oKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgY29tbWl0Q29uZmlndXJhdGlv bigpIHsgfQogCi0gICAgZW51bSBjbGFzcyBTZWxlY3RUeXBlIHsgRm9yQXBwbHlDb25zdHJhaW50 cywgRm9yU3VwcG9ydHNDb25zdHJhaW50cyB9OwotICAgIGJvb2wgc2VsZWN0U2V0dGluZ3MoY29u c3QgTWVkaWFDb25zdHJhaW50cyYsIEZsYXR0ZW5lZENvbnN0cmFpbnQmLCBTdHJpbmcmLCBTZWxl Y3RUeXBlKTsKKyAgICBib29sIHNlbGVjdFNldHRpbmdzKGNvbnN0IE1lZGlhQ29uc3RyYWludHMm LCBGbGF0dGVuZWRDb25zdHJhaW50JiwgU3RyaW5nJik7CiAgICAgZG91YmxlIGZpdG5lc3NEaXN0 YW5jZShjb25zdCBNZWRpYUNvbnN0cmFpbnQmKTsKICAgICB2b2lkIGFwcGx5Q29uc3RyYWludChj b25zdCBNZWRpYUNvbnN0cmFpbnQmKTsKICAgICB2b2lkIGFwcGx5Q29uc3RyYWludHMoY29uc3Qg RmxhdHRlbmVkQ29uc3RyYWludCYpOwpAQCAtMjMxLDcgKzIzMCw3IEBAIHByaXZhdGU6CiAgICAg ZG91YmxlIG1fdm9sdW1lIHsgMSB9OwogICAgIGRvdWJsZSBtX3NhbXBsZVJhdGUgeyAwIH07CiAg ICAgZG91YmxlIG1fc2FtcGxlU2l6ZSB7IDAgfTsKLSAgICBkb3VibGUgbV9maXRuZXNzU2NvcmUg eyBzdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46OmluZmluaXR5KCkgfTsKKyAgICBkb3VibGUg bV9maXRuZXNzU2NvcmUgeyAwIH07CiAgICAgUmVhbHRpbWVNZWRpYVNvdXJjZVNldHRpbmdzOjpW aWRlb0ZhY2luZ01vZGUgbV9mYWNpbmdNb2RlIHsgUmVhbHRpbWVNZWRpYVNvdXJjZVNldHRpbmdz OjpVc2VyfTsKIAogICAgIGJvb2wgbV9wZW5kaW5nU2V0dGluZ3NEaWRDaGFuZ2VOb3RpZmljYXRp b24geyBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlQ2VudGVyLmNwcAppbmRleCAyOTBi MzExODE1MDM3NDE1NTA2ZjU3ODljOTYxZmZkNGFiYjExZTBlLi4zNzA2ZmFkN2ZmYzAzZjdlY2Nl NmVmMzhjNDFiN2FlM2QyZDM1MzM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlQ2VudGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlQ2VudGVyLmNw cApAQCAtMjI1LDcgKzIyNSw3IEBAIHZvaWQgUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlcjo6dmFs aWRhdGVSZXF1ZXN0Q29uc3RyYWludHMoVmFsaWRDb25zdHJhaW50c0hhbmRsCiAgICAgc3RydWN0 IHsKICAgICAgICAgYm9vbCBvcGVyYXRvcigpKGNvbnN0IERldmljZUluZm8mIGEsIGNvbnN0IERl dmljZUluZm8mIGIpCiAgICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiBhLmZpdG5lc3NTY29y ZSA8IGIuZml0bmVzc1Njb3JlOworICAgICAgICAgICAgcmV0dXJuIGEuZml0bmVzc1Njb3JlID4g Yi5maXRuZXNzU2NvcmU7CiAgICAgICAgIH0KICAgICB9IHNvcnRCYXNlZE9uRml0bmVzc1Njb3Jl OwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggNmQ2MzQ5MzJlNWEyMGIzOTNkNTEzMmI2OGQ4ODYwMzU2NDM4NzAyYi4uZTlj ZjU5YWQyNThhNzE0Zjg2NDc1NDEwNzM0ZDBhYTkwMjY5MWJkNyAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDE5LTAyLTEzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAg ICAgICBnZXRVc2VyTWVkaWEgd2l0aCBhbiBpZGVhbCBkZXZpY2VJZCBjb25zdHJhaW50IGRvZXNu J3QgYWx3YXlzIHNlbGVjdCB0aGUgY29ycmVjdCBkZXZpY2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzYxNAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9tZWRpYXN0cmVhbS9nZXQtdXNlci1t ZWRpYS1kZXZpY2UtaWQtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0v Z2V0LXVzZXItbWVkaWEtZGV2aWNlLWlkLmh0bWw6CisKIDIwMTktMDItMDggIFlvdWVubiBGYWJs ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgUmVxdWVzdCBjb25zdHJ1Y3Rv ciB0aHJvdyBpZiBGZXRjaFJlcXVlc3RJbml0LnNpZ25hbCBpcyBub3QgdW5kZWZpbmVkLCBudWxs IG9yIGFuIEFib3J0U2lnbmFsIG9iamVjdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9t ZWRpYXN0cmVhbS9nZXQtdXNlci1tZWRpYS1kZXZpY2UtaWQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9nZXQtdXNlci1tZWRpYS1kZXZpY2UtaWQtZXhwZWN0ZWQu dHh0CmluZGV4IDY4MzFhMTY3ZDlhNGEwMDE5ZDZjMjI1MTAyOTYxMGM4NzUyYmJhMmQuLmI0OTg5 MTE5MjgxMTIzMWZjOGExYzIxMmVlZDRlNDA5ODcxNjdhYWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2Zhc3QvbWVkaWFzdHJlYW0vZ2V0LXVzZXItbWVkaWEtZGV2aWNlLWlkLWV4cGVjdGVkLnR4 dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL2dldC11c2VyLW1lZGlhLWRldmlj ZS1pZC1leHBlY3RlZC50eHQKQEAgLTQsNCArNCw1IEBAIFBBU1MgQ29sbGVjdCBkZXZpY2UgSURz CiBQQVNTIFBhc3MgZGV2aWNlIElEcyBhcyBleGFjdCBjb25zdHJhaW50cyAKIFBBU1MgUGFzcyBk ZXZpY2UgSURzIGFzIG9wdGlvbmFsIGNvbnN0cmFpbnRzIAogUEFTUyBFeGFjdCBkZXZpY2UgSURz IHdpdGggc3BlY2lhbCB2YWx1ZXM6IGVtcHR5IHN0cmluZywgbnVsbCwgdW5kZWZpbmVkIAorUEFT UyBJZGVhbCBkZXZpY2VJZCBjb25zdHJhaW50cyAKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9tZWRpYXN0cmVhbS9nZXQtdXNlci1tZWRpYS1kZXZpY2UtaWQuaHRtbCBiL0xheW91dFRl c3RzL2Zhc3QvbWVkaWFzdHJlYW0vZ2V0LXVzZXItbWVkaWEtZGV2aWNlLWlkLmh0bWwKaW5kZXgg ZDAyMDY5ZmVjN2EyZTE0M2EwNGU3ZDFiOGFhNDZhOWQ0YTcwMWU2OC4uZjk2MjFhZTUxMjNjNDhj YjNjNzdhMTlkYTgyZjY2MTM4ZmQzOTM3OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9t ZWRpYXN0cmVhbS9nZXQtdXNlci1tZWRpYS1kZXZpY2UtaWQuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9mYXN0L21lZGlhc3RyZWFtL2dldC11c2VyLW1lZGlhLWRldmljZS1pZC5odG1sCkBAIC02NSw3 ICs2NSw3IEBACiAgICAgICAgIHJldHVybiBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJN ZWRpYShjb25zdHJhaW50cykKICAgICAgICAgICAgIC50aGVuKChzdHJlYW0pID0+IHsKICAgICAg ICAgICAgICAgICBhc3NlcnRfZXF1YWxzKHN0cmVhbS5nZXRBdWRpb1RyYWNrcygpLmxlbmd0aCwg MSwgImNvcnJlY3QgbnVtYmVyIG9mIGF1ZGlvIHRyYWNrcyIpOwotICAgICAgICAgICAgICAgIGFz c2VydF9lcXVhbHMoc3RyZWFtLmdldFZpZGVvVHJhY2tzKCkubGVuZ3RoLCAxLCAiY29ycmVjdCBu dW1iZXIgb2YgYXVkaW8gdHJhY2tzIik7CisgICAgICAgICAgICAgICAgYXNzZXJ0X2VxdWFscyhz dHJlYW0uZ2V0VmlkZW9UcmFja3MoKS5sZW5ndGgsIDEsICJjb3JyZWN0IG51bWJlciBvZiB2aWRl byB0cmFja3MiKTsKICAgICAgICAgICAgIH0pCiAKICAgICB9LCAiUGFzcyBkZXZpY2UgSURzIGFz IG9wdGlvbmFsIGNvbnN0cmFpbnRzIik7CkBAIC03OSw2ICs3OSwyMCBAQAogICAgICAgICBhd2Fp dCBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7IGF1ZGlvOiB7ZGV2aWNlSWQ6 IHtleGFjdDogInRlc3QifX19KS50aGVuKGFzc2VydF91bnJlYWNoZWQsICgpID0+IHsgfSk7CiAg ICAgfSwgIkV4YWN0IGRldmljZSBJRHMgd2l0aCBzcGVjaWFsIHZhbHVlczogZW1wdHkgc3RyaW5n LCBudWxsLCB1bmRlZmluZWQiKTsKIAorICAgIHByb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4g eworICAgICAgICBhd2FpdCBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7dmlk ZW86IHRydWV9KTsKKyAgICAgICAgY29uc3QgZGV2aWNlcyAgPSBhd2FpdCBuYXZpZ2F0b3IubWVk aWFEZXZpY2VzLmVudW1lcmF0ZURldmljZXMoKTsKKyAgICAgICAgZm9yIChsZXQgZGV2aWNlIG9m IGRldmljZXMpIHsKKyAgICAgICAgICAgIGlmIChkZXZpY2Uua2luZCA9PT0gImF1ZGlvaW5wdXQi KSB7CisgICAgICAgICAgICAgICAgY29uc3Qgc3RyZWFtID0gYXdhaXQgbmF2aWdhdG9yLm1lZGlh RGV2aWNlcy5nZXRVc2VyTWVkaWEoe2F1ZGlvOiB7ZGV2aWNlSWQ6IGRldmljZS5kZXZpY2VJZH19 KTsKKyAgICAgICAgICAgICAgICBhc3NlcnRfZXF1YWxzKHN0cmVhbS5nZXRBdWRpb1RyYWNrcygp WzBdLmdldFNldHRpbmdzKCkuZGV2aWNlSWQsIGRldmljZS5kZXZpY2VJZCwgIk1hdGNoaW5nIGF1 ZGlvIGRldmljZSBpZCIpOworICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBj b25zdCBzdHJlYW0gPSBhd2FpdCBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7 dmlkZW86IHtkZXZpY2VJZDogZGV2aWNlLmRldmljZUlkfX0pOworICAgICAgICAgICAgICAgIGFz c2VydF9lcXVhbHMoc3RyZWFtLmdldFZpZGVvVHJhY2tzKClbMF0uZ2V0U2V0dGluZ3MoKS5kZXZp Y2VJZCwgZGV2aWNlLmRldmljZUlkLCAiTWF0Y2hpbmcgdmlkZW8gZGV2aWNlIGlkIik7CisgICAg ICAgICAgICB9CisgICAgICAgIH0KKyAgICB9LCAiSWRlYWwgZGV2aWNlSWQgY29uc3RyYWludHMi KTsKKwogICAgIDwvc2NyaXB0PgogPC9oZWFkPgogPGJvZHk+Cg== 361934 2019-02-13 13:50:03 -0800 2019-02-13 17:25:44 -0800 Patch bug-193614-20190213135002.patch text/plain 18222 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxNDUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjJhZGFjNjIwN2RmYTM2 OTBlYWU1OWE5NjNmYTFkYjYyODQ3ZTc0Ni4uMGM4M2NiYzg5YTY3Yjk3OWVjNTI1YzZkZGExOWQ4 YzlmZjI1NTU0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE5LTAyLTEzICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPiBhbmQgWW91ZW5uIEZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgZ2V0VXNlck1lZGlhIHdpdGggYW4gaWRlYWwgZGV2 aWNlSWQgY29uc3RyYWludCBkb2Vzbid0IGFsd2F5cyBzZWxlY3QgdGhlIGNvcnJlY3QgZGV2aWNl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTM2MTQK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21wdXRl IGEgZml0bmVzcyBzY29yZSBiYXNlZCBvbiBjb25zdHJhaW50cy4KKyAgICAgICAgRm9yIGVhY2gg Y29uc3RyYWludCwgYSBmaXRuZXNzIHNjb3JlIGlzIGNvbXB1dGVkIGZyb20gdGhlIGRpc3RhbmNl LgorICAgICAgICBUaGUgc21hbGxlciB0aGUgZGlzdGFuY2UsIHRoZSBoaWdoZXIgdGhlIHNjb3Jl LgorICAgICAgICBGaXRuZXNzIHNjb3JlcyBhcmUgdGhlbiBzdW1tZWQgdG8gZ2l2ZSBhIGRldmlj ZSBmaXRuZXNzIHNjb3JlLgorICAgICAgICBNYXRjaGluZyBkZXZpY2VzIGFyZSB0aGVuIHNvcnRl ZCBhY2NvcmRpbmcgdGhlIGZpdG5lc3Mgc2NvcmUuCisKKyAgICAgICAgRm9yIGltcG9ydGFudCBj b25zdHJhaW50cywgZGV2aWNlSWQgYW5kIGZhY2luZ01vZGUsIGFkZCBhIG1vcmUgaW1wb3J0YW50 IHdlaWdodC4KKyAgICAgICAgVGhpcyBlbnN1cmVzIHRoYXQgc2hvdWxkIGFueSBvZiB0aGVzZSBp ZGVhbCBjb25zdHJhaW50cyBhcmUgc2V0LCB0aGV5IHdpbGwgYmUgcmVzcGVjdGVkLgorCisgICAg ICAgIFJlc3RyaWN0IG91ciBhdXRvbWF0aWMgc2V0dGluZyBvZiBkZWZhdWx0IGNvbnN0cmFpbnRz IHRvIG5vdCBhZGQgYSBkZWZhdWx0IGlkZWFsIGZhY2luZ01vZGUgaW4gY2FzZSBvZiBleGlzdGlu ZyBkZXZpY2VJZCBjb25zdHJhaW50LgorICAgICAgICBEbyBub3Qgc2V0IGEgZGVmYXVsdCBpZGVh bCBmcmFtZVJhdGUgaWYgd2lkdGggYW5kIGhlaWdodCBhcmUgYWxyZWFkeSBzZXQuCisKKyAgICAg ICAgQ292ZXJlZCBieSB1cGRhdGVkIHRlc3QuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0 cmVhbS9NZWRpYUNvbnN0cmFpbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZsYXR0ZW5lZENv bnN0cmFpbnQ6OnNldCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnN0cmFpbnRzOjpzZXRE ZWZhdWx0VmlkZW9Db25zdHJhaW50cyk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0v UmVhbHRpbWVNZWRpYVNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGltZU1lZGlh U291cmNlOjpmaXRuZXNzRGlzdGFuY2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVhbHRpbWVNZWRp YVNvdXJjZTo6c2VsZWN0U2V0dGluZ3MpOgorICAgICAgICAoV2ViQ29yZTo6UmVhbHRpbWVNZWRp YVNvdXJjZTo6c3VwcG9ydHNDb25zdHJhaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGlt ZU1lZGlhU291cmNlOjphcHBseUNvbnN0cmFpbnRzKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRp YXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmg6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFz dHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZWFsdGltZU1lZGlhU291cmNlQ2VudGVyOjp2YWxpZGF0ZVJlcXVlc3RDb25zdHJhaW50cyk6CisK IDIwMTktMDItMTMgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CiAKICAgICAg ICAgU3RvcmUgQWQgQ2xpY2sgQXR0cmlidXRpb24gcmVxdWVzdHMgaW4gdGhlIG5ldHdvcmsgcHJv Y2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVk aWFDb25zdHJhaW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9N ZWRpYUNvbnN0cmFpbnRzLmNwcAppbmRleCA2MGRlYTcxYTJmOTliNTE4MDMzZTFlODFkMWQ4ODI3 ZWE4NmI1ZWQzLi43YzQwZTIzZGIyOWM0MDdlYzY2ZjhiYjM5ZGI4NDM2OTVkMmE1MzAxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYUNvbnN0cmFp bnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9NZWRpYUNv bnN0cmFpbnRzLmNwcApAQCAtMTIzLDEwICsxMjMsOCBAQCB2b2lkIFN0cmluZ0NvbnN0cmFpbnQ6 Om1lcmdlKGNvbnN0IE1lZGlhQ29uc3RyYWludCYgb3RoZXIpCiAKIHZvaWQgRmxhdHRlbmVkQ29u c3RyYWludDo6c2V0KGNvbnN0IE1lZGlhQ29uc3RyYWludCYgY29uc3RyYWludCkKIHsKLSAgICBm b3IgKGF1dG8mIHZhcmlhbnQgOiBtX3ZhcmlhbnRzKSB7Ci0gICAgICAgIGlmICh2YXJpYW50LmNv bnN0cmFpbnRUeXBlKCkgPT0gY29uc3RyYWludC5jb25zdHJhaW50VHlwZSgpKQotICAgICAgICAg ICAgcmV0dXJuOwotICAgIH0KKyAgICBpZiAoZmluZChjb25zdHJhaW50LmNvbnN0cmFpbnRUeXBl KCkpKQorICAgICAgICByZXR1cm47CiAKICAgICBhcHBlbmQoY29uc3RyYWludCk7CiB9CkBAIC0z OTEsMjMgKzM4OSwyMCBAQCBib29sIE1lZGlhQ29uc3RyYWludHM6OmlzQ29uc3RyYWludFNldChj b25zdCBXVEY6OkZ1bmN0aW9uPGJvb2woY29uc3QgTWVkaWFUcmFjawogCiB2b2lkIE1lZGlhQ29u c3RyYWludHM6OnNldERlZmF1bHRWaWRlb0NvbnN0cmFpbnRzKCkKIHsKLSAgICAvLyA2NDB4NDgw LCAzMGZwcywgZm9udC1mYWNpbmcgY2FtZXJhCi0gICAgYm9vbCBoYXNGcmFtZVJhdGVDb25zdHJh aW50cyA9IGlzQ29uc3RyYWludFNldChbXShjb25zdCBNZWRpYVRyYWNrQ29uc3RyYWludFNldE1h cCYgY29uc3RyYWludCkgewotICAgICAgICByZXR1cm4gISFjb25zdHJhaW50LmZyYW1lUmF0ZSgp OworICAgIC8vIDY0MHg0ODAsIDMwZnBzLCBmcm9udC1mYWNpbmcgY2FtZXJhCisgICAgYm9vbCBu ZWVkc0ZyYW1lUmF0ZUNvbnN0cmFpbnRzID0gIWlzQ29uc3RyYWludFNldChbXShjb25zdCBNZWRp YVRyYWNrQ29uc3RyYWludFNldE1hcCYgY29uc3RyYWludCkgeworICAgICAgICByZXR1cm4gISFj b25zdHJhaW50LmZyYW1lUmF0ZSgpIHx8ICEhY29uc3RyYWludC53aWR0aCgpIHx8ICEhY29uc3Ry YWludC5oZWlnaHQoKTsKICAgICB9KTsKICAgICAKLSAgICBib29sIGhhc1NpemVDb25zdHJhaW50 cyA9IGlzQ29uc3RyYWludFNldChbXShjb25zdCBNZWRpYVRyYWNrQ29uc3RyYWludFNldE1hcCYg Y29uc3RyYWludCkgeworICAgIGJvb2wgbmVlZHNTaXplQ29uc3RyYWludHMgPSAhaXNDb25zdHJh aW50U2V0KFtdKGNvbnN0IE1lZGlhVHJhY2tDb25zdHJhaW50U2V0TWFwJiBjb25zdHJhaW50KSB7 CiAgICAgICAgIHJldHVybiAhIWNvbnN0cmFpbnQud2lkdGgoKSB8fCAhIWNvbnN0cmFpbnQuaGVp Z2h0KCk7CiAgICAgfSk7CiAgICAgCi0gICAgYm9vbCBoYXNGYWNpbmdNb2RlQ29uc3RyYWludHMg PSBpc0NvbnN0cmFpbnRTZXQoW10oY29uc3QgTWVkaWFUcmFja0NvbnN0cmFpbnRTZXRNYXAmIGNv bnN0cmFpbnQpIHsKLSAgICAgICAgcmV0dXJuICEhY29uc3RyYWludC5mYWNpbmdNb2RlKCk7Cisg ICAgYm9vbCBuZWVkc0ZhY2luZ01vZGVDb25zdHJhaW50cyA9ICFpc0NvbnN0cmFpbnRTZXQoW10o Y29uc3QgTWVkaWFUcmFja0NvbnN0cmFpbnRTZXRNYXAmIGNvbnN0cmFpbnQpIHsKKyAgICAgICAg cmV0dXJuICEhY29uc3RyYWludC5mYWNpbmdNb2RlKCkgfHwgISFjb25zdHJhaW50LmRldmljZUlk KCk7CiAgICAgfSk7CiAgICAgCi0gICAgaWYgKGhhc0ZyYW1lUmF0ZUNvbnN0cmFpbnRzICYmIGhh c1NpemVDb25zdHJhaW50cyAmJiBoYXNGYWNpbmdNb2RlQ29uc3RyYWludHMpCi0gICAgICAgIHJl dHVybjsKLSAgICAKLSAgICBhZGREZWZhdWx0VmlkZW9Db25zdHJhaW50cyhtYW5kYXRvcnlDb25z dHJhaW50cywgIWhhc0ZyYW1lUmF0ZUNvbnN0cmFpbnRzLCAhaGFzU2l6ZUNvbnN0cmFpbnRzLCAh aGFzRmFjaW5nTW9kZUNvbnN0cmFpbnRzKTsKKyAgICBhZGREZWZhdWx0VmlkZW9Db25zdHJhaW50 cyhtYW5kYXRvcnlDb25zdHJhaW50cywgbmVlZHNGcmFtZVJhdGVDb25zdHJhaW50cywgbmVlZHNT aXplQ29uc3RyYWludHMsIG5lZWRzRmFjaW5nTW9kZUNvbnN0cmFpbnRzKTsKIH0KICAgICAKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0aW1l TWVkaWFTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVh bHRpbWVNZWRpYVNvdXJjZS5jcHAKaW5kZXggY2UwZjlhYWE3OTIyZTAyNGI1YmU3MTZlNTRhNzYy YWMyYjYyMjFjMC4uYzgzY2E3NGNiZWYzNTY3ZWI3MWJmYTQ3MjUyZjkzNjA2NmQyOGI5MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRp YVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVh bHRpbWVNZWRpYVNvdXJjZS5jcHAKQEAgLTQxMyw3ICs0MTMsOCBAQCBkb3VibGUgUmVhbHRpbWVN ZWRpYVNvdXJjZTo6Zml0bmVzc0Rpc3RhbmNlKGNvbnN0IE1lZGlhQ29uc3RyYWludCYgY29uc3Ry YWludCkKICAgICB9CiAKICAgICBjYXNlIE1lZGlhQ29uc3RyYWludFR5cGU6OkRldmljZUlkOgot ICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgQVNTRVJUKCFtX2hhc2hlZElE LmlzRW1wdHkoKSk7CisgICAgICAgIHJldHVybiBkb3duY2FzdDxTdHJpbmdDb25zdHJhaW50Pihj b25zdHJhaW50KS5maXRuZXNzRGlzdGFuY2UobV9oYXNoZWRJRCk7CiAgICAgICAgIGJyZWFrOwog CiAgICAgY2FzZSBNZWRpYUNvbnN0cmFpbnRUeXBlOjpHcm91cElkOiB7CkBAIC01NjksOSArNTcw LDkgQEAgdm9pZCBSZWFsdGltZU1lZGlhU291cmNlOjphcHBseUNvbnN0cmFpbnQoY29uc3QgTWVk aWFDb25zdHJhaW50JiBjb25zdHJhaW50KQogICAgIH0KIH0KIAotYm9vbCBSZWFsdGltZU1lZGlh U291cmNlOjpzZWxlY3RTZXR0aW5ncyhjb25zdCBNZWRpYUNvbnN0cmFpbnRzJiBjb25zdHJhaW50 cywgRmxhdHRlbmVkQ29uc3RyYWludCYgY2FuZGlkYXRlcywgU3RyaW5nJiBmYWlsZWRDb25zdHJh aW50LCBTZWxlY3RUeXBlIHR5cGUpCitib29sIFJlYWx0aW1lTWVkaWFTb3VyY2U6OnNlbGVjdFNl dHRpbmdzKGNvbnN0IE1lZGlhQ29uc3RyYWludHMmIGNvbnN0cmFpbnRzLCBGbGF0dGVuZWRDb25z dHJhaW50JiBjYW5kaWRhdGVzLCBTdHJpbmcmIGZhaWxlZENvbnN0cmFpbnQpCiB7Ci0gICAgbV9m aXRuZXNzU2NvcmUgPSBzdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46OmluZmluaXR5KCk7Cisg ICAgZG91YmxlIG1pbmltdW1EaXN0YW5jZSA9IHN0ZDo6bnVtZXJpY19saW1pdHM8ZG91YmxlPjo6 aW5maW5pdHkoKTsKIAogICAgIC8vIGh0dHBzOi8vdzNjLmdpdGh1Yi5pby9tZWRpYWNhcHR1cmUt bWFpbi8jZGZuLXNlbGVjdHNldHRpbmdzCiAgICAgLy8KQEAgLTU5Niw3ICs1OTcsNyBAQCBib29s IFJlYWx0aW1lTWVkaWFTb3VyY2U6OnNlbGVjdFNldHRpbmdzKGNvbnN0IE1lZGlhQ29uc3RyYWlu dHMmIGNvbnN0cmFpbnRzLCBGbAogCiAgICAgLy8gQ2hlY2sgd2lkdGgsIGhlaWdodCBhbmQgZnJh bWUgcmF0ZSBqb2ludGx5LCBiZWNhdXNlIHdoaWxlIHRoZXkgbWF5IGJlIHN1cHBvcnRlZCBpbmRp dmlkdWFsbHkgdGhlIGNvbWJpbmF0aW9uIG1heSBub3QgYmUgc3VwcG9ydGVkLgogICAgIGRvdWJs ZSBkaXN0YW5jZSA9IHN0ZDo6bnVtZXJpY19saW1pdHM8ZG91YmxlPjo6aW5maW5pdHkoKTsKLSAg ICBpZiAoIXN1cHBvcnRzU2l6ZUFuZEZyYW1lUmF0ZShjb25zdHJhaW50cy5tYW5kYXRvcnlDb25z dHJhaW50cy53aWR0aCgpLCBjb25zdHJhaW50cy5tYW5kYXRvcnlDb25zdHJhaW50cy5oZWlnaHQo KSwgY29uc3RyYWludHMubWFuZGF0b3J5Q29uc3RyYWludHMuZnJhbWVSYXRlKCksIGZhaWxlZENv bnN0cmFpbnQsIG1fZml0bmVzc1Njb3JlKSkKKyAgICBpZiAoIXN1cHBvcnRzU2l6ZUFuZEZyYW1l UmF0ZShjb25zdHJhaW50cy5tYW5kYXRvcnlDb25zdHJhaW50cy53aWR0aCgpLCBjb25zdHJhaW50 cy5tYW5kYXRvcnlDb25zdHJhaW50cy5oZWlnaHQoKSwgY29uc3RyYWludHMubWFuZGF0b3J5Q29u c3RyYWludHMuZnJhbWVSYXRlKCksIGZhaWxlZENvbnN0cmFpbnQsIG1pbmltdW1EaXN0YW5jZSkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGNvbnN0cmFpbnRzLm1hbmRhdG9yeUNvbnN0 cmFpbnRzLmZpbHRlcihbJl0oY29uc3QgTWVkaWFDb25zdHJhaW50JiBjb25zdHJhaW50KSB7CkBA IC02MDgsMjUgKzYwOSw2IEBAIGJvb2wgUmVhbHRpbWVNZWRpYVNvdXJjZTo6c2VsZWN0U2V0dGlu Z3MoY29uc3QgTWVkaWFDb25zdHJhaW50cyYgY29uc3RyYWludHMsIEZsCiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KIAotICAgICAgICAvLyBUaGUgZGV2aWNlSWQgY2FuJ3Qg YmUgY2hhbmdlZCwgYW5kIHRoZSBjb25zdHJhaW50IHZhbHVlIGlzIHRoZSBoYXNoZWQgZGV2aWNl IElELCBzbyB2ZXJpZnkgdGhhdCB0aGUKLSAgICAgICAgLy8gZGV2aWNlJ3MgdW5pcXVlIElEIGhh c2hlcyB0byB0aGUgY29uc3RyYWludCB2YWx1ZSBidXQgZG9uJ3QgaW5jbHVkZSB0aGUgY29uc3Ry YWludCBpbiB0aGUgZmxhdHRlbmVkCi0gICAgICAgIC8vIGNvbnN0cmFpbnQgc2V0LgotICAgICAg ICBpZiAoY29uc3RyYWludC5jb25zdHJhaW50VHlwZSgpID09IE1lZGlhQ29uc3RyYWludFR5cGU6 OkRldmljZUlkKSB7Ci0gICAgICAgICAgICBpZiAodHlwZSA9PSBTZWxlY3RUeXBlOjpGb3JBcHBs eUNvbnN0cmFpbnRzKQotICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICAg ICAgQVNTRVJUKGNvbnN0cmFpbnQuaXNTdHJpbmcoKSk7Ci0gICAgICAgICAgICBBU1NFUlQoIW1f aGFzaGVkSUQuaXNFbXB0eSgpKTsKLQotICAgICAgICAgICAgZG91YmxlIGNvbnN0cmFpbnREaXN0 YW5jZSA9IGRvd25jYXN0PFN0cmluZ0NvbnN0cmFpbnQ+KGNvbnN0cmFpbnQpLmZpdG5lc3NEaXN0 YW5jZShtX2hhc2hlZElEKTsKLSAgICAgICAgICAgIGlmIChzdGQ6OmlzaW5mKGNvbnN0cmFpbnRE aXN0YW5jZSkpIHsKLSAgICAgICAgICAgICAgICBmYWlsZWRDb25zdHJhaW50ID0gY29uc3RyYWlu dC5uYW1lKCk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAgICB9Ci0K LSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgfQotCiAgICAgICAgIGRvdWJsZSBj b25zdHJhaW50RGlzdGFuY2UgPSBmaXRuZXNzRGlzdGFuY2UoY29uc3RyYWludCk7CiAgICAgICAg IGlmIChzdGQ6OmlzaW5mKGNvbnN0cmFpbnREaXN0YW5jZSkpIHsKICAgICAgICAgICAgIGZhaWxl ZENvbnN0cmFpbnQgPSBjb25zdHJhaW50Lm5hbWUoKTsKQEAgLTY0MSw3ICs2MjMsNyBAQCBib29s IFJlYWx0aW1lTWVkaWFTb3VyY2U6OnNlbGVjdFNldHRpbmdzKGNvbnN0IE1lZGlhQ29uc3RyYWlu dHMmIGNvbnN0cmFpbnRzLCBGbAogICAgIGlmICghZmFpbGVkQ29uc3RyYWludC5pc0VtcHR5KCkp CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIG1fZml0bmVzc1Njb3JlID0gZGlzdGFuY2U7 CisgICAgbWluaW11bURpc3RhbmNlID0gZGlzdGFuY2U7CiAKICAgICAvLyA0LiBJZiBjYW5kaWRh dGVzIGlzIGVtcHR5LCByZXR1cm4gdW5kZWZpbmVkIGFzIHRoZSByZXN1bHQgb2YgdGhlIFNlbGVj dFNldHRpbmdzKCkgYWxnb3JpdGhtLgogICAgIGlmIChjYW5kaWRhdGVzLmlzRW1wdHkoKSkKQEAg LTY3Nyw3ICs2NTksNyBAQCBib29sIFJlYWx0aW1lTWVkaWFTb3VyY2U6OnNlbGVjdFNldHRpbmdz KGNvbnN0IE1lZGlhQ29uc3RyYWludHMmIGNvbnN0cmFpbnRzLCBGbAogICAgICAgICAgICAgICAg IHN1cHBvcnRlZCA9IHRydWU7CiAgICAgICAgIH0pOwogCi0gICAgICAgIG1fZml0bmVzc1Njb3Jl ID0gc3RkOjptaW4obV9maXRuZXNzU2NvcmUsIGNvbnN0cmFpbnREaXN0YW5jZSk7CisgICAgICAg IG1pbmltdW1EaXN0YW5jZSA9IHN0ZDo6bWluKG1pbmltdW1EaXN0YW5jZSwgY29uc3RyYWludERp c3RhbmNlKTsKIAogICAgICAgICAvLyA1LjIgSWYgdGhlIGZpdG5lc3MgZGlzdGFuY2UgaXMgZmlu aXRlIGZvciBvbmUgb3IgbW9yZSBzZXR0aW5ncyBkaWN0aW9uYXJpZXMgaW4gY2FuZGlkYXRlcywg a2VlcCB0aG9zZQogICAgICAgICAvLyAgICAgc2V0dGluZ3MgZGljdGlvbmFyaWVzIGluIGNhbmRp ZGF0ZXMsIGRpc2NhcmRpbmcgb3RoZXJzLgpAQCAtNjkwLDcgKzY3Miw3IEBAIGJvb2wgUmVhbHRp bWVNZWRpYVNvdXJjZTo6c2VsZWN0U2V0dGluZ3MoY29uc3QgTWVkaWFDb25zdHJhaW50cyYgY29u c3RyYWludHMsIEZsCiAgICAgLy8gICAgVGhlIFVBIHNob3VsZCB1c2UgdGhlIG9uZSB3aXRoIHRo ZSBzbWFsbGVzdCBmaXRuZXNzIGRpc3RhbmNlLCBhcyBjYWxjdWxhdGVkIGluIHN0ZXAgMy4KICAg ICBpZiAoIXN1cHBvcnRlZENvbnN0cmFpbnRzLmlzRW1wdHkoKSkgewogICAgICAgICBzdXBwb3J0 ZWRDb25zdHJhaW50cy5yZW1vdmVBbGxNYXRjaGluZyhbJl0oY29uc3Qgc3RkOjpwYWlyPGRvdWJs ZSwgTWVkaWFUcmFja0NvbnN0cmFpbnRTZXRNYXA+JiBwYWlyKSAtPiBib29sIHsKLSAgICAgICAg ICAgIHJldHVybiBzdGQ6OmlzaW5mKHBhaXIuZmlyc3QpIHx8IHBhaXIuZmlyc3QgPiBtX2ZpdG5l c3NTY29yZTsKKyAgICAgICAgICAgIHJldHVybiBzdGQ6OmlzaW5mKHBhaXIuZmlyc3QpIHx8IHBh aXIuZmlyc3QgPiBtaW5pbXVtRGlzdGFuY2U7CiAgICAgICAgIH0pOwogCiAgICAgICAgIGlmICgh c3VwcG9ydGVkQ29uc3RyYWludHMuaXNFbXB0eSgpKSB7CkBAIC02OTksNyArNjgxLDcgQEAgYm9v bCBSZWFsdGltZU1lZGlhU291cmNlOjpzZWxlY3RTZXR0aW5ncyhjb25zdCBNZWRpYUNvbnN0cmFp bnRzJiBjb25zdHJhaW50cywgRmwKICAgICAgICAgICAgICAgICBjYW5kaWRhdGVzLm1lcmdlKGNv bnN0cmFpbnQpOwogICAgICAgICAgICAgfSk7CiAKLSAgICAgICAgICAgIG1fZml0bmVzc1Njb3Jl ID0gc3RkOjptaW4obV9maXRuZXNzU2NvcmUsIHN1cHBvcnRlZENvbnN0cmFpbnRzWzBdLmZpcnN0 KTsKKyAgICAgICAgICAgIG1pbmltdW1EaXN0YW5jZSA9IHN0ZDo6bWluKG1pbmltdW1EaXN0YW5j ZSwgc3VwcG9ydGVkQ29uc3RyYWludHNbMF0uZmlyc3QpOwogICAgICAgICB9CiAgICAgfQogCkBA IC03ODgsOSArNzcwLDM1IEBAIGJvb2wgUmVhbHRpbWVNZWRpYVNvdXJjZTo6c3VwcG9ydHNDb25z dHJhaW50cyhjb25zdCBNZWRpYUNvbnN0cmFpbnRzJiBjb25zdHJhaW50CiAgICAgQVNTRVJUKGNv bnN0cmFpbnRzLmlzVmFsaWQpOwogCiAgICAgRmxhdHRlbmVkQ29uc3RyYWludCBjYW5kaWRhdGVz OwotICAgIGlmICghc2VsZWN0U2V0dGluZ3MoY29uc3RyYWludHMsIGNhbmRpZGF0ZXMsIGludmFs aWRDb25zdHJhaW50LCBTZWxlY3RUeXBlOjpGb3JTdXBwb3J0c0NvbnN0cmFpbnRzKSkKKyAgICBp ZiAoIXNlbGVjdFNldHRpbmdzKGNvbnN0cmFpbnRzLCBjYW5kaWRhdGVzLCBpbnZhbGlkQ29uc3Ry YWludCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKKworICAgIG1fZml0bmVzc1Njb3Jl ID0gMDsKKyAgICBmb3IgKGF1dG8mIHZhcmlhbnQgOiBjYW5kaWRhdGVzKSB7CisgICAgICAgIGRv dWJsZSBkaXN0YW5jZSA9IGZpdG5lc3NEaXN0YW5jZSh2YXJpYW50KTsKKyAgICAgICAgc3dpdGNo ICh2YXJpYW50LmNvbnN0cmFpbnRUeXBlKCkpIHsKKyAgICAgICAgY2FzZSBNZWRpYUNvbnN0cmFp bnRUeXBlOjpEZXZpY2VJZDoKKyAgICAgICAgY2FzZSBNZWRpYUNvbnN0cmFpbnRUeXBlOjpGYWNp bmdNb2RlOgorICAgICAgICAgICAgbV9maXRuZXNzU2NvcmUgKz0gZGlzdGFuY2UgPyAxIDogMzI7 CisgICAgICAgICAgICBicmVhazsKKworICAgICAgICBjYXNlIE1lZGlhQ29uc3RyYWludFR5cGU6 OldpZHRoOgorICAgICAgICBjYXNlIE1lZGlhQ29uc3RyYWludFR5cGU6OkhlaWdodDoKKyAgICAg ICAgY2FzZSBNZWRpYUNvbnN0cmFpbnRUeXBlOjpGcmFtZVJhdGU6CisgICAgICAgIGNhc2UgTWVk aWFDb25zdHJhaW50VHlwZTo6QXNwZWN0UmF0aW86CisgICAgICAgIGNhc2UgTWVkaWFDb25zdHJh aW50VHlwZTo6Vm9sdW1lOgorICAgICAgICBjYXNlIE1lZGlhQ29uc3RyYWludFR5cGU6OlNhbXBs ZVJhdGU6CisgICAgICAgIGNhc2UgTWVkaWFDb25zdHJhaW50VHlwZTo6U2FtcGxlU2l6ZToKKyAg ICAgICAgY2FzZSBNZWRpYUNvbnN0cmFpbnRUeXBlOjpFY2hvQ2FuY2VsbGF0aW9uOgorICAgICAg ICBjYXNlIE1lZGlhQ29uc3RyYWludFR5cGU6Okdyb3VwSWQ6CisgICAgICAgIGNhc2UgTWVkaWFD b25zdHJhaW50VHlwZTo6RGlzcGxheVN1cmZhY2U6CisgICAgICAgIGNhc2UgTWVkaWFDb25zdHJh aW50VHlwZTo6TG9naWNhbFN1cmZhY2U6CisgICAgICAgIGNhc2UgTWVkaWFDb25zdHJhaW50VHlw ZTo6VW5rbm93bjoKKyAgICAgICAgICAgIG1fZml0bmVzc1Njb3JlICs9IGRpc3RhbmNlID8gMSA6 IDI7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KKwogICAgIHJldHVybiB0 cnVlOwogfQogCkBAIC04NDksNyArODU3LDcgQEAgT3B0aW9uYWw8UmVhbHRpbWVNZWRpYVNvdXJj ZTo6QXBwbHlDb25zdHJhaW50c0Vycm9yPiBSZWFsdGltZU1lZGlhU291cmNlOjphcHBseUMKIAog ICAgIEZsYXR0ZW5lZENvbnN0cmFpbnQgY2FuZGlkYXRlczsKICAgICBTdHJpbmcgZmFpbGVkQ29u c3RyYWludDsKLSAgICBpZiAoIXNlbGVjdFNldHRpbmdzKGNvbnN0cmFpbnRzLCBjYW5kaWRhdGVz LCBmYWlsZWRDb25zdHJhaW50LCBTZWxlY3RUeXBlOjpGb3JBcHBseUNvbnN0cmFpbnRzKSkKKyAg ICBpZiAoIXNlbGVjdFNldHRpbmdzKGNvbnN0cmFpbnRzLCBjYW5kaWRhdGVzLCBmYWlsZWRDb25z dHJhaW50KSkKICAgICAgICAgcmV0dXJuIEFwcGx5Q29uc3RyYWludHNFcnJvciB7IGZhaWxlZENv bnN0cmFpbnQsICJDb25zdHJhaW50IG5vdCBzdXBwb3J0ZWQiX3MgfTsKIAogICAgIGFwcGx5Q29u c3RyYWludHMoY2FuZGlkYXRlcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlLmgKaW5kZXggYWI5ZWQ4N2Q0NGJk NWNkNWMzYmQ3MDdhZTdjODA5NDBhOTA3Y2IyYy4uYWZlMTk3NzkwOGQyMTM3YTRjNmRjZWU2NDkw NzNiZDcxYmI4YjQ1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2UuaApAQCAtMTg4LDggKzE4OCw3IEBAIHBy b3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgYmVnaW5Db25maWd1cmF0aW9uKCkgeyB9CiAgICAg dmlydHVhbCB2b2lkIGNvbW1pdENvbmZpZ3VyYXRpb24oKSB7IH0KIAotICAgIGVudW0gY2xhc3Mg U2VsZWN0VHlwZSB7IEZvckFwcGx5Q29uc3RyYWludHMsIEZvclN1cHBvcnRzQ29uc3RyYWludHMg fTsKLSAgICBib29sIHNlbGVjdFNldHRpbmdzKGNvbnN0IE1lZGlhQ29uc3RyYWludHMmLCBGbGF0 dGVuZWRDb25zdHJhaW50JiwgU3RyaW5nJiwgU2VsZWN0VHlwZSk7CisgICAgYm9vbCBzZWxlY3RT ZXR0aW5ncyhjb25zdCBNZWRpYUNvbnN0cmFpbnRzJiwgRmxhdHRlbmVkQ29uc3RyYWludCYsIFN0 cmluZyYpOwogICAgIGRvdWJsZSBmaXRuZXNzRGlzdGFuY2UoY29uc3QgTWVkaWFDb25zdHJhaW50 Jik7CiAgICAgdm9pZCBhcHBseUNvbnN0cmFpbnQoY29uc3QgTWVkaWFDb25zdHJhaW50Jik7CiAg ICAgdm9pZCBhcHBseUNvbnN0cmFpbnRzKGNvbnN0IEZsYXR0ZW5lZENvbnN0cmFpbnQmKTsKQEAg LTIzNCw3ICsyMzMsNyBAQCBwcml2YXRlOgogICAgIGRvdWJsZSBtX3ZvbHVtZSB7IDEgfTsKICAg ICBkb3VibGUgbV9zYW1wbGVSYXRlIHsgMCB9OwogICAgIGRvdWJsZSBtX3NhbXBsZVNpemUgeyAw IH07Ci0gICAgZG91YmxlIG1fZml0bmVzc1Njb3JlIHsgc3RkOjpudW1lcmljX2xpbWl0czxkb3Vi bGU+OjppbmZpbml0eSgpIH07CisgICAgZG91YmxlIG1fZml0bmVzc1Njb3JlIHsgMCB9OwogICAg IFJlYWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5nczo6VmlkZW9GYWNpbmdNb2RlIG1fZmFjaW5nTW9k ZSB7IFJlYWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5nczo6VXNlcn07CiAKICAgICBib29sIG1fcGVu ZGluZ1NldHRpbmdzRGlkQ2hhbmdlTm90aWZpY2F0aW9uIHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2VD ZW50ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVN ZWRpYVNvdXJjZUNlbnRlci5jcHAKaW5kZXggMjkwYjMxMTgxNTAzNzQxNTUwNmY1Nzg5Yzk2MWZm ZDRhYmIxMWUwZS4uMzcwNmZhZDdmZmMwM2Y3ZWNjZTZlZjM4YzQxYjdhZTNkMmQzNTMzOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRp YVNvdXJjZUNlbnRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlci5jcHAKQEAgLTIyNSw3ICsyMjUsNyBAQCB2b2lk IFJlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXI6OnZhbGlkYXRlUmVxdWVzdENvbnN0cmFpbnRzKFZh bGlkQ29uc3RyYWludHNIYW5kbAogICAgIHN0cnVjdCB7CiAgICAgICAgIGJvb2wgb3BlcmF0b3Io KShjb25zdCBEZXZpY2VJbmZvJiBhLCBjb25zdCBEZXZpY2VJbmZvJiBiKQogICAgICAgICB7Ci0g ICAgICAgICAgICByZXR1cm4gYS5maXRuZXNzU2NvcmUgPCBiLmZpdG5lc3NTY29yZTsKKyAgICAg ICAgICAgIHJldHVybiBhLmZpdG5lc3NTY29yZSA+IGIuZml0bmVzc1Njb3JlOwogICAgICAgICB9 CiAgICAgfSBzb3J0QmFzZWRPbkZpdG5lc3NTY29yZTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDViMDQzMjc5Y2E3NTlm OWY1ZDQ3NzM4NzFkOWMyMDk5ZGE5OWFkNDcuLjUyNGFkZGZiMzI5OTIxMDNhMGRmNjMzZmMzMGVi OGNjODIyNjFmOTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxOS0wMi0xMyAgWW91ZW5uIEZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgZ2V0VXNlck1lZGlhIHdpdGggYW4g aWRlYWwgZGV2aWNlSWQgY29uc3RyYWludCBkb2Vzbid0IGFsd2F5cyBzZWxlY3QgdGhlIGNvcnJl Y3QgZGV2aWNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTM2MTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGZhc3QvbWVkaWFzdHJlYW0vZ2V0LXVzZXItbWVkaWEtZGV2aWNlLWlkLWV4cGVjdGVkLnR4 dDoKKyAgICAgICAgKiBmYXN0L21lZGlhc3RyZWFtL2dldC11c2VyLW1lZGlhLWRldmljZS1pZC5o dG1sOgorCiAyMDE5LTAyLTEzICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgog CiAgICAgICAgIFN0b3JlIEFkIENsaWNrIEF0dHJpYnV0aW9uIHJlcXVlc3RzIGluIHRoZSBuZXR3 b3JrIHByb2Nlc3MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vZ2V0 LXVzZXItbWVkaWEtY29uc3RyYWludHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9t ZWRpYXN0cmVhbS9nZXQtdXNlci1tZWRpYS1jb25zdHJhaW50cy1leHBlY3RlZC50eHQKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uODU2ZmNjNWY5ZWZhOTlhY2FlZWMxYzY0ZGM1NDk5OGUyYWY3YzM1MwotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vZ2V0LXVzZXItbWVkaWEtY29u c3RyYWludHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNCBAQAorCisKK0ZBSUwgSWRlYWwgZGV2 aWNlSWQgY29uc3RyYWludHMgcHJvbWlzZV90ZXN0OiBVbmhhbmRsZWQgcmVqZWN0aW9uIHdpdGgg dmFsdWU6IG9iamVjdCAiRXJyb3I6IEludmFsaWQgY29uc3RyYWludCIKKwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9nZXQtdXNlci1tZWRpYS1jb25zdHJhaW50cy5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9nZXQtdXNlci1tZWRpYS1jb25zdHJh aW50cy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjU1MmNkZWJkY2VmMGY2ZjkyY2EwNWU4ODg4OTg0NmMwNDFi ZDljMzcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL2dl dC11c2VyLW1lZGlhLWNvbnN0cmFpbnRzLmh0bWwKQEAgLTAsMCArMSwyNCBAQAorPCFET0NUWVBF IGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICA8 dGl0bGU+VGVzdCBwYXNzaW5nIGNvbnN0cmFpbnRzIHRvIGdldFVzZXJNZWRpYTwvdGl0bGU+Cisg ICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+ CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+ PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8dmlkZW8gYXV0b3BsYXkgcGxheXNpbmxp bmUgaWQ9ImxvY2FsVmlkZW8iPjwvdmlkZW8+CisgICAgPHNjcmlwdD4KKyAgICBpZiAod2luZG93 LnRlc3RSdW5uZXIpCisgICAgICAgIHRlc3RSdW5uZXIuc2V0VXNlck1lZGlhUGVybWlzc2lvbih0 cnVlKTsKKworICAgIHByb21pc2VfdGVzdChhc3luYyAodGVzdCkgPT4geworICAgICAgICBsb2Nh bFZpZGVvLnNyY09iamVjdCA9IGF3YWl0IG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1l ZGlhKHt2aWRlbzoge3dpZHRoOiB7ZXhhY3Q6IDMwMH19fSk7CisgICAgICAgIGF3YWl0IGxvY2Fs VmlkZW8ucGxheSgpOworCisgICAgICAgIGFzc2VydF9lcXVhbHMobG9jYWxWaWRlby52aWRlb1dp ZHRoLCAzMDApOworICAgIH0sICJJZGVhbCBkZXZpY2VJZCBjb25zdHJhaW50cyIpOworCisgICAg PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L21lZGlhc3RyZWFtL2dldC11c2VyLW1lZGlhLWRldmljZS1pZC1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL2dldC11c2VyLW1lZGlhLWRldmljZS1pZC1leHBlY3Rl ZC50eHQKaW5kZXggNjgzMWExNjdkOWE0YTAwMTlkNmMyMjUxMDI5NjEwYzg3NTJiYmEyZC4uYjQ5 ODkxMTkyODExMjMxZmM4YTFjMjEyZWVkNGU0MDk4NzE2N2FhZCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9nZXQtdXNlci1tZWRpYS1kZXZpY2UtaWQtZXhwZWN0ZWQu dHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vZ2V0LXVzZXItbWVkaWEtZGV2 aWNlLWlkLWV4cGVjdGVkLnR4dApAQCAtNCw0ICs0LDUgQEAgUEFTUyBDb2xsZWN0IGRldmljZSBJ RHMKIFBBU1MgUGFzcyBkZXZpY2UgSURzIGFzIGV4YWN0IGNvbnN0cmFpbnRzIAogUEFTUyBQYXNz IGRldmljZSBJRHMgYXMgb3B0aW9uYWwgY29uc3RyYWludHMgCiBQQVNTIEV4YWN0IGRldmljZSBJ RHMgd2l0aCBzcGVjaWFsIHZhbHVlczogZW1wdHkgc3RyaW5nLCBudWxsLCB1bmRlZmluZWQgCitQ QVNTIElkZWFsIGRldmljZUlkIGNvbnN0cmFpbnRzIAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L21lZGlhc3RyZWFtL2dldC11c2VyLW1lZGlhLWRldmljZS1pZC5odG1sIGIvTGF5b3V0 VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9nZXQtdXNlci1tZWRpYS1kZXZpY2UtaWQuaHRtbAppbmRl eCBkMDIwNjlmZWM3YTJlMTQzYTA0ZTdkMWI4YWE0NmE5ZDRhNzAxZTY4Li5mOTYyMWFlNTEyM2M0 OGNiM2M3N2ExOWRhODJmNjYxMzhmZDM5Mzc4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0 L21lZGlhc3RyZWFtL2dldC11c2VyLW1lZGlhLWRldmljZS1pZC5odG1sCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvbWVkaWFzdHJlYW0vZ2V0LXVzZXItbWVkaWEtZGV2aWNlLWlkLmh0bWwKQEAgLTY1 LDcgKzY1LDcgQEAKICAgICAgICAgcmV0dXJuIG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNl ck1lZGlhKGNvbnN0cmFpbnRzKQogICAgICAgICAgICAgLnRoZW4oKHN0cmVhbSkgPT4gewogICAg ICAgICAgICAgICAgIGFzc2VydF9lcXVhbHMoc3RyZWFtLmdldEF1ZGlvVHJhY2tzKCkubGVuZ3Ro LCAxLCAiY29ycmVjdCBudW1iZXIgb2YgYXVkaW8gdHJhY2tzIik7Ci0gICAgICAgICAgICAgICAg YXNzZXJ0X2VxdWFscyhzdHJlYW0uZ2V0VmlkZW9UcmFja3MoKS5sZW5ndGgsIDEsICJjb3JyZWN0 IG51bWJlciBvZiBhdWRpbyB0cmFja3MiKTsKKyAgICAgICAgICAgICAgICBhc3NlcnRfZXF1YWxz KHN0cmVhbS5nZXRWaWRlb1RyYWNrcygpLmxlbmd0aCwgMSwgImNvcnJlY3QgbnVtYmVyIG9mIHZp ZGVvIHRyYWNrcyIpOwogICAgICAgICAgICAgfSkKIAogICAgIH0sICJQYXNzIGRldmljZSBJRHMg YXMgb3B0aW9uYWwgY29uc3RyYWludHMiKTsKQEAgLTc5LDYgKzc5LDIwIEBACiAgICAgICAgIGF3 YWl0IG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHsgYXVkaW86IHtkZXZpY2VJ ZDoge2V4YWN0OiAidGVzdCJ9fX0pLnRoZW4oYXNzZXJ0X3VucmVhY2hlZCwgKCkgPT4geyB9KTsK ICAgICB9LCAiRXhhY3QgZGV2aWNlIElEcyB3aXRoIHNwZWNpYWwgdmFsdWVzOiBlbXB0eSBzdHJp bmcsIG51bGwsIHVuZGVmaW5lZCIpOwogCisgICAgcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9 PiB7CisgICAgICAgIGF3YWl0IG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHt2 aWRlbzogdHJ1ZX0pOworICAgICAgICBjb25zdCBkZXZpY2VzICA9IGF3YWl0IG5hdmlnYXRvci5t ZWRpYURldmljZXMuZW51bWVyYXRlRGV2aWNlcygpOworICAgICAgICBmb3IgKGxldCBkZXZpY2Ug b2YgZGV2aWNlcykgeworICAgICAgICAgICAgaWYgKGRldmljZS5raW5kID09PSAiYXVkaW9pbnB1 dCIpIHsKKyAgICAgICAgICAgICAgICBjb25zdCBzdHJlYW0gPSBhd2FpdCBuYXZpZ2F0b3IubWVk aWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7YXVkaW86IHtkZXZpY2VJZDogZGV2aWNlLmRldmljZUlk fX0pOworICAgICAgICAgICAgICAgIGFzc2VydF9lcXVhbHMoc3RyZWFtLmdldEF1ZGlvVHJhY2tz KClbMF0uZ2V0U2V0dGluZ3MoKS5kZXZpY2VJZCwgZGV2aWNlLmRldmljZUlkLCAiTWF0Y2hpbmcg YXVkaW8gZGV2aWNlIGlkIik7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAg IGNvbnN0IHN0cmVhbSA9IGF3YWl0IG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlh KHt2aWRlbzoge2RldmljZUlkOiBkZXZpY2UuZGV2aWNlSWR9fSk7CisgICAgICAgICAgICAgICAg YXNzZXJ0X2VxdWFscyhzdHJlYW0uZ2V0VmlkZW9UcmFja3MoKVswXS5nZXRTZXR0aW5ncygpLmRl dmljZUlkLCBkZXZpY2UuZGV2aWNlSWQsICJNYXRjaGluZyB2aWRlbyBkZXZpY2UgaWQiKTsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0sICJJZGVhbCBkZXZpY2VJZCBjb25zdHJhaW50 cyIpOworCiAgICAgPC9zY3JpcHQ+CiA8L2hlYWQ+CiA8Ym9keT4K