186471 2018-06-10 01:49:06 -0700 MediaTrackCapabilities.deviceId and groupId are not hashed. 2018-06-12 08:58:23 -0700 1 1 1 Unclassified WebKit WebRTC Safari Technology Preview Mac macOS 10.13 RESOLVED FIXED InRadar P2 Normal --- 1 jianjun.zhu webkit-unassigned commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1431631 0 jianjun.zhu 2018-06-10 01:49:06 -0700 MediaTrackCapabilities.deviceId and groupId are not hashed. 1431632 1 342381 jianjun.zhu 2018-06-10 01:52:03 -0700 Created attachment 342381 Patch 1431642 2 youennf 2018-06-10 08:26:40 -0700 Can we add a tes validating that track ids match enuerateDevice ids? 1431643 3 jianjun.zhu 2018-06-10 09:00:35 -0700 (In reply to youenn fablet from comment #2) > Can we add a tes validating that track ids match enuerateDevice ids? I'll try to add an assertion to MediaStreamTrack-getCapabilities.html. 1431719 4 342412 jianjun.zhu 2018-06-10 23:33:07 -0700 Created attachment 342412 Patch 1431919 5 342412 eric.carlson 2018-06-11 09:04:26 -0700 Comment on attachment 342412 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=342412&action=review Thank you for the fix! > LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities.html:47 > + if(trackKind !== 'audio' && trackKind !== 'video') Nit: tests typically have a space between "if" and "(" > LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities.html:51 > + if(deviceInfo.deviceId === deviceId && deviceInfo.kind === deviceKind) { Ditto. > LayoutTests/fast/mediastream/MediaStreamTrack-getCapabilities.html:89 > + },e => { Nit: missing a space between "," and "e" 1432168 6 342500 jianjun.zhu 2018-06-11 18:54:57 -0700 Created attachment 342500 Patch 1432276 7 342500 eric.carlson 2018-06-12 07:58:44 -0700 Comment on attachment 342500 Patch r=me 1432277 8 eric.carlson 2018-06-12 08:02:30 -0700 Jianjun - for future reference, a patch doesn't *need* another review once a reviewer give it an "r+". Replace "NOBODY (OOPS!)" with the reviewer's name before you upload the revised patch, mark it "cq?" and any committer can mark it "cq+" 1432283 9 342500 commit-queue 2018-06-12 08:28:20 -0700 Comment on attachment 342500 Patch Clearing flags on attachment: 342500 Committed r232754: <https://trac.webkit.org/changeset/232754> 1432284 10 commit-queue 2018-06-12 08:28:22 -0700 All reviewed patches have been landed. Closing bug. 1432288 11 webkit-bug-importer 2018-06-12 08:29:20 -0700 <rdar://problem/41046888> 1432307 12 jianjun.zhu 2018-06-12 08:58:23 -0700 Eric, thanks for reviewing the patch and letting me know the review process. 342381 2018-06-10 01:52:03 -0700 2018-06-10 23:33:02 -0700 Patch bug-186471-20180610165201.patch text/plain 4085 jianjun.zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzRjNDIxYzBhMjA4Nzc1 NTM5ODc5ZTdlNGRjNzIxZDI0MzRhZDgxMC4uYzI4YTJhNTVhZWE1MDM3NDJmNTI3OGMxMmMxZmJk YzRkYTE0ZjY0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE4LTA2LTEwICBKaWFu anVuIFpodSAgPGppYW5qdW4uemh1QGludGVsLmNvbT4KKworICAgICAgICBIYXNoIGRldmljZUlk IGFuZCBncm91cElkIG9mIE1lZGlhVHJhY2tDYXBhYmlsaXRpZXMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODY0NzEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBtYWtlcyB0aGUgaWRl bnRpZmllciBmb3IgdGhlIHNvdXJjZSBvZiB0aGUgTWVkaWFTdHJlYW1UcmFjaworICAgICAgICBo YXMgdGhlIHNhbWUgdmFsdWUgcmV0dXJuZWQgYnkgZW51bWVyYXRlRGV2aWNlcygpLiBJdCBhbHNv IHByZXZlbnRzIHJlYWwKKyAgICAgICAgZGV2aWNlIElEIGJlaW5nIGxlYWtlZC4KKworICAgICAg ICBObyBuZXcgdGVzdHMgYmVjYXVzZSBkZXZpY2UgSUQgYW5kIGdyb3VwIElEIGNoYW5nZSB3aGVu IHBhZ2UgaXMKKyAgICAgICAgcmVmcmVzaGVkLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0 cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFt VHJhY2s6OmdldENhcGFiaWxpdGllcyBjb25zdCk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0 cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmg6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9N ZWRpYVN0cmVhbVRyYWNrLmlkbDoKKwogMjAxOC0wNi0wNiAgUGVyIEFybmUgVm9sbGFuICA8cHZv bGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgRGlzcGxheSBsaW5rcyBhcmUgc29tZXRpbWVzIG5v dCBub3RpZnlpbmcgV2ViQ29yZSB3aGVuIGZpcmVkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5jcHAKaW5kZXggODY3Njk0 MjVmNzVlZDVkNTFhNmRlNzIxYWI3NWQyOGVlNTYxODUxMi4uM2U1MDkxMzU5NDFmODY3YjY4MmM2 NTJmMjM0NGM0OTE5NzYzOGI3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suY3BwCkBAIC0yMzQsNyArMjM0LDcgQEAg c3RhdGljIFZlY3Rvcjxib29sPiBjYXBhYmlsaXR5Qm9vbGVhblZlY3RvcihSZWFsdGltZU1lZGlh U291cmNlQ2FwYWJpbGl0aWVzOjpFY2gKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi1NZWRpYVN0 cmVhbVRyYWNrOjpUcmFja0NhcGFiaWxpdGllcyBNZWRpYVN0cmVhbVRyYWNrOjpnZXRDYXBhYmls aXRpZXMoKSBjb25zdAorTWVkaWFTdHJlYW1UcmFjazo6VHJhY2tDYXBhYmlsaXRpZXMgTWVkaWFT dHJlYW1UcmFjazo6Z2V0Q2FwYWJpbGl0aWVzKERvY3VtZW50JiBkb2N1bWVudCkgY29uc3QKIHsK ICAgICBhdXRvIGNhcGFiaWxpdGllcyA9IG1fcHJpdmF0ZS0+Y2FwYWJpbGl0aWVzKCk7CiAgICAg VHJhY2tDYXBhYmlsaXRpZXMgcmVzdWx0OwpAQCAtMjU3LDkgKzI1Nyw5IEBAIE1lZGlhU3RyZWFt VHJhY2s6OlRyYWNrQ2FwYWJpbGl0aWVzIE1lZGlhU3RyZWFtVHJhY2s6OmdldENhcGFiaWxpdGll cygpIGNvbnN0CiAgICAgaWYgKGNhcGFiaWxpdGllcy5zdXBwb3J0c0VjaG9DYW5jZWxsYXRpb24o KSkKICAgICAgICAgcmVzdWx0LmVjaG9DYW5jZWxsYXRpb24gPSBjYXBhYmlsaXR5Qm9vbGVhblZl Y3RvcihjYXBhYmlsaXRpZXMuZWNob0NhbmNlbGxhdGlvbigpKTsKICAgICBpZiAoY2FwYWJpbGl0 aWVzLnN1cHBvcnRzRGV2aWNlSWQoKSkKLSAgICAgICAgcmVzdWx0LmRldmljZUlkID0gY2FwYWJp bGl0aWVzLmRldmljZUlkKCk7CisgICAgICAgIHJlc3VsdC5kZXZpY2VJZCA9IFJlYWx0aW1lTWVk aWFTb3VyY2VDZW50ZXI6OnNpbmdsZXRvbigpLmhhc2hTdHJpbmdXaXRoU2FsdChjYXBhYmlsaXRp ZXMuZGV2aWNlSWQoKSwgZG9jdW1lbnQuZGV2aWNlSURIYXNoU2FsdCgpKTsKICAgICBpZiAoY2Fw YWJpbGl0aWVzLnN1cHBvcnRzR3JvdXBJZCgpKQotICAgICAgICByZXN1bHQuZ3JvdXBJZCA9IGNh cGFiaWxpdGllcy5ncm91cElkKCk7CisgICAgICAgIHJlc3VsdC5ncm91cElkID0gUmVhbHRpbWVN ZWRpYVNvdXJjZUNlbnRlcjo6c2luZ2xldG9uKCkuaGFzaFN0cmluZ1dpdGhTYWx0KGNhcGFiaWxp dGllcy5ncm91cElkKCksIGRvY3VtZW50LmRldmljZUlESGFzaFNhbHQoKSk7CiAgICAgcmV0dXJu IHJlc3VsdDsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtVHJhY2suaAppbmRleCBkYTFiMWMwNjA3Yjg3YTE5OWM2MzNhMjliZGM0 ZDQ0ZGNlNzI3NDgzLi4zNDUzODJiYmE0ZjliZjQ2ZWE2ZmNhYzQyMDdkNWVmNDQwYWE1NTJmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFt VHJhY2suaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtVHJhY2suaApAQCAtMTE1LDcgKzExNSw3IEBAIHB1YmxpYzoKICAgICAgICAgU3RyaW5nIGRl dmljZUlkOwogICAgICAgICBTdHJpbmcgZ3JvdXBJZDsKICAgICB9OwotICAgIFRyYWNrQ2FwYWJp bGl0aWVzIGdldENhcGFiaWxpdGllcygpIGNvbnN0OworICAgIFRyYWNrQ2FwYWJpbGl0aWVzIGdl dENhcGFiaWxpdGllcyhEb2N1bWVudCYpIGNvbnN0OwogCiAgICAgY29uc3QgTWVkaWFUcmFja0Nv bnN0cmFpbnRzJiBnZXRDb25zdHJhaW50cygpIGNvbnN0IHsgcmV0dXJuIG1fY29uc3RyYWludHM7 IH0KICAgICB2b2lkIGFwcGx5Q29uc3RyYWludHMoY29uc3Qgc3RkOjpvcHRpb25hbDxNZWRpYVRy YWNrQ29uc3RyYWludHM+JiwgRE9NUHJvbWlzZURlZmVycmVkPHZvaWQ+JiYpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmlk bCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5p ZGwKaW5kZXggOWI3YzQ4OTMzYzdmMWJmZmM3ODY1Nzc2YTQxZGEzMzFlODdmY2ViNy4uNjU1OTQz NmZhNmYyZTQzYTFmZWIxZWEzZjY2M2FiN2QzNjE5YzI1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmlkbAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suaWRsCkBAIC00 Niw3ICs0Niw3IEBAIGVudW0gTWVkaWFTdHJlYW1UcmFja1N0YXRlIHsgImxpdmUiLCAiZW5kZWQi IH07CiAgICAgTWVkaWFTdHJlYW1UcmFjayBjbG9uZSgpOwogICAgIFtJbXBsZW1lbnRlZEFzPXN0 b3BUcmFja10gdm9pZCBzdG9wKCk7CiAKLSAgICBNZWRpYVRyYWNrQ2FwYWJpbGl0aWVzIGdldENh cGFiaWxpdGllcygpOworICAgIFtDYWxsV2l0aD1Eb2N1bWVudF0gTWVkaWFUcmFja0NhcGFiaWxp dGllcyBnZXRDYXBhYmlsaXRpZXMoKTsKICAgICBNZWRpYVRyYWNrQ29uc3RyYWludHMgZ2V0Q29u c3RyYWludHMoKTsKICAgICBbQ2FsbFdpdGg9RG9jdW1lbnRdIE1lZGlhVHJhY2tTZXR0aW5ncyBn ZXRTZXR0aW5ncygpOwogICAgIFByb21pc2U8dm9pZD4gYXBwbHlDb25zdHJhaW50cyhvcHRpb25h bCBNZWRpYVRyYWNrQ29uc3RyYWludHMgY29uc3RyYWludHMpOwo= 342412 2018-06-10 23:33:07 -0700 2018-06-11 18:54:52 -0700 Patch bug-186471-20180611143306.patch text/plain 7458 jianjun.zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzRjNDIxYzBhMjA4Nzc1 NTM5ODc5ZTdlNGRjNzIxZDI0MzRhZDgxMC4uNWFkZTk5YzE3YjAwMjJhYjVkNGU4N2ZlMDU5MDAy NmVlZWE5OWU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA2LTEwICBKaWFu anVuIFpodSAgPGppYW5qdW4uemh1QGludGVsLmNvbT4KKworICAgICAgICBIYXNoIGRldmljZUlk IGFuZCBncm91cElkIG9mIE1lZGlhVHJhY2tDYXBhYmlsaXRpZXMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODY0NzEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBtYWtlcyB0aGUgaWRl bnRpZmllciBmb3IgdGhlIHNvdXJjZSBvZiB0aGUgTWVkaWFTdHJlYW1UcmFjaworICAgICAgICBo YXMgdGhlIHNhbWUgdmFsdWUgcmV0dXJuZWQgYnkgZW51bWVyYXRlRGV2aWNlcygpLiBJdCBhbHNv IHByZXZlbnRzIHJlYWwKKyAgICAgICAgZGV2aWNlIElEIGJlaW5nIGxlYWtlZC4KKworICAgICAg ICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6Z2V0Q2FwYWJpbGl0aWVzIGNvbnN0KToKKyAg ICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suaDoKKyAgICAgICAg KiBNb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suaWRsOgorCiAyMDE4LTA2LTA2 ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNwbGF5 IGxpbmtzIGFyZSBzb21ldGltZXMgbm90IG5vdGlmeWluZyBXZWJDb3JlIHdoZW4gZmlyZWQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFt VHJhY2suY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVh bVRyYWNrLmNwcAppbmRleCA4Njc2OTQyNWY3NWVkNWQ1MWE2ZGU3MjFhYjc1ZDI4ZWU1NjE4NTEy Li4zZTUwOTEzNTk0MWY4NjdiNjgyYzY1MmYyMzQ0YzQ5MTk3NjM4YjdkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5j cHAKQEAgLTIzNCw3ICsyMzQsNyBAQCBzdGF0aWMgVmVjdG9yPGJvb2w+IGNhcGFiaWxpdHlCb29s ZWFuVmVjdG9yKFJlYWx0aW1lTWVkaWFTb3VyY2VDYXBhYmlsaXRpZXM6OkVjaAogICAgIHJldHVy biByZXN1bHQ7CiB9CiAKLU1lZGlhU3RyZWFtVHJhY2s6OlRyYWNrQ2FwYWJpbGl0aWVzIE1lZGlh U3RyZWFtVHJhY2s6OmdldENhcGFiaWxpdGllcygpIGNvbnN0CitNZWRpYVN0cmVhbVRyYWNrOjpU cmFja0NhcGFiaWxpdGllcyBNZWRpYVN0cmVhbVRyYWNrOjpnZXRDYXBhYmlsaXRpZXMoRG9jdW1l bnQmIGRvY3VtZW50KSBjb25zdAogewogICAgIGF1dG8gY2FwYWJpbGl0aWVzID0gbV9wcml2YXRl LT5jYXBhYmlsaXRpZXMoKTsKICAgICBUcmFja0NhcGFiaWxpdGllcyByZXN1bHQ7CkBAIC0yNTcs OSArMjU3LDkgQEAgTWVkaWFTdHJlYW1UcmFjazo6VHJhY2tDYXBhYmlsaXRpZXMgTWVkaWFTdHJl YW1UcmFjazo6Z2V0Q2FwYWJpbGl0aWVzKCkgY29uc3QKICAgICBpZiAoY2FwYWJpbGl0aWVzLnN1 cHBvcnRzRWNob0NhbmNlbGxhdGlvbigpKQogICAgICAgICByZXN1bHQuZWNob0NhbmNlbGxhdGlv biA9IGNhcGFiaWxpdHlCb29sZWFuVmVjdG9yKGNhcGFiaWxpdGllcy5lY2hvQ2FuY2VsbGF0aW9u KCkpOwogICAgIGlmIChjYXBhYmlsaXRpZXMuc3VwcG9ydHNEZXZpY2VJZCgpKQotICAgICAgICBy ZXN1bHQuZGV2aWNlSWQgPSBjYXBhYmlsaXRpZXMuZGV2aWNlSWQoKTsKKyAgICAgICAgcmVzdWx0 LmRldmljZUlkID0gUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlcjo6c2luZ2xldG9uKCkuaGFzaFN0 cmluZ1dpdGhTYWx0KGNhcGFiaWxpdGllcy5kZXZpY2VJZCgpLCBkb2N1bWVudC5kZXZpY2VJREhh c2hTYWx0KCkpOwogICAgIGlmIChjYXBhYmlsaXRpZXMuc3VwcG9ydHNHcm91cElkKCkpCi0gICAg ICAgIHJlc3VsdC5ncm91cElkID0gY2FwYWJpbGl0aWVzLmdyb3VwSWQoKTsKKyAgICAgICAgcmVz dWx0Lmdyb3VwSWQgPSBSZWFsdGltZU1lZGlhU291cmNlQ2VudGVyOjpzaW5nbGV0b24oKS5oYXNo U3RyaW5nV2l0aFNhbHQoY2FwYWJpbGl0aWVzLmdyb3VwSWQoKSwgZG9jdW1lbnQuZGV2aWNlSURI YXNoU2FsdCgpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suaCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oCmluZGV4IGRhMWIx YzA2MDdiODdhMTk5YzYzM2EyOWJkYzRkNDRkY2U3Mjc0ODMuLjM0NTM4MmJiYTRmOWJmNDZlYTZm Y2FjNDIwN2Q1ZWY0NDBhYTU1MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oCkBAIC0xMTUsNyArMTE1LDcgQEAgcHVi bGljOgogICAgICAgICBTdHJpbmcgZGV2aWNlSWQ7CiAgICAgICAgIFN0cmluZyBncm91cElkOwog ICAgIH07Ci0gICAgVHJhY2tDYXBhYmlsaXRpZXMgZ2V0Q2FwYWJpbGl0aWVzKCkgY29uc3Q7Cisg ICAgVHJhY2tDYXBhYmlsaXRpZXMgZ2V0Q2FwYWJpbGl0aWVzKERvY3VtZW50JikgY29uc3Q7CiAK ICAgICBjb25zdCBNZWRpYVRyYWNrQ29uc3RyYWludHMmIGdldENvbnN0cmFpbnRzKCkgY29uc3Qg eyByZXR1cm4gbV9jb25zdHJhaW50czsgfQogICAgIHZvaWQgYXBwbHlDb25zdHJhaW50cyhjb25z dCBzdGQ6Om9wdGlvbmFsPE1lZGlhVHJhY2tDb25zdHJhaW50cz4mLCBET01Qcm9taXNlRGVmZXJy ZWQ8dm9pZD4mJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtVHJhY2suaWRsIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmlkbAppbmRleCA5YjdjNDg5MzNjN2YxYmZmYzc4NjU3NzZh NDFkYTMzMWU4N2ZjZWI3Li42NTU5NDM2ZmE2ZjJlNDNhMWZlYjFlYTNmNjYzYWI3ZDM2MTljMjVk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtVHJhY2suaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVk aWFTdHJlYW1UcmFjay5pZGwKQEAgLTQ2LDcgKzQ2LDcgQEAgZW51bSBNZWRpYVN0cmVhbVRyYWNr U3RhdGUgeyAibGl2ZSIsICJlbmRlZCIgfTsKICAgICBNZWRpYVN0cmVhbVRyYWNrIGNsb25lKCk7 CiAgICAgW0ltcGxlbWVudGVkQXM9c3RvcFRyYWNrXSB2b2lkIHN0b3AoKTsKIAotICAgIE1lZGlh VHJhY2tDYXBhYmlsaXRpZXMgZ2V0Q2FwYWJpbGl0aWVzKCk7CisgICAgW0NhbGxXaXRoPURvY3Vt ZW50XSBNZWRpYVRyYWNrQ2FwYWJpbGl0aWVzIGdldENhcGFiaWxpdGllcygpOwogICAgIE1lZGlh VHJhY2tDb25zdHJhaW50cyBnZXRDb25zdHJhaW50cygpOwogICAgIFtDYWxsV2l0aD1Eb2N1bWVu dF0gTWVkaWFUcmFja1NldHRpbmdzIGdldFNldHRpbmdzKCk7CiAgICAgUHJvbWlzZTx2b2lkPiBh cHBseUNvbnN0cmFpbnRzKG9wdGlvbmFsIE1lZGlhVHJhY2tDb25zdHJhaW50cyBjb25zdHJhaW50 cyk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggOTAwZjhiMjE4NzY3OWU3YTQ2MGYzZDU1ZWQ1Mzc1ZGFhNDZhNTMwZi4uZmI4 MTE5ZDIwMDAzOTk4YzM1MDJhZTExODcwMzgyODQzMzEzZjM1ZCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE4LTA2LTEwICBKaWFuanVuIFpodSAgPGppYW5qdW4uemh1QGludGVsLmNvbT4KKwor ICAgICAgICBIYXNoIGRldmljZUlkIGFuZCBncm91cElkIG9mIE1lZGlhVHJhY2tDYXBhYmlsaXRp ZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODY0 NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IGNoYW5nZSBtYWtlcyB0aGUgaWRlbnRpZmllciBmb3IgdGhlIHNvdXJjZSBvZiB0aGUgTWVkaWFT dHJlYW1UcmFjaworICAgICAgICBoYXMgdGhlIHNhbWUgdmFsdWUgcmV0dXJuZWQgYnkgZW51bWVy YXRlRGV2aWNlcygpLiBJdCBhbHNvIHByZXZlbnRzIHJlYWwKKyAgICAgICAgZGV2aWNlIElEIGJl aW5nIGxlYWtlZC4KKworICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFj ay1nZXRDYXBhYmlsaXRpZXMuaHRtbDoKKwogMjAxOC0wNi0wNiAgRGF2aWQgRmVudG9uICA8ZGF2 aWRfZmVudG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBMYXlvdXQgVGVzdCBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvYnJvd3NlcnMvaGlzdG9yeS90aGUtbG9jYXRpb24taW50 ZXJmYWNlL2xvY2F0aW9uLXByb3RvY29sLXNldHRlci1ub24tYnJva2VuLmh0bWwgaXMgYSBmbGFr eSBmYWlsdXJlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9NZWRp YVN0cmVhbVRyYWNrLWdldENhcGFiaWxpdGllcy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLWdldENhcGFiaWxpdGllcy5odG1sCmluZGV4IDAyNDU1 NGVkNDE4ZDNkOGMxYzRmOTBjMWIzYzg2MmU2NGQzZmYzYjAuLjBkZGI5ZTIwNjU3ZjdjOWYyMzM4 OWNhOTJkYzI4M2UwZmMzMzcwMjUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFz dHJlYW0vTWVkaWFTdHJlYW1UcmFjay1nZXRDYXBhYmlsaXRpZXMuaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9mYXN0L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2stZ2V0Q2FwYWJpbGl0aWVzLmh0 bWwKQEAgLTUsNiArNSw3IEBACiAgICAgICAgIDxzY3JpcHQgc3JjPSIuL3Jlc291cmNlcy9nZXRV c2VyTWVkaWEtaGVscGVyLmpzIj48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdD4KICAgICAgICAg ICAgIHZhciBtZWRpYVN0cmVhbTsKKyAgICAgICAgICAgIHZhciBkZXZpY2VzOwogCiAgICAgICAg ICAgICBmdW5jdGlvbiBsaW1pdFByZWNpc2lvbih2YWx1ZSwgcHJlY2lzaW9uKQogICAgICAgICAg ICAgewpAQCAtNDEsMTMgKzQyLDI2IEBACiAgICAgICAgICAgICAgICAgcmV0dXJuIHZhbHVlICsg IiB9IjsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgZnVuY3Rpb24gdmFsaWRhdGVEZXZp Y2VJZChkZXZpY2VJZCwgdHJhY2tLaW5kKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg IGlmKHRyYWNrS2luZCAhPT0gJ2F1ZGlvJyAmJiB0cmFja0tpbmQgIT09ICd2aWRlbycpCisgICAg ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgICAgICB2YXIgZGV2aWNl S2luZCA9ICh0cmFja0tpbmQgPT09ICdhdWRpbycpID8gJ2F1ZGlvaW5wdXQnIDogJ3ZpZGVvaW5w dXQnOworICAgICAgICAgICAgICAgIGZvciAodmFyIGRldmljZUluZm8gb2YgZGV2aWNlcykgewor ICAgICAgICAgICAgICAgICAgICBpZihkZXZpY2VJbmZvLmRldmljZUlkID09PSBkZXZpY2VJZCAm JiBkZXZpY2VJbmZvLmtpbmQgPT09IGRldmljZUtpbmQpIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgIH0KKwogICAgICAg ICAgICAgZnVuY3Rpb24gbGlzdFRyYWNrUHJvcGVydGllcyh0cmFjaykKICAgICAgICAgICAgIHsK ICAgICAgICAgICAgICAgICBkZWJ1ZyhgJHt0cmFjay5raW5kfSB0cmFjayBjYXBhYmlsaXRpZXM6 YCk7CiAgICAgICAgICAgICAgICAgY2FwYWJpbGl0aWVzID0gdHJhY2suZ2V0Q2FwYWJpbGl0aWVz KCk7CiAgICAgICAgICAgICAgICAgZm9yICh2YXIgcHJvcGVydHkgaW4gY2FwYWJpbGl0aWVzKSB7 CiAgICAgICAgICAgICAgICAgICAgIGlmIChjYXBhYmlsaXRpZXMuaGFzT3duUHJvcGVydHkocHJv cGVydHkpIHx8IGNhcGFiaWxpdGllcy5fX3Byb3RvX18uaGFzT3duUHJvcGVydHkocHJvcGVydHkp KQotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHByb3BlcnR5ID09ICJkZXZpY2VJZCIpCisg ICAgICAgICAgICAgICAgICAgICAgICBpZiAocHJvcGVydHkgPT09ICJkZXZpY2VJZCIgJiYgdmFs aWRhdGVEZXZpY2VJZChjYXBhYmlsaXRpZXNbcHJvcGVydHldLCB0cmFjay5raW5kKSkKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB2YWx1ZSA9ICImbHQ7VVVJRD4iOwogICAgICAgICAgICAg ICAgICAgICAgICAgZWxzZSBpZiAodHlwZW9mIGNhcGFiaWxpdGllc1twcm9wZXJ0eV0gPT09ICJv YmplY3QiKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZhbHVlID0gY2FwYWJpbGl0eVJh bmdlKHByb3BlcnR5LCBjYXBhYmlsaXRpZXNbcHJvcGVydHldKTsKQEAgLTY5LDcgKzgzLDEzIEBA CiAgICAgICAgICAgICBmdW5jdGlvbiBzdGFydCgpCiAgICAgICAgICAgICB7CiAgICAgICAgICAg ICAgICAgZGVzY3JpcHRpb24oIlRlc3RzIE1lZGlhU3RyZWFtVHJhY2suZ2V0Q2FwYWJpbGl0aWVz LiIpOwotICAgICAgICAgICAgICAgIGdldFVzZXJNZWRpYSgiYWxsb3ciLCB7YXVkaW86dHJ1ZSwg dmlkZW86dHJ1ZX0sIGdvdFN0cmVhbSk7CisgICAgICAgICAgICAgICAgbmF2aWdhdG9yLm1lZGlh RGV2aWNlcy5lbnVtZXJhdGVEZXZpY2VzKCkudGhlbihkZXZpY2VJbmZvQXJyYXkgPT4geworICAg ICAgICAgICAgICAgICAgICBkZXZpY2VzID0gZGV2aWNlSW5mb0FycmF5OworICAgICAgICAgICAg ICAgICAgICBnZXRVc2VyTWVkaWEoImFsbG93Iiwge2F1ZGlvOnRydWUsIHZpZGVvOnRydWV9LCBn b3RTdHJlYW0pOworICAgICAgICAgICAgICAgIH0sZSA9PiB7CisgICAgICAgICAgICAgICAgICAg IHRlc3RGYWlsZWQoJ2VudW1lcmF0ZURldmljZXMgZmFpbGVkOicgKyBlKTsKKyAgICAgICAgICAg ICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAg ICB9CiAKICAgICAgICAgICAgIHdpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsK 342500 2018-06-11 18:54:57 -0700 2018-06-12 08:28:20 -0700 Patch bug-186471-20180612095455.patch text/plain 7461 jianjun.zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzRjNDIxYzBhMjA4Nzc1 NTM5ODc5ZTdlNGRjNzIxZDI0MzRhZDgxMC4uNWFkZTk5YzE3YjAwMjJhYjVkNGU4N2ZlMDU5MDAy NmVlZWE5OWU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA2LTEwICBKaWFu anVuIFpodSAgPGppYW5qdW4uemh1QGludGVsLmNvbT4KKworICAgICAgICBIYXNoIGRldmljZUlk IGFuZCBncm91cElkIG9mIE1lZGlhVHJhY2tDYXBhYmlsaXRpZXMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODY0NzEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBtYWtlcyB0aGUgaWRl bnRpZmllciBmb3IgdGhlIHNvdXJjZSBvZiB0aGUgTWVkaWFTdHJlYW1UcmFjaworICAgICAgICBo YXMgdGhlIHNhbWUgdmFsdWUgcmV0dXJuZWQgYnkgZW51bWVyYXRlRGV2aWNlcygpLiBJdCBhbHNv IHByZXZlbnRzIHJlYWwKKyAgICAgICAgZGV2aWNlIElEIGJlaW5nIGxlYWtlZC4KKworICAgICAg ICAoV2ViQ29yZTo6TWVkaWFTdHJlYW1UcmFjazo6Z2V0Q2FwYWJpbGl0aWVzIGNvbnN0KToKKyAg ICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suaDoKKyAgICAgICAg KiBNb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suaWRsOgorCiAyMDE4LTA2LTA2 ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNwbGF5 IGxpbmtzIGFyZSBzb21ldGltZXMgbm90IG5vdGlmeWluZyBXZWJDb3JlIHdoZW4gZmlyZWQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFt VHJhY2suY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVh bVRyYWNrLmNwcAppbmRleCA4Njc2OTQyNWY3NWVkNWQ1MWE2ZGU3MjFhYjc1ZDI4ZWU1NjE4NTEy Li4zZTUwOTEzNTk0MWY4NjdiNjgyYzY1MmYyMzQ0YzQ5MTk3NjM4YjdkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5j cHAKQEAgLTIzNCw3ICsyMzQsNyBAQCBzdGF0aWMgVmVjdG9yPGJvb2w+IGNhcGFiaWxpdHlCb29s ZWFuVmVjdG9yKFJlYWx0aW1lTWVkaWFTb3VyY2VDYXBhYmlsaXRpZXM6OkVjaAogICAgIHJldHVy biByZXN1bHQ7CiB9CiAKLU1lZGlhU3RyZWFtVHJhY2s6OlRyYWNrQ2FwYWJpbGl0aWVzIE1lZGlh U3RyZWFtVHJhY2s6OmdldENhcGFiaWxpdGllcygpIGNvbnN0CitNZWRpYVN0cmVhbVRyYWNrOjpU cmFja0NhcGFiaWxpdGllcyBNZWRpYVN0cmVhbVRyYWNrOjpnZXRDYXBhYmlsaXRpZXMoRG9jdW1l bnQmIGRvY3VtZW50KSBjb25zdAogewogICAgIGF1dG8gY2FwYWJpbGl0aWVzID0gbV9wcml2YXRl LT5jYXBhYmlsaXRpZXMoKTsKICAgICBUcmFja0NhcGFiaWxpdGllcyByZXN1bHQ7CkBAIC0yNTcs OSArMjU3LDkgQEAgTWVkaWFTdHJlYW1UcmFjazo6VHJhY2tDYXBhYmlsaXRpZXMgTWVkaWFTdHJl YW1UcmFjazo6Z2V0Q2FwYWJpbGl0aWVzKCkgY29uc3QKICAgICBpZiAoY2FwYWJpbGl0aWVzLnN1 cHBvcnRzRWNob0NhbmNlbGxhdGlvbigpKQogICAgICAgICByZXN1bHQuZWNob0NhbmNlbGxhdGlv biA9IGNhcGFiaWxpdHlCb29sZWFuVmVjdG9yKGNhcGFiaWxpdGllcy5lY2hvQ2FuY2VsbGF0aW9u KCkpOwogICAgIGlmIChjYXBhYmlsaXRpZXMuc3VwcG9ydHNEZXZpY2VJZCgpKQotICAgICAgICBy ZXN1bHQuZGV2aWNlSWQgPSBjYXBhYmlsaXRpZXMuZGV2aWNlSWQoKTsKKyAgICAgICAgcmVzdWx0 LmRldmljZUlkID0gUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlcjo6c2luZ2xldG9uKCkuaGFzaFN0 cmluZ1dpdGhTYWx0KGNhcGFiaWxpdGllcy5kZXZpY2VJZCgpLCBkb2N1bWVudC5kZXZpY2VJREhh c2hTYWx0KCkpOwogICAgIGlmIChjYXBhYmlsaXRpZXMuc3VwcG9ydHNHcm91cElkKCkpCi0gICAg ICAgIHJlc3VsdC5ncm91cElkID0gY2FwYWJpbGl0aWVzLmdyb3VwSWQoKTsKKyAgICAgICAgcmVz dWx0Lmdyb3VwSWQgPSBSZWFsdGltZU1lZGlhU291cmNlQ2VudGVyOjpzaW5nbGV0b24oKS5oYXNo U3RyaW5nV2l0aFNhbHQoY2FwYWJpbGl0aWVzLmdyb3VwSWQoKSwgZG9jdW1lbnQuZGV2aWNlSURI YXNoU2FsdCgpKTsKICAgICByZXR1cm4gcmVzdWx0OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suaCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oCmluZGV4IGRhMWIx YzA2MDdiODdhMTk5YzYzM2EyOWJkYzRkNDRkY2U3Mjc0ODMuLjM0NTM4MmJiYTRmOWJmNDZlYTZm Y2FjNDIwN2Q1ZWY0NDBhYTU1MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oCkBAIC0xMTUsNyArMTE1LDcgQEAgcHVi bGljOgogICAgICAgICBTdHJpbmcgZGV2aWNlSWQ7CiAgICAgICAgIFN0cmluZyBncm91cElkOwog ICAgIH07Ci0gICAgVHJhY2tDYXBhYmlsaXRpZXMgZ2V0Q2FwYWJpbGl0aWVzKCkgY29uc3Q7Cisg ICAgVHJhY2tDYXBhYmlsaXRpZXMgZ2V0Q2FwYWJpbGl0aWVzKERvY3VtZW50JikgY29uc3Q7CiAK ICAgICBjb25zdCBNZWRpYVRyYWNrQ29uc3RyYWludHMmIGdldENvbnN0cmFpbnRzKCkgY29uc3Qg eyByZXR1cm4gbV9jb25zdHJhaW50czsgfQogICAgIHZvaWQgYXBwbHlDb25zdHJhaW50cyhjb25z dCBzdGQ6Om9wdGlvbmFsPE1lZGlhVHJhY2tDb25zdHJhaW50cz4mLCBET01Qcm9taXNlRGVmZXJy ZWQ8dm9pZD4mJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL01lZGlhU3RyZWFtVHJhY2suaWRsIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmlkbAppbmRleCA5YjdjNDg5MzNjN2YxYmZmYzc4NjU3NzZh NDFkYTMzMWU4N2ZjZWI3Li42NTU5NDM2ZmE2ZjJlNDNhMWZlYjFlYTNmNjYzYWI3ZDM2MTljMjVk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3Ry ZWFtVHJhY2suaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVk aWFTdHJlYW1UcmFjay5pZGwKQEAgLTQ2LDcgKzQ2LDcgQEAgZW51bSBNZWRpYVN0cmVhbVRyYWNr U3RhdGUgeyAibGl2ZSIsICJlbmRlZCIgfTsKICAgICBNZWRpYVN0cmVhbVRyYWNrIGNsb25lKCk7 CiAgICAgW0ltcGxlbWVudGVkQXM9c3RvcFRyYWNrXSB2b2lkIHN0b3AoKTsKIAotICAgIE1lZGlh VHJhY2tDYXBhYmlsaXRpZXMgZ2V0Q2FwYWJpbGl0aWVzKCk7CisgICAgW0NhbGxXaXRoPURvY3Vt ZW50XSBNZWRpYVRyYWNrQ2FwYWJpbGl0aWVzIGdldENhcGFiaWxpdGllcygpOwogICAgIE1lZGlh VHJhY2tDb25zdHJhaW50cyBnZXRDb25zdHJhaW50cygpOwogICAgIFtDYWxsV2l0aD1Eb2N1bWVu dF0gTWVkaWFUcmFja1NldHRpbmdzIGdldFNldHRpbmdzKCk7CiAgICAgUHJvbWlzZTx2b2lkPiBh cHBseUNvbnN0cmFpbnRzKG9wdGlvbmFsIE1lZGlhVHJhY2tDb25zdHJhaW50cyBjb25zdHJhaW50 cyk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggOTAwZjhiMjE4NzY3OWU3YTQ2MGYzZDU1ZWQ1Mzc1ZGFhNDZhNTMwZi4uZmI4 MTE5ZDIwMDAzOTk4YzM1MDJhZTExODcwMzgyODQzMzEzZjM1ZCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE4LTA2LTEwICBKaWFuanVuIFpodSAgPGppYW5qdW4uemh1QGludGVsLmNvbT4KKwor ICAgICAgICBIYXNoIGRldmljZUlkIGFuZCBncm91cElkIG9mIE1lZGlhVHJhY2tDYXBhYmlsaXRp ZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODY0 NzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IGNoYW5nZSBtYWtlcyB0aGUgaWRlbnRpZmllciBmb3IgdGhlIHNvdXJjZSBvZiB0aGUgTWVkaWFT dHJlYW1UcmFjaworICAgICAgICBoYXMgdGhlIHNhbWUgdmFsdWUgcmV0dXJuZWQgYnkgZW51bWVy YXRlRGV2aWNlcygpLiBJdCBhbHNvIHByZXZlbnRzIHJlYWwKKyAgICAgICAgZGV2aWNlIElEIGJl aW5nIGxlYWtlZC4KKworICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFj ay1nZXRDYXBhYmlsaXRpZXMuaHRtbDoKKwogMjAxOC0wNi0wNiAgRGF2aWQgRmVudG9uICA8ZGF2 aWRfZmVudG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBMYXlvdXQgVGVzdCBpbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2h0bWwvYnJvd3NlcnMvaGlzdG9yeS90aGUtbG9jYXRpb24taW50 ZXJmYWNlL2xvY2F0aW9uLXByb3RvY29sLXNldHRlci1ub24tYnJva2VuLmh0bWwgaXMgYSBmbGFr eSBmYWlsdXJlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9NZWRp YVN0cmVhbVRyYWNrLWdldENhcGFiaWxpdGllcy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRp YXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLWdldENhcGFiaWxpdGllcy5odG1sCmluZGV4IDAyNDU1 NGVkNDE4ZDNkOGMxYzRmOTBjMWIzYzg2MmU2NGQzZmYzYjAuLjAxN2M2MGMwODk0MjgzZmE2OTRh MzhkMTI2MzI4NDY3MDQ1YjAxZTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFz dHJlYW0vTWVkaWFTdHJlYW1UcmFjay1nZXRDYXBhYmlsaXRpZXMuaHRtbAorKysgYi9MYXlvdXRU ZXN0cy9mYXN0L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2stZ2V0Q2FwYWJpbGl0aWVzLmh0 bWwKQEAgLTUsNiArNSw3IEBACiAgICAgICAgIDxzY3JpcHQgc3JjPSIuL3Jlc291cmNlcy9nZXRV c2VyTWVkaWEtaGVscGVyLmpzIj48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdD4KICAgICAgICAg ICAgIHZhciBtZWRpYVN0cmVhbTsKKyAgICAgICAgICAgIHZhciBkZXZpY2VzOwogCiAgICAgICAg ICAgICBmdW5jdGlvbiBsaW1pdFByZWNpc2lvbih2YWx1ZSwgcHJlY2lzaW9uKQogICAgICAgICAg ICAgewpAQCAtNDEsMTMgKzQyLDI2IEBACiAgICAgICAgICAgICAgICAgcmV0dXJuIHZhbHVlICsg IiB9IjsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgZnVuY3Rpb24gdmFsaWRhdGVEZXZp Y2VJZChkZXZpY2VJZCwgdHJhY2tLaW5kKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg IGlmICh0cmFja0tpbmQgIT09ICdhdWRpbycgJiYgdHJhY2tLaW5kICE9PSAndmlkZW8nKQorICAg ICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICAgICAgdmFyIGRldmlj ZUtpbmQgPSAodHJhY2tLaW5kID09PSAnYXVkaW8nKSA/ICdhdWRpb2lucHV0JyA6ICd2aWRlb2lu cHV0JzsKKyAgICAgICAgICAgICAgICBmb3IgKHZhciBkZXZpY2VJbmZvIG9mIGRldmljZXMpIHsK KyAgICAgICAgICAgICAgICAgICAgaWYgKGRldmljZUluZm8uZGV2aWNlSWQgPT09IGRldmljZUlk ICYmIGRldmljZUluZm8ua2luZCA9PT0gZGV2aWNlS2luZCkgeworICAgICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAg ICB9CisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgfQorCiAgICAg ICAgICAgICBmdW5jdGlvbiBsaXN0VHJhY2tQcm9wZXJ0aWVzKHRyYWNrKQogICAgICAgICAgICAg ewogICAgICAgICAgICAgICAgIGRlYnVnKGAke3RyYWNrLmtpbmR9IHRyYWNrIGNhcGFiaWxpdGll czpgKTsKICAgICAgICAgICAgICAgICBjYXBhYmlsaXRpZXMgPSB0cmFjay5nZXRDYXBhYmlsaXRp ZXMoKTsKICAgICAgICAgICAgICAgICBmb3IgKHZhciBwcm9wZXJ0eSBpbiBjYXBhYmlsaXRpZXMp IHsKICAgICAgICAgICAgICAgICAgICAgaWYgKGNhcGFiaWxpdGllcy5oYXNPd25Qcm9wZXJ0eShw cm9wZXJ0eSkgfHwgY2FwYWJpbGl0aWVzLl9fcHJvdG9fXy5oYXNPd25Qcm9wZXJ0eShwcm9wZXJ0 eSkpCi0gICAgICAgICAgICAgICAgICAgICAgICBpZiAocHJvcGVydHkgPT0gImRldmljZUlkIikK KyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChwcm9wZXJ0eSA9PT0gImRldmljZUlkIiAmJiB2 YWxpZGF0ZURldmljZUlkKGNhcGFiaWxpdGllc1twcm9wZXJ0eV0sIHRyYWNrLmtpbmQpKQogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHZhbHVlID0gIiZsdDtVVUlEPiI7CiAgICAgICAgICAg ICAgICAgICAgICAgICBlbHNlIGlmICh0eXBlb2YgY2FwYWJpbGl0aWVzW3Byb3BlcnR5XSA9PT0g Im9iamVjdCIpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmFsdWUgPSBjYXBhYmlsaXR5 UmFuZ2UocHJvcGVydHksIGNhcGFiaWxpdGllc1twcm9wZXJ0eV0pOwpAQCAtNjksNyArODMsMTMg QEAKICAgICAgICAgICAgIGZ1bmN0aW9uIHN0YXJ0KCkKICAgICAgICAgICAgIHsKICAgICAgICAg ICAgICAgICBkZXNjcmlwdGlvbigiVGVzdHMgTWVkaWFTdHJlYW1UcmFjay5nZXRDYXBhYmlsaXRp ZXMuIik7Ci0gICAgICAgICAgICAgICAgZ2V0VXNlck1lZGlhKCJhbGxvdyIsIHthdWRpbzp0cnVl LCB2aWRlbzp0cnVlfSwgZ290U3RyZWFtKTsKKyAgICAgICAgICAgICAgICBuYXZpZ2F0b3IubWVk aWFEZXZpY2VzLmVudW1lcmF0ZURldmljZXMoKS50aGVuKGRldmljZUluZm9BcnJheSA9PiB7Cisg ICAgICAgICAgICAgICAgICAgIGRldmljZXMgPSBkZXZpY2VJbmZvQXJyYXk7CisgICAgICAgICAg ICAgICAgICAgIGdldFVzZXJNZWRpYSgiYWxsb3ciLCB7YXVkaW86dHJ1ZSwgdmlkZW86dHJ1ZX0s IGdvdFN0cmVhbSk7CisgICAgICAgICAgICAgICAgfSwgZSA9PiB7CisgICAgICAgICAgICAgICAg ICAgIHRlc3RGYWlsZWQoJ2VudW1lcmF0ZURldmljZXMgZmFpbGVkOicgKyBlKTsKKyAgICAgICAg ICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgICAgICAgICAgfSk7CiAgICAgICAg ICAgICB9CiAKICAgICAgICAgICAgIHdpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsK