227794 2021-07-08 06:53:20 -0700 Reuse same document capture sources for getUserMedia calls 2022-07-04 00:43:34 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 241548 InRadar P2 Normal --- 1 youennf youennf eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1775661 0 youennf 2021-07-08 06:53:20 -0700 Reuse same document capture sources for getUserMedia calls. This will allow to use only one AVVideoCaptureSource per document. And this will also reduce the amount of muting done on iOS when getUserMedia is called. 1775662 1 433130 youennf 2021-07-08 06:56:51 -0700 Created attachment 433130 Patch 1775982 2 433130 eric.carlson 2021-07-09 06:49:21 -0700 Comment on attachment 433130 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433130&action=review > Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:560 > + if (device.type() != CaptureDevice::DeviceType::Camera) Is there any reason to not support `CaptureDevice::DeviceType::Screen` here as well? > Source/WebCore/Modules/mediastream/UserMediaRequest.cpp:273 > + audioSource->applyConstraints(m_request.audioConstraints); Won't this also reconfigure the existing track? > Source/WebCore/Modules/mediastream/UserMediaRequest.cpp:277 > + videoSource->applyConstraints(m_request.videoConstraints); Ditto. 1777190 3 webkit-bug-importer 2021-07-15 06:54:16 -0700 <rdar://problem/80629508> 1880481 4 youennf 2022-07-04 00:43:34 -0700 *** This bug has been marked as a duplicate of bug 241548 *** 433130 2021-07-08 06:56:51 -0700 2021-07-08 08:39:27 -0700 Patch bug-227794-20210708155649.patch text/plain 23131 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5NTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmM4NTU3NTEwNGExMmIy MDFiMjU0NDA5ZGU5MjQ5ODJhN2VkOWVhNy4uZTg5YzIxZjJjM2RlNTgyN2RmZDMxMzNlNDU5ZWFi NGMxOGI4MGIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTA3LTA4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZXVzZSBzYW1lIGRvY3Vt ZW50IGNhcHR1cmUgc291cmNlcyBmb3IgZ2V0VXNlck1lZGlhIGNhbGxzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjc3OTQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCZWZvcmUgY3JlYXRpbmcgYSBuZXcg UmVhbHRpbWVNZWRpYVNvdXJjZSBmb3IgZ2V0VXNlck1lZGlhLCBjaGVjayB3aGV0aGVyIHRoZXJl IGlzIGFuIGV4aXN0aW5nIGxpdmUgYW5kIHVubXV0ZWQgTWVkaWFTdHJlYW1UcmFjaworICAgICAg ICBvbiB0aGUgc2FtZSBkb2N1bWVudCB0aGF0IGNhbiBiZSB1c2VkIGluc3RlYWQgb2YgY3JlYXRp bmcgYSBuZXcgb25lLgorICAgICAgICBNb3ZlIE1lZGlhU3RyZWFtUHJpdmF0ZSBjcmVhdGlvbiBm cm9tIFJlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXIgdG8gVXNlck1lZGlhUmVxdWVzdDo6YWxsb3cg Y2FsbGJhY2suCisKKyAgICAgICAgQ292ZXJlZCBieSB1cGRhdGVkIHRlc3QuCisKKyAgICAgICAg KiBNb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suY3BwOgorICAgICAgICAoV2Vi Q29yZTo6aXNTb3VyY2VNYXRjaGluZ0RldmljZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0 cmVhbVRyYWNrOjpzb3VyY2VGcm9tRXhpc3RpbmdDYXB0dXJlVHJhY2spOgorICAgICAgICAqIE1v ZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5oOgorICAgICAgICAqIE1vZHVsZXMv bWVkaWFzdHJlYW0vVXNlck1lZGlhUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpVc2Vy TWVkaWFSZXF1ZXN0OjphbGxvdyk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVh bHRpbWVNZWRpYVNvdXJjZUNlbnRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZWFsdGltZU1l ZGlhU291cmNlQ2VudGVyOjpjcmVhdGVNZWRpYVN0cmVhbSk6CisgICAgICAgICogcGxhdGZvcm0v bWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlci5oOgorCiAyMDIxLTA3LTA2ICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgTWVkaWFT dHJlYW1UcmFjay5vbmNvbnN0cmFpbmVkZXJyb3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggYjY5OTcxNmYxMTA3NTQ3 NjNlOTQyYzBiOTJkMWVkY2QyY2EzYWFlYi4uZGI3MDJiMDNlYTE0OTY5MzQ5MDhmMGM1MTJmMDcz MDE4NGQ0MmRjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAyMS0wNy0wOCAgWW91ZW5u IEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV1c2Ugc2FtZSBkb2N1bWVu dCBjYXB0dXJlIHNvdXJjZXMgZm9yIGdldFVzZXJNZWRpYSBjYWxscworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Nzk0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT25seSBoYW5kbGUgb25lIGFsbG93ZWQg cmVxdWVzdCBhdCBhIHRpbWUuCisgICAgICAgIFRoaXMgZW5zdXJlcyB0cmFja3MgbWlnaHQgYmUg Y29ycmVjdGx5IG11dGVkIGFuZCBzbyBvbi4KKworICAgICAgICAqIFdlYlByb2Nlc3MvTWVkaWFT dHJlYW0vVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdl YktpdDo6VXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyOjpwcm9jZXNzR3JhbnRlZFJl cXVlc3QpOgorICAgICAgICAoV2ViS2l0OjpVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFn ZXI6OnVzZXJNZWRpYUFjY2Vzc1dhc0dyYW50ZWQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvTWVk aWFTdHJlYW0vVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyLmg6CisgICAgICAgICog V2ViUHJvY2Vzcy9jb2NvYS9SZW1vdGVSZWFsdGltZVZpZGVvU291cmNlLmNwcDoKKyAgICAgICAg KFdlYktpdDo6UmVtb3RlUmVhbHRpbWVWaWRlb1NvdXJjZTo6UmVtb3RlUmVhbHRpbWVWaWRlb1Nv dXJjZSk6CisKIDIwMjEtMDctMDYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgog CiAgICAgICAgIFJFR1JFU1NJT046IFtpT1NdIEFTU0VSVElPTiBGQUlMRUQ6ICFtX21lc3NhZ2VS ZWNlaXZlck1hcENvdW50IHVuZGVyIFdlYktpdDo6UmVtb3RlUmVtb3RlQ29tbWFuZExpc3RlbmVy Ojp+UmVtb3RlUmVtb3RlQ29tbWFuZExpc3RlbmVyKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtVHJhY2suY3BwCmluZGV4IDlmMDNj ZjQ2ZDZkYTIzYmJjZTQxYzlmZmMzMmQ2MTU0YTYwODQ4NzUuLjE2YjM2NmI1ZTIwNWQ0OWExMWVh MGIxYTJhMjM5NDQzOWM3NDcxZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbVRyYWNrLmNwcApAQCAtNTUxLDYgKzU1MSwzMiBA QCB2b2lkIE1lZGlhU3RyZWFtVHJhY2s6OmVuZENhcHR1cmUoRG9jdW1lbnQmIGRvY3VtZW50LCBN ZWRpYVByb2R1Y2VyOjpNZWRpYUNhcHR1cgogICAgICAgICBkb2N1bWVudC51cGRhdGVJc1BsYXlp bmdNZWRpYSgpOwogfQogCitzdGF0aWMgYm9vbCBpc1NvdXJjZU1hdGNoaW5nRGV2aWNlKGNvbnN0 IFJlYWx0aW1lTWVkaWFTb3VyY2UmIHNvdXJjZSwgY29uc3QgQ2FwdHVyZURldmljZSYgZGV2aWNl KQoreworICAgIHN3aXRjaCAoc291cmNlLnR5cGUoKSkgeworICAgIGNhc2UgUmVhbHRpbWVNZWRp YVNvdXJjZTo6VHlwZTo6Tm9uZToKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGNhc2UgUmVh bHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6VmlkZW86CisgICAgICAgIGlmIChkZXZpY2UudHlwZSgp ICE9IENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6OkNhbWVyYSkKKyAgICAgICAgICAgIHJldHVy biBmYWxzZTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBSZWFsdGltZU1lZGlhU291cmNlOjpU eXBlOjpBdWRpbzoKKyAgICAgICAgaWYgKGRldmljZS50eXBlKCkgIT0gQ2FwdHVyZURldmljZTo6 RGV2aWNlVHlwZTo6TWljcm9waG9uZSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAg ICAgYnJlYWs7CisgICAgfQorICAgIHJldHVybiBzb3VyY2UucGVyc2lzdGVudElEKCkgPT0gZGV2 aWNlLnBlcnNpc3RlbnRJZCgpOworfQorCitSZWZQdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gTWVk aWFTdHJlYW1UcmFjazo6c291cmNlRnJvbUV4aXN0aW5nQ2FwdHVyZVRyYWNrKERvY3VtZW50JiBk b2N1bWVudCwgY29uc3QgQ2FwdHVyZURldmljZSYgZGV2aWNlKQoreworICAgIGZvciAoYXV0byog Y2FwdHVyZVRyYWNrIDogYWxsQ2FwdHVyZVRyYWNrcygpKSB7CisgICAgICAgIGlmICghY2FwdHVy ZVRyYWNrLT5lbmRlZCgpICYmIGNhcHR1cmVUcmFjay0+ZG9jdW1lbnQoKSA9PSAmZG9jdW1lbnQg JiYgaXNTb3VyY2VNYXRjaGluZ0RldmljZShjYXB0dXJlVHJhY2stPnNvdXJjZSgpLCBkZXZpY2Up KQorICAgICAgICAgICAgcmV0dXJuICZjYXB0dXJlVHJhY2stPnNvdXJjZSgpOworICAgIH0KKyAg ICByZXR1cm4gbnVsbHB0cjsKK30KKwogdm9pZCBNZWRpYVN0cmVhbVRyYWNrOjp0cmFja1N0YXJ0 ZWQoTWVkaWFTdHJlYW1UcmFja1ByaXZhdGUmKQogewogICAgIEFMV0FZU19MT0coTE9HSURFTlRJ RklFUik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01l ZGlhU3RyZWFtVHJhY2suaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVk aWFTdHJlYW1UcmFjay5oCmluZGV4IDc3NzA4YmU4OTgzNjIwZWVlODk3MjVkOWY5NDQ1YzRmMmUw ZjUzNTIuLjVmMGQ4NjYxY2RjNjBlNzg2NTRlM2Y4Y2Y3YTczOGZhNWQwMTk3ZDQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFjay5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1UcmFj ay5oCkBAIC02OSw2ICs2OSw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUmVmPE1lZGlhU3RyZWFt VHJhY2s+IGNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgUmVmPE1lZGlhU3RyZWFtVHJh Y2tQcml2YXRlPiYmKTsKICAgICB2aXJ0dWFsIH5NZWRpYVN0cmVhbVRyYWNrKCk7CiAKKyAgICBz dGF0aWMgUmVmUHRyPFJlYWx0aW1lTWVkaWFTb3VyY2U+IHNvdXJjZUZyb21FeGlzdGluZ0NhcHR1 cmVUcmFjayhEb2N1bWVudCYsIGNvbnN0IENhcHR1cmVEZXZpY2UmKTsKICAgICBzdGF0aWMgdm9p ZCBlbmRDYXB0dXJlKERvY3VtZW50JiwgTWVkaWFQcm9kdWNlcjo6TWVkaWFDYXB0dXJlS2luZCk7 CiAKICAgICBzdGF0aWMgTWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZUZsYWdzIGNhcHR1cmVTdGF0 ZShEb2N1bWVudCYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9Vc2VyTWVkaWFSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vVXNlck1lZGlhUmVxdWVzdC5jcHAKaW5kZXggOWEwMDBkNGZkOGViNDA5YzQ1MThkMzVm ZjczZGRkZTgxYmY5ZWRmNS4uNTJlZjVmNjc2MzAyNjRiMDBmMzc2NmVkNTE4ZWY0ZjdlMjMxYTQ4 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVk aWFSZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1Vz ZXJNZWRpYVJlcXVlc3QuY3BwCkBAIC00Myw2ICs0Myw3IEBACiAjaW5jbHVkZSAiSlNPdmVyY29u c3RyYWluZWRFcnJvci5oIgogI2luY2x1ZGUgIkxvZ2dpbmcuaCIKICNpbmNsdWRlICJNZWRpYUNv bnN0cmFpbnRzLmgiCisjaW5jbHVkZSAiTWVkaWFTdHJlYW1Qcml2YXRlLmgiCiAjaW5jbHVkZSAi UGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyLmgiCiAjaW5jbHVkZSAiUmVhbHRpbWVNZWRpYVNv dXJjZUNlbnRlci5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCkBAIC0yMzksMjIgKzI0MCw0NiBA QCB2b2lkIFVzZXJNZWRpYVJlcXVlc3Q6OmFsbG93KENhcHR1cmVEZXZpY2UmJiBhdWRpb0Rldmlj ZSwgQ2FwdHVyZURldmljZSYmIHZpZGVvRAogICAgIFJFTEVBU0VfTE9HKE1lZGlhU3RyZWFtLCAi VXNlck1lZGlhUmVxdWVzdDo6YWxsb3cgJXMgJXMiLCBhdWRpb0RldmljZSA/IGF1ZGlvRGV2aWNl LnBlcnNpc3RlbnRJZCgpLnV0ZjgoKS5kYXRhKCkgOiAiIiwgdmlkZW9EZXZpY2UgPyB2aWRlb0Rl dmljZS5wZXJzaXN0ZW50SWQoKS51dGY4KCkuZGF0YSgpIDogIiIpOwogICAgIG1fYWxsb3dDb21w bGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpOwogICAgIHF1ZXVlVGFz a0tlZXBpbmdPYmplY3RBbGl2ZSgqdGhpcywgVGFza1NvdXJjZTo6VXNlckludGVyYWN0aW9uLCBb dGhpcywgYXVkaW9EZXZpY2UgPSBXVEZNb3ZlKGF1ZGlvRGV2aWNlKSwgdmlkZW9EZXZpY2UgPSBX VEZNb3ZlKHZpZGVvRGV2aWNlKSwgZGV2aWNlSWRlbnRpZmllckhhc2hTYWx0ID0gV1RGTW92ZShk ZXZpY2VJZGVudGlmaWVySGFzaFNhbHQpXSgpIG11dGFibGUgewotICAgICAgICBhdXRvIGNhbGxi YWNrID0gW3RoaXMsIHByb3RlY3RvciA9IG1ha2VQZW5kaW5nQWN0aXZpdHkoKnRoaXMpXShhdXRv IHByaXZhdGVTdHJlYW1PckVycm9yKSBtdXRhYmxlIHsKKyAgICAgICAgYXV0byogY29udGV4dCA9 IHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKTsKKyAgICAgICAgaWYgKCFjb250ZXh0KQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIGF1dG8mIGRvY3VtZW50ID0gZG93bmNhc3Q8RG9jdW1l bnQ+KCpjb250ZXh0KTsKKworICAgICAgICBSZWZQdHI8UmVhbHRpbWVNZWRpYVNvdXJjZT4gZXhp c3RpbmdBdWRpb1NvdXJjZSA9IE1lZGlhU3RyZWFtVHJhY2s6OnNvdXJjZUZyb21FeGlzdGluZ0Nh cHR1cmVUcmFjayhkb2N1bWVudCwgYXVkaW9EZXZpY2UpOworICAgICAgICBpZiAoZXhpc3RpbmdB dWRpb1NvdXJjZSAmJiAhZXhpc3RpbmdBdWRpb1NvdXJjZS0+bXV0ZWQoKSkKKyAgICAgICAgICAg IGF1ZGlvRGV2aWNlID0geyB9OworCisgICAgICAgIFJlZlB0cjxSZWFsdGltZU1lZGlhU291cmNl PiBleGlzdGluZ1ZpZGVvU291cmNlID0gTWVkaWFTdHJlYW1UcmFjazo6c291cmNlRnJvbUV4aXN0 aW5nQ2FwdHVyZVRyYWNrKGRvY3VtZW50LCB2aWRlb0RldmljZSk7CisgICAgICAgIGlmIChleGlz dGluZ1ZpZGVvU291cmNlICYmICFleGlzdGluZ1ZpZGVvU291cmNlLT5tdXRlZCgpKQorICAgICAg ICAgICAgdmlkZW9EZXZpY2UgPSB7IH07CisKKyAgICAgICAgUmVhbHRpbWVNZWRpYVNvdXJjZUNl bnRlcjo6TmV3TWVkaWFTdHJlYW1IYW5kbGVyIGNhbGxiYWNrID0gW3RoaXMsIHByb3RlY3RvciA9 IG1ha2VQZW5kaW5nQWN0aXZpdHkoKnRoaXMpLCBhdWRpb1NvdXJjZSA9IFdURk1vdmUoZXhpc3Rp bmdBdWRpb1NvdXJjZSksIHZpZGVvU291cmNlID0gV1RGTW92ZShleGlzdGluZ1ZpZGVvU291cmNl KV0oYXV0byBzb3VyY2VzT3JFcnJvcikgbXV0YWJsZSB7CiAgICAgICAgICAgICBhdXRvIHNjb3Bl RXhpdCA9IG1ha2VTY29wZUV4aXQoW2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShtX2FsbG93 Q29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewogICAgICAgICAgICAgICAgIGNvbXBsZXRp b25IYW5kbGVyKCk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIGlmIChpc0NvbnRleHRT dG9wcGVkKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgICAgICBpZiAoIXBy aXZhdGVTdHJlYW1PckVycm9yLmhhc192YWx1ZSgpKSB7CisgICAgICAgICAgICBpZiAoIXNvdXJj ZXNPckVycm9yLmhhc192YWx1ZSgpKSB7CiAgICAgICAgICAgICAgICAgUkVMRUFTRV9MT0coTWVk aWFTdHJlYW0sICJVc2VyTWVkaWFSZXF1ZXN0OjphbGxvdyBmYWlsZWQgdG8gY3JlYXRlIG1lZGlh IHN0cmVhbSEiKTsKLSAgICAgICAgICAgICAgICBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPmFk ZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OkpTLCBNZXNzYWdlTGV2ZWw6OkVycm9yLCBw cml2YXRlU3RyZWFtT3JFcnJvci5lcnJvcigpKTsKKyAgICAgICAgICAgICAgICBzY3JpcHRFeGVj dXRpb25Db250ZXh0KCktPmFkZENvbnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OkpTLCBNZXNz YWdlTGV2ZWw6OkVycm9yLCBzb3VyY2VzT3JFcnJvci5lcnJvcigpKTsKICAgICAgICAgICAgICAg ICBkZW55KE1lZGlhQWNjZXNzRGVuaWFsUmVhc29uOjpIYXJkd2FyZUVycm9yKTsKICAgICAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBhdXRvIHByaXZhdGVT dHJlYW0gPSBXVEZNb3ZlKHByaXZhdGVTdHJlYW1PckVycm9yKS52YWx1ZSgpOworCisgICAgICAg ICAgICBhdXRvIHNvdXJjZXMgPSBXVEZNb3ZlKHNvdXJjZXNPckVycm9yKS52YWx1ZSgpOworICAg ICAgICAgICAgaWYgKGF1ZGlvU291cmNlKQorICAgICAgICAgICAgICAgIGF1ZGlvU291cmNlLT5h cHBseUNvbnN0cmFpbnRzKG1fcmVxdWVzdC5hdWRpb0NvbnN0cmFpbnRzKTsKKyAgICAgICAgICAg IGVsc2UKKyAgICAgICAgICAgICAgICBhdWRpb1NvdXJjZSA9IFdURk1vdmUoc291cmNlcy5hdWRp b1NvdXJjZSk7CisgICAgICAgICAgICBpZiAodmlkZW9Tb3VyY2UpCisgICAgICAgICAgICAgICAg dmlkZW9Tb3VyY2UtPmFwcGx5Q29uc3RyYWludHMobV9yZXF1ZXN0LnZpZGVvQ29uc3RyYWludHMp OworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHZpZGVvU291cmNlID0gV1RGTW92 ZShzb3VyY2VzLnZpZGVvU291cmNlKTsKIAogICAgICAgICAgICAgYXV0byYgZG9jdW1lbnQgPSBk b3duY2FzdDxEb2N1bWVudD4oKm1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dCk7CisgICAgICAgICAg ICBhdXRvIHByaXZhdGVTdHJlYW0gPSBNZWRpYVN0cmVhbVByaXZhdGU6OmNyZWF0ZShkb2N1bWVu dC5sb2dnZXIoKSwgV1RGTW92ZShhdWRpb1NvdXJjZSksIFdURk1vdmUodmlkZW9Tb3VyY2UpKTsK ICAgICAgICAgICAgIHByaXZhdGVTdHJlYW0tPm1vbml0b3JPcmllbnRhdGlvbihkb2N1bWVudC5v cmllbnRhdGlvbk5vdGlmaWVyKCkpOwogCiAgICAgICAgICAgICBhdXRvIHN0cmVhbSA9IE1lZGlh U3RyZWFtOjpjcmVhdGUoZG9jdW1lbnQsIFdURk1vdmUocHJpdmF0ZVN0cmVhbSkpOwpAQCAtMjcw LDExICsyOTUsMTAgQEAgdm9pZCBVc2VyTWVkaWFSZXF1ZXN0OjphbGxvdyhDYXB0dXJlRGV2aWNl JiYgYXVkaW9EZXZpY2UsIENhcHR1cmVEZXZpY2UmJiB2aWRlb0QKICAgICAgICAgICAgIG1fcHJv bWlzZS0+cmVzb2x2ZShXVEZNb3ZlKHN0cmVhbSkpOwogICAgICAgICB9OwogCi0gICAgICAgIGF1 dG8mIGRvY3VtZW50ID0gZG93bmNhc3Q8RG9jdW1lbnQ+KCpzY3JpcHRFeGVjdXRpb25Db250ZXh0 KCkpOwotICAgICAgICBSZWFsdGltZU1lZGlhU291cmNlQ2VudGVyOjpzaW5nbGV0b24oKS5jcmVh dGVNZWRpYVN0cmVhbShkb2N1bWVudC5sb2dnZXIoKSwgV1RGTW92ZShjYWxsYmFjayksIFdURk1v dmUoZGV2aWNlSWRlbnRpZmllckhhc2hTYWx0KSwgV1RGTW92ZShhdWRpb0RldmljZSksIFdURk1v dmUodmlkZW9EZXZpY2UpLCBtX3JlcXVlc3QpOwotCi0gICAgICAgIGlmICghbV9zY3JpcHRFeGVj dXRpb25Db250ZXh0KQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAoIWF1ZGlvRGV2 aWNlICYmICF2aWRlb0RldmljZSkKKyAgICAgICAgICAgIGNhbGxiYWNrKHsgfSk7CisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIFJlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXI6OnNpbmdsZXRvbigp LmNyZWF0ZU1lZGlhU3RyZWFtKFdURk1vdmUoY2FsbGJhY2spLCBXVEZNb3ZlKGRldmljZUlkZW50 aWZpZXJIYXNoU2FsdCksIFdURk1vdmUoYXVkaW9EZXZpY2UpLCBXVEZNb3ZlKHZpZGVvRGV2aWNl KSwgbV9yZXF1ZXN0KTsKIAogI2lmIEVOQUJMRShXRUJfUlRDKQogICAgICAgICBpZiAoYXV0byog cGFnZSA9IGRvY3VtZW50LnBhZ2UoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21lZGlhc3RyZWFtL1JlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlci5jcHAK aW5kZXggZTAzZGZhZmQyNDQ4YWU1NDUzZTQxNWVkODE2YTA1Y2FlZGIwMTJhMC4uOTkzMTEzM2M5 ODg3NzVkOTdlNWZkNjBkY2FmODMwOTgxN2Y4NzdhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJj ZUNlbnRlci5jcHAKQEAgLTM3LDcgKzM3LDYgQEAKIAogI2luY2x1ZGUgIkNhcHR1cmVEZXZpY2VN YW5hZ2VyLmgiCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgotI2luY2x1ZGUgIk1lZGlhU3RyZWFtUHJp dmF0ZS5oIgogI2luY2x1ZGUgPHd0Zi9DYWxsYmFja0FnZ3JlZ2F0b3IuaD4KICNpbmNsdWRlIDx3 dGYvU0hBMS5oPgogCkBAIC02OSw3ICs2OCw3IEBAIFJlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXI6 On5SZWFsdGltZU1lZGlhU291cmNlQ2VudGVyKCkgPSBkZWZhdWx0OwogCiBSZWFsdGltZU1lZGlh U291cmNlQ2VudGVyOjpPYnNlcnZlcjo6fk9ic2VydmVyKCkgPSBkZWZhdWx0OwogCi12b2lkIFJl YWx0aW1lTWVkaWFTb3VyY2VDZW50ZXI6OmNyZWF0ZU1lZGlhU3RyZWFtKFJlZjxjb25zdCBMb2dn ZXI+JiYgbG9nZ2VyLCBOZXdNZWRpYVN0cmVhbUhhbmRsZXImJiBjb21wbGV0aW9uSGFuZGxlciwg U3RyaW5nJiYgaGFzaFNhbHQsIENhcHR1cmVEZXZpY2UmJiBhdWRpb0RldmljZSwgQ2FwdHVyZURl dmljZSYmIHZpZGVvRGV2aWNlLCBjb25zdCBNZWRpYVN0cmVhbVJlcXVlc3QmIHJlcXVlc3QpCit2 b2lkIFJlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXI6OmNyZWF0ZU1lZGlhU3RyZWFtKE5ld01lZGlh U3RyZWFtSGFuZGxlciYmIGNvbXBsZXRpb25IYW5kbGVyLCBTdHJpbmcmJiBoYXNoU2FsdCwgQ2Fw dHVyZURldmljZSYmIGF1ZGlvRGV2aWNlLCBDYXB0dXJlRGV2aWNlJiYgdmlkZW9EZXZpY2UsIGNv bnN0IE1lZGlhU3RyZWFtUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICBWZWN0b3I8UmVmPFJlYWx0 aW1lTWVkaWFTb3VyY2U+PiBhdWRpb1NvdXJjZXM7CiAgICAgVmVjdG9yPFJlZjxSZWFsdGltZU1l ZGlhU291cmNlPj4gdmlkZW9Tb3VyY2VzOwpAQCAtMTAwLDE2ICs5OSwxNiBAQCB2b2lkIFJlYWx0 aW1lTWVkaWFTb3VyY2VDZW50ZXI6OmNyZWF0ZU1lZGlhU3RyZWFtKFJlZjxjb25zdCBMb2dnZXI+ JiYgbG9nZ2VyLCBOZQogICAgICAgICB2aWRlb1NvdXJjZSA9IHNvdXJjZS5zb3VyY2UoKTsKICAg ICB9CiAKLSAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFN0cmluZyYmKT4gd2hlbkF1ZGlvU291 cmNlUmVhZHkgPSBbYXVkaW9Tb3VyY2UsIHZpZGVvU291cmNlID0gV1RGTW92ZSh2aWRlb1NvdXJj ZSksIGxvZ2dlciA9IFdURk1vdmUobG9nZ2VyKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKV0oYXV0byYmIGVycm9yTWVzc2FnZSkgbXV0YWJsZSB7CisgICAg Q29tcGxldGlvbkhhbmRsZXI8dm9pZChTdHJpbmcmJik+IHdoZW5BdWRpb1NvdXJjZVJlYWR5ID0g W2F1ZGlvU291cmNlLCB2aWRlb1NvdXJjZSA9IFdURk1vdmUodmlkZW9Tb3VyY2UpLCBjb21wbGV0 aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShhdXRvJiYgZXJyb3JNZXNz YWdlKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCFlcnJvck1lc3NhZ2UuaXNFbXB0eSgpKQogICAg ICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKG1ha2VVbmV4cGVjdGVkKG1ha2VTdHJp bmcoIkZhaWxlZCB0byBjcmVhdGUgTWVkaWFTdHJlYW0gYXVkaW8gc291cmNlOiAiLCBlcnJvck1l c3NhZ2UpKSk7CiAgICAgICAgIGlmICghdmlkZW9Tb3VyY2UpCi0gICAgICAgICAgICByZXR1cm4g Y29tcGxldGlvbkhhbmRsZXIoTWVkaWFTdHJlYW1Qcml2YXRlOjpjcmVhdGUoV1RGTW92ZShsb2dn ZXIpLCBXVEZNb3ZlKGF1ZGlvU291cmNlKSwgV1RGTW92ZSh2aWRlb1NvdXJjZSkpKTsKKyAgICAg ICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcihTb3VyY2VzIHsgV1RGTW92ZShhdWRpb1Nv dXJjZSksIFdURk1vdmUodmlkZW9Tb3VyY2UpIH0pOwogCi0gICAgICAgIENvbXBsZXRpb25IYW5k bGVyPHZvaWQoU3RyaW5nJiYpPiB3aGVuVmlkZW9Tb3VyY2VSZWFkeSA9IFthdWRpb1NvdXJjZSA9 IFdURk1vdmUoYXVkaW9Tb3VyY2UpLCB2aWRlb1NvdXJjZSwgbG9nZ2VyID0gV1RGTW92ZShsb2dn ZXIpLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShhdXRv JiYgZXJyb3JNZXNzYWdlKSBtdXRhYmxlIHsKKyAgICAgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9p ZChTdHJpbmcmJik+IHdoZW5WaWRlb1NvdXJjZVJlYWR5ID0gW2F1ZGlvU291cmNlID0gV1RGTW92 ZShhdWRpb1NvdXJjZSksIHZpZGVvU291cmNlLCBjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXIpXShhdXRvJiYgZXJyb3JNZXNzYWdlKSBtdXRhYmxlIHsKICAgICAg ICAgICAgIGlmICghZXJyb3JNZXNzYWdlLmlzRW1wdHkoKSkKICAgICAgICAgICAgICAgICByZXR1 cm4gY29tcGxldGlvbkhhbmRsZXIobWFrZVVuZXhwZWN0ZWQobWFrZVN0cmluZygiRmFpbGVkIHRv IGNyZWF0ZSBNZWRpYVN0cmVhbSB2aWRlbyBzb3VyY2U6ICIsIGVycm9yTWVzc2FnZSkpKTsKLSAg ICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKE1lZGlhU3RyZWFtUHJpdmF0ZTo6Y3JlYXRlKFdU Rk1vdmUobG9nZ2VyKSwgV1RGTW92ZShhdWRpb1NvdXJjZSksIFdURk1vdmUodmlkZW9Tb3VyY2Up KSk7CisgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihTb3VyY2VzIHsgV1RGTW92ZShhdWRp b1NvdXJjZSksIFdURk1vdmUodmlkZW9Tb3VyY2UpIH0pOwogICAgICAgICB9OwogICAgICAgICB2 aWRlb1NvdXJjZS0+d2hlblJlYWR5KFdURk1vdmUod2hlblZpZGVvU291cmNlUmVhZHkpKTsKICAg ICB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUmVh bHRpbWVNZWRpYVNvdXJjZUNlbnRlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlci5oCmluZGV4IGNhNjQxODY1OTJlZmIxOTgw YWZkZjk2YmNmMmRkYTlmZTk3ZjRlOTEuLjQxYjM2YTZkODVlY2RmNDQxNWMzODNhNmY1MDZlMDFi OTRhYWMxMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L1JlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tZWRpYXN0cmVhbS9SZWFsdGltZU1lZGlhU291cmNlQ2VudGVyLmgKQEAgLTcyLDggKzcyLDEy IEBAIHB1YmxpYzoKICAgICB1c2luZyBJbnZhbGlkQ29uc3RyYWludHNIYW5kbGVyID0gRnVuY3Rp b248dm9pZChjb25zdCBTdHJpbmcmIGludmFsaWRDb25zdHJhaW50KT47CiAgICAgV0VCQ09SRV9F WFBPUlQgdm9pZCB2YWxpZGF0ZVJlcXVlc3RDb25zdHJhaW50cyhWYWxpZENvbnN0cmFpbnRzSGFu ZGxlciYmLCBJbnZhbGlkQ29uc3RyYWludHNIYW5kbGVyJiYsIGNvbnN0IE1lZGlhU3RyZWFtUmVx dWVzdCYsIFN0cmluZyYmKTsKIAotICAgIHVzaW5nIE5ld01lZGlhU3RyZWFtSGFuZGxlciA9IEZ1 bmN0aW9uPHZvaWQoRXhwZWN0ZWQ8UmVmPE1lZGlhU3RyZWFtUHJpdmF0ZT4sIFN0cmluZz4mJik+ OwotICAgIHZvaWQgY3JlYXRlTWVkaWFTdHJlYW0oUmVmPGNvbnN0IExvZ2dlcj4mJiwgTmV3TWVk aWFTdHJlYW1IYW5kbGVyJiYsIFN0cmluZyYmLCBDYXB0dXJlRGV2aWNlJiYgYXVkaW9EZXZpY2Us IENhcHR1cmVEZXZpY2UmJiB2aWRlb0RldmljZSwgY29uc3QgTWVkaWFTdHJlYW1SZXF1ZXN0Jik7 CisgICAgc3RydWN0IFNvdXJjZXMgeworICAgICAgICBSZWZQdHI8UmVhbHRpbWVNZWRpYVNvdXJj ZT4gYXVkaW9Tb3VyY2U7CisgICAgICAgIFJlZlB0cjxSZWFsdGltZU1lZGlhU291cmNlPiB2aWRl b1NvdXJjZTsKKyAgICB9OworICAgIHVzaW5nIE5ld01lZGlhU3RyZWFtSGFuZGxlciA9IEZ1bmN0 aW9uPHZvaWQoRXhwZWN0ZWQ8U291cmNlcywgU3RyaW5nPiYmKT47CisgICAgdm9pZCBjcmVhdGVN ZWRpYVN0cmVhbShOZXdNZWRpYVN0cmVhbUhhbmRsZXImJiwgU3RyaW5nJiYsIENhcHR1cmVEZXZp Y2UmJiBhdWRpb0RldmljZSwgQ2FwdHVyZURldmljZSYmIHZpZGVvRGV2aWNlLCBjb25zdCBNZWRp YVN0cmVhbVJlcXVlc3QmKTsKIAogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZ2V0TWVkaWFTdHJl YW1EZXZpY2VzKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoVmVjdG9yPENhcHR1cmVEZXZpY2U+JiYp PiYmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL01lZGlhU3RyZWFt L1VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvTWVkaWFTdHJlYW0vVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyLmNw cAppbmRleCBlMmU2NWM3ZTU5Yzk1YjJjN2Y3MmRmZjU0NmE2OTJiNzNiZDgyMTNjLi41MDRhMjBi YmQ3Y2U1ZWIwZDljMDQ3NzBkZmE2ZDUwYmRiYTdmNDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvTWVkaWFTdHJlYW0vVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5h Z2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTWVkaWFTdHJlYW0vVXNlck1l ZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyLmNwcApAQCAtMTE3LDYgKzExNywyMSBAQCB2b2lk IFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcjo6bWVkaWFDYW5TdGFydChEb2N1bWVu dCYgZG9jdW1lbnQpCiAgICAgICAgIHNlbmRVc2VyTWVkaWFSZXF1ZXN0KHBlbmRpbmdSZXF1ZXN0 KTsKIH0KIAordm9pZCBVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXI6OnByb2Nlc3NH cmFudGVkUmVxdWVzdChVc2VyTWVkaWFSZXF1ZXN0JiByZXF1ZXN0LCBDYXB0dXJlRGV2aWNlJiYg YXVkaW9EZXZpY2UsIENhcHR1cmVEZXZpY2UmJiB2aWRlb0RldmljZSwgU3RyaW5nJiYgZGV2aWNl SWRlbnRpZmllckhhc2hTYWx0LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlv bkhhbmRsZXIpCit7CisgICAgcmVxdWVzdC5hbGxvdyhXVEZNb3ZlKGF1ZGlvRGV2aWNlKSwgV1RG TW92ZSh2aWRlb0RldmljZSksIFdURk1vdmUoZGV2aWNlSWRlbnRpZmllckhhc2hTYWx0KSwgW3dl YWtQdHIgPSBtYWtlV2Vha1B0cih0aGlzKSwgY29tcGxldGlvbkhhbmRsZXIgPSBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKV0oKSBtdXRhYmxlIHsKKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo KTsKKyAgICAgICAgaWYgKCF3ZWFrUHRyKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBp ZiAoIXdlYWtQdHItPm1fcGVuZGluZ0dyYW50ZWRSZXF1ZXN0cy5pc0VtcHR5KCkpIHsKKyAgICAg ICAgICAgIGF1dG8gZ3JhbnRlZFBlbmRpbmdSZXF1ZXN0ID0gd2Vha1B0ci0+bV9wZW5kaW5nR3Jh bnRlZFJlcXVlc3RzLnRha2VGaXJzdCgpOworICAgICAgICAgICAgd2Vha1B0ci0+cHJvY2Vzc0dy YW50ZWRSZXF1ZXN0KGdyYW50ZWRQZW5kaW5nUmVxdWVzdC5yZXF1ZXN0LCBXVEZNb3ZlKGdyYW50 ZWRQZW5kaW5nUmVxdWVzdC5hdWRpb0RldmljZSksIFdURk1vdmUoZ3JhbnRlZFBlbmRpbmdSZXF1 ZXN0LnZpZGVvRGV2aWNlKSwgV1RGTW92ZShncmFudGVkUGVuZGluZ1JlcXVlc3QuZGV2aWNlSWRl bnRpZmllckhhc2hTYWx0KSwgV1RGTW92ZShncmFudGVkUGVuZGluZ1JlcXVlc3QuY29tcGxldGlv bkhhbmRsZXIpKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICB3ZWFr UHRyLT5tX2hhc0luUHJvY2Vzc0dyYW50ZWRSZXF1ZXN0ID0gZmFsc2U7CisgICAgfSk7Cit9CisK IHZvaWQgVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyOjp1c2VyTWVkaWFBY2Nlc3NX YXNHcmFudGVkKHVpbnQ2NF90IHJlcXVlc3RJRCwgQ2FwdHVyZURldmljZSYmIGF1ZGlvRGV2aWNl LCBDYXB0dXJlRGV2aWNlJiYgdmlkZW9EZXZpY2UsIFN0cmluZyYmIGRldmljZUlkZW50aWZpZXJI YXNoU2FsdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQog ewogICAgIGF1dG8gcmVxdWVzdCA9IG1fb25nb2luZ1VzZXJNZWRpYVJlcXVlc3RzLnRha2UobWFr ZU9iamVjdElkZW50aWZpZXI8VXNlck1lZGlhUmVxdWVzdElkZW50aWZpZXJUeXBlPihyZXF1ZXN0 SUQpKTsKQEAgLTEyNSw3ICsxNDAsMTIgQEAgdm9pZCBVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVz dE1hbmFnZXI6OnVzZXJNZWRpYUFjY2Vzc1dhc0dyYW50ZWQodWludDY0X3QgcmVxdWUKICAgICAg ICAgcmV0dXJuOwogICAgIH0KIAotICAgIHJlcXVlc3QtPmFsbG93KFdURk1vdmUoYXVkaW9EZXZp Y2UpLCBXVEZNb3ZlKHZpZGVvRGV2aWNlKSwgV1RGTW92ZShkZXZpY2VJZGVudGlmaWVySGFzaFNh bHQpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CisgICAgaWYgKG1faGFzSW5Qcm9jZXNz R3JhbnRlZFJlcXVlc3QpIHsKKyAgICAgICAgbV9wZW5kaW5nR3JhbnRlZFJlcXVlc3RzLmFwcGVu ZCh7IHJlcXVlc3QucmVsZWFzZU5vbk51bGwoKSwgV1RGTW92ZShhdWRpb0RldmljZSksIFdURk1v dmUodmlkZW9EZXZpY2UpLCBXVEZNb3ZlKGRldmljZUlkZW50aWZpZXJIYXNoU2FsdCksIFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpIH0pOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIG1f aGFzSW5Qcm9jZXNzR3JhbnRlZFJlcXVlc3QgPSB0cnVlOworICAgIHByb2Nlc3NHcmFudGVkUmVx dWVzdCgqcmVxdWVzdCwgV1RGTW92ZShhdWRpb0RldmljZSksIFdURk1vdmUodmlkZW9EZXZpY2Up LCBXVEZNb3ZlKGRldmljZUlkZW50aWZpZXJIYXNoU2FsdCksIFdURk1vdmUoY29tcGxldGlvbkhh bmRsZXIpKTsKIH0KIAogdm9pZCBVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXI6OnVz ZXJNZWRpYUFjY2Vzc1dhc0RlbmllZCh1aW50NjRfdCByZXF1ZXN0SUQsIFVzZXJNZWRpYVJlcXVl c3Q6Ok1lZGlhQWNjZXNzRGVuaWFsUmVhc29uIHJlYXNvbiwgU3RyaW5nJiYgaW52YWxpZENvbnN0 cmFpbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTWVkaWFTdHJlYW0v VXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvTWVkaWFTdHJlYW0vVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyLmgKaW5k ZXggODQ3YTA3NmJkY2NmNDdlY2ZkMGMyNWY5MGI4YzkzNTA4NzVmMjY5ZS4uODcwNTkyOTZmY2Mx NzZiMDMwNjg0OTZkNGY0YzUxYWZlY2UyODQ4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL01lZGlhU3RyZWFtL1VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlci5o CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9NZWRpYVN0cmVhbS9Vc2VyTWVkaWFQZXJt aXNzaW9uUmVxdWVzdE1hbmFnZXIuaApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgPFdlYkNv cmUvUmVhbHRpbWVNZWRpYVNvdXJjZUNlbnRlci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvVXNlck1l ZGlhQ2xpZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Vc2VyTWVkaWFSZXF1ZXN0Lmg+CisjaW5j bHVkZSA8d3RmL0RlcXVlLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3 dGYvUmVmLmg+CiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgpAQCAtNjcsNiArNjgsNyBAQCBwcml2 YXRlOgogI2VuZGlmCiAKICAgICB2b2lkIHNlbmRVc2VyTWVkaWFSZXF1ZXN0KFdlYkNvcmU6OlVz ZXJNZWRpYVJlcXVlc3QmKTsKKyAgICB2b2lkIHByb2Nlc3NHcmFudGVkUmVxdWVzdChXZWJDb3Jl OjpVc2VyTWVkaWFSZXF1ZXN0JiwgV2ViQ29yZTo6Q2FwdHVyZURldmljZSYmLCBXZWJDb3JlOjpD YXB0dXJlRGV2aWNlJiYsIFN0cmluZyYmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwog CiAgICAgLy8gV2ViQ29yZTo6TWVkaWFDYW5TdGFydExpc3RlbmVyCiAgICAgdm9pZCBtZWRpYUNh blN0YXJ0KFdlYkNvcmU6OkRvY3VtZW50JikgZmluYWw7CkBAIC03OSw2ICs4MSwxNiBAQCBwcml2 YXRlOgogICAgIEhhc2hNYXA8V2ViQ29yZTo6VXNlck1lZGlhQ2xpZW50OjpEZXZpY2VDaGFuZ2VP YnNlcnZlclRva2VuLCBGdW5jdGlvbjx2b2lkKCk+PiBtX2RldmljZUNoYW5nZU9ic2VydmVyTWFw OwogICAgIGJvb2wgbV9tb25pdG9yaW5nRGV2aWNlQ2hhbmdlIHsgZmFsc2UgfTsKIAorICAgIHN0 cnVjdCBQZW5kaW5nR3JhbnRlZFJlcXVlc3RzIHsKKyAgICAgICAgUmVmPFdlYkNvcmU6OlVzZXJN ZWRpYVJlcXVlc3Q+IHJlcXVlc3Q7CisgICAgICAgIFdlYkNvcmU6OkNhcHR1cmVEZXZpY2UgYXVk aW9EZXZpY2U7CisgICAgICAgIFdlYkNvcmU6OkNhcHR1cmVEZXZpY2UgdmlkZW9EZXZpY2U7Cisg ICAgICAgIFN0cmluZyBkZXZpY2VJZGVudGlmaWVySGFzaFNhbHQ7CisgICAgICAgIENvbXBsZXRp b25IYW5kbGVyPHZvaWQoKT4gY29tcGxldGlvbkhhbmRsZXI7CisgICAgfTsKKyAgICBEZXF1ZTxQ ZW5kaW5nR3JhbnRlZFJlcXVlc3RzPiBtX3BlbmRpbmdHcmFudGVkUmVxdWVzdHM7CisgICAgYm9v bCBtX2hhc0luUHJvY2Vzc0dyYW50ZWRSZXF1ZXN0IHsgZmFsc2UgfTsKKwogI2lmIFVTRShHU1RS RUFNRVIpCiAgICAgZW51bSBjbGFzcyBTaG91bGROb3RpZnkgOiBib29sIHsgTm8sIFllcyB9Owog ICAgIHZvaWQgdXBkYXRlQ2FwdHVyZURldmljZXMoU2hvdWxkTm90aWZ5KTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9SZW1vdGVSZWFsdGltZVZpZGVvU291cmNl LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9SZW1vdGVSZWFsdGltZVZpZGVv U291cmNlLmNwcAppbmRleCA0M2YzYzM3NjVjNzA5NDUzM2M3YTdhNTJmNzQxZTBiMzIyMDA2YzBi Li40ODE4YjUwMzYyYTk5MjdlNmQyNDBmNTA4YTM0OGFiNmNjYTE2NjNmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvUmVtb3RlUmVhbHRpbWVWaWRlb1NvdXJjZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29hL1JlbW90ZVJlYWx0aW1lVmlk ZW9Tb3VyY2UuY3BwCkBAIC01NSw3ICs1NSw3IEBAIFJlZjxSZWFsdGltZVZpZGVvQ2FwdHVyZVNv dXJjZT4gUmVtb3RlUmVhbHRpbWVWaWRlb1NvdXJjZTo6Y3JlYXRlKGNvbnN0IENhcHR1cmVECiB9 CiAKIFJlbW90ZVJlYWx0aW1lVmlkZW9Tb3VyY2U6OlJlbW90ZVJlYWx0aW1lVmlkZW9Tb3VyY2Uo UmVhbHRpbWVNZWRpYVNvdXJjZUlkZW50aWZpZXIgaWRlbnRpZmllciwgY29uc3QgQ2FwdHVyZURl dmljZSYgZGV2aWNlLCBjb25zdCBNZWRpYUNvbnN0cmFpbnRzKiBjb25zdHJhaW50cywgU3RyaW5n JiYgbmFtZSwgU3RyaW5nJiYgaGFzaFNhbHQsIFVzZXJNZWRpYUNhcHR1cmVNYW5hZ2VyJiBtYW5h Z2VyLCBib29sIHNob3VsZENhcHR1cmVJbkdQVVByb2Nlc3MpCi0gICAgOiBSZWFsdGltZVZpZGVv Q2FwdHVyZVNvdXJjZShXVEZNb3ZlKG5hbWUpLCBTdHJpbmc6Om51bWJlcihpZGVudGlmaWVyLnRv VUludDY0KCkpLCBXVEZNb3ZlKGhhc2hTYWx0KSkKKyAgICA6IFJlYWx0aW1lVmlkZW9DYXB0dXJl U291cmNlKFdURk1vdmUobmFtZSksIFN0cmluZyhkZXZpY2UucGVyc2lzdGVudElkKCkpLCBXVEZN b3ZlKGhhc2hTYWx0KSkKICAgICAsIG1fcHJveHkoaWRlbnRpZmllciwgZGV2aWNlLCBzaG91bGRD YXB0dXJlSW5HUFVQcm9jZXNzLCBjb25zdHJhaW50cykKICAgICAsIG1fbWFuYWdlcihtYW5hZ2Vy KQogewpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDQ5NWIxN2YyYmEyZjE2Y2M2YmFlNjVlMmYwY2E4YWE2YTIxOWM2ZTcuLmVl NmE3NmYxOTU4ZjIwMDA2ZWViYmJhNjdjZjMyYWMzZmYwMGE5ZmQgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MiBAQAorMjAyMS0wNy0wOCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAg ICAgICAgUmV1c2Ugc2FtZSBkb2N1bWVudCBjYXB0dXJlIHNvdXJjZXMgZm9yIGdldFVzZXJNZWRp YSBjYWxscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI3Nzk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9pb3MvbWVkaWFzdHJlYW0vZ2V0VXNlck1lZGlhLXNpbmdsZS1jYXB0dXJlLmh0 bWw6CisKIDIwMjEtMDctMDYgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAg ICAgICAgIFJlbW92ZSBNZWRpYVN0cmVhbVRyYWNrLm9uY29uc3RyYWluZWRlcnJvcgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL21lZGlhc3RyZWFtL2dldFVzZXJNZWRpYS1z aW5nbGUtY2FwdHVyZS5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zL21lZGlhc3RyZWFt L2dldFVzZXJNZWRpYS1zaW5nbGUtY2FwdHVyZS5odG1sCmluZGV4IGQ2NjgyZWUzMzlkMmU5NGUz NTFlMjk5YjRiMTMzNWUyMjY0NDQyYzkuLmZjMTA5ZjE4YWM2YzM4ODg3ZDU5ZGI0ZDliYWY0OWRl YWY1MDNiZmUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy9tZWRpYXN0cmVh bS9nZXRVc2VyTWVkaWEtc2luZ2xlLWNhcHR1cmUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9pb3MvbWVkaWFzdHJlYW0vZ2V0VXNlck1lZGlhLXNpbmdsZS1jYXB0dXJlLmh0bWwKQEAg LTE4LDM1ICsxOCwyOCBAQCBhc3luYyBmdW5jdGlvbiB3YWl0Rm9yVHJhY2tNdXRlZCh0cmFjaykK ICAgICByZXR1cm4gbmV3IFByb21pc2UocmVzb2x2ZSA9PiB0cmFjay5vbm11dGUgPSByZXNvbHZl KTsKIH0KIAotcHJvbWlzZV90ZXN0KCh0ZXN0KSA9PiB7Ci0gICAgaWYgKHdpbmRvdy50ZXN0UnVu bmVyKQotICAgICAgICB0ZXN0UnVubmVyLnNldFVzZXJNZWRpYVBlcm1pc3Npb24odHJ1ZSk7Ci0K LSAgICB2YXIgZmlyc3RTdHJlYW07Ci0gICAgdmFyIGF1ZGlvVHJhY2s7Ci0gICAgdmFyIHZpZGVv VHJhY2s7Ci0gICAgcmV0dXJuIG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHsg YXVkaW86IHRydWUsIHZpZGVvOiB7IGZhY2luZ01vZGU6IHsgZXhhY3Q6IFsndXNlciddIH0gfSB9 KS50aGVuKChzdHJlYW0pID0+IHsKLSAgICAgICAgZmlyc3RTdHJlYW0gPSBzdHJlYW07Ci0gICAg ICAgIGF1ZGlvVHJhY2sgPSBmaXJzdFN0cmVhbS5nZXRBdWRpb1RyYWNrcygpWzBdOwotICAgICAg ICB2aWRlb1RyYWNrID0gZmlyc3RTdHJlYW0uZ2V0VmlkZW9UcmFja3MoKVswXTsKLQotICAgICAg ICBhc3NlcnRfZmFsc2UoYXVkaW9UcmFjay5tdXRlZCwgImF1ZGlvIHRyYWNrIGlzIGFjdGl2ZSIp OwotICAgICAgICBhc3NlcnRfZmFsc2UodmlkZW9UcmFjay5tdXRlZCwgInZpZGVvIHRyYWNrIGlz IGFjdGl2ZSIpOwotCi0gICAgICAgIHJldHVybiBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVz ZXJNZWRpYSh7IGF1ZGlvOiB0cnVlfSk7Ci0gICAgfSkudGhlbihhc3luYyAoc3RyZWFtKSA9PiB7 Ci0gICAgICAgIGF3YWl0IHdhaXRGb3JUcmFja011dGVkKGF1ZGlvVHJhY2spOwotCi0gICAgICAg IGFzc2VydF90cnVlKGF1ZGlvVHJhY2subXV0ZWQsICJhdWRpbyB0cmFjayBpcyBtdXRlZCIpOwot ICAgICAgICBhc3NlcnRfZmFsc2UodmlkZW9UcmFjay5tdXRlZCwgInZpZGVvIHRyYWNrIGlzIGFj dGl2ZSIpOwotCi0gICAgICAgIHJldHVybiBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJN ZWRpYSh7IHZpZGVvOiB7IGZhY2luZ01vZGU6IHsgZXhhY3Q6IFsiZW52aXJvbm1lbnQiXSB9IH0g fSk7Ci0gICAgfSkudGhlbihhc3luYyAoc3RyZWFtKSA9PiB7Ci0gICAgICAgIGF3YWl0IHdhaXRG b3JUcmFja011dGVkKHZpZGVvVHJhY2spOwotCi0gICAgICAgIGFzc2VydF90cnVlKGF1ZGlvVHJh Y2subXV0ZWQsICJhdWRpbyB0cmFjayBpcyBtdXRlZCwgc2Vjb25kIGNoZWNrIik7Ci0gICAgICAg IGFzc2VydF90cnVlKHZpZGVvVHJhY2subXV0ZWQsICJ2aWRlbyB0cmFjayBpcyBtdXRlZCIpOwot ICAgIH0pOworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICAgY29uc3Qgc3RyZWFt ID0gYXdhaXQgbmF2aWdhdG9yLm1lZGlhRGV2aWNlcy5nZXRVc2VyTWVkaWEoeyBhdWRpbzogdHJ1 ZSwgdmlkZW86IHsgZmFjaW5nTW9kZTogeyBleGFjdDogWyd1c2VyJ10gfSB9IH0pOworICAgIGNv bnN0IGF1ZGlvVHJhY2sgPSBzdHJlYW0uZ2V0QXVkaW9UcmFja3MoKVswXTsKKyAgICBjb25zdCB2 aWRlb1RyYWNrID0gc3RyZWFtLmdldFZpZGVvVHJhY2tzKClbMF07CisKKyAgICBhc3NlcnRfZmFs c2UoYXVkaW9UcmFjay5tdXRlZCwgImF1ZGlvIHRyYWNrIGlzIGFjdGl2ZSIpOworICAgIGFzc2Vy dF9mYWxzZSh2aWRlb1RyYWNrLm11dGVkLCAidmlkZW8gdHJhY2sgaXMgYWN0aXZlIik7CisKKyAg ICBhd2FpdCBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7IGF1ZGlvOiB0cnVl fSk7CisgICAgYXdhaXQgbmV3IFByb21pc2UocmVzb2x2ZSA9PiBzZXRUaW1lb3V0KHJlc29sdmUs IDUwKSk7CisKKyAgICAvLyBpbml0aWFsIGF1ZGlvIHRyYWNrIG1pZ2h0IG5vdCBiZSBtdXRlZCBi ZWNhdXNlIHdlIGFyZSByZXVzaW5nIHRoZSBzYW1lIGRldmljZS4KKyAgICBhc3NlcnRfZmFsc2Uo YXVkaW9UcmFjay5tdXRlZCwgImF1ZGlvIHRyYWNrIGlzIGFjdGl2ZSIpOworICAgIGFzc2VydF9m YWxzZSh2aWRlb1RyYWNrLm11dGVkLCAidmlkZW8gdHJhY2sgaXMgYWN0aXZlIik7CisKKyAgICBh d2FpdCBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7IHZpZGVvOiB7IGZhY2lu Z01vZGU6IHsgZXhhY3Q6IFsiZW52aXJvbm1lbnQiXSB9IH0gfSk7CisKKyAgICAvLyBpbml0aWFs IHZpZGVvIHRyYWNrIHNob3VsZCBub3cgYmUgbXV0ZWQgc2luY2Ugd2UgYXJlIHVzaW5nIGEgbmV3 IGNhbWVyYSBkZXZpY2UuCisgICAgYXdhaXQgd2FpdEZvclRyYWNrTXV0ZWQodmlkZW9UcmFjayk7 CisKKyAgICBhc3NlcnRfZmFsc2UoYXVkaW9UcmFjay5tdXRlZCwgImF1ZGlvIHRyYWNrIGlzIGFj dGl2ZSwgc2Vjb25kIGNoZWNrIik7CisgICAgYXNzZXJ0X3RydWUodmlkZW9UcmFjay5tdXRlZCwg InZpZGVvIHRyYWNrIGlzIG11dGVkIik7CiB9LCAiVGVzdGluZyBzdWNjZXNzaXZlIGdldFVzZXJN ZWRpYSBjYWxscyIpOwogICAgICAgICA8L3NjcmlwdD4KICAgICA8L2JvZHk+Cg==