222889 2021-03-07 11:00:55 -0800 [GStreamer] CaptureDevice monitoring is not implemented 2021-04-13 03:54:13 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 222888 1 pnormand pnormand calvaris eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer oldest_to_newest 1736943 0 pnormand 2021-03-07 11:00:55 -0800 In GStreamerCaptureDeviceManager: // FIXME: Add monitor for added/removed messages on the bus. 1742071 1 423829 pnormand 2021-03-21 09:51:03 -0700 Created attachment 423829 Patch 1742178 2 423829 calvaris 2021-03-22 04:24:40 -0700 Comment on attachment 423829 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423829&action=review > Source/WebCore/platform/mediastream/gstreamer/GStreamerCaptureDeviceManager.cpp:155 > + break; Nit: you could avoid this break. > Source/WebCore/platform/mediastream/gstreamer/GStreamerCaptureDeviceManager.cpp:158 > + break; And maybe this one. 1742179 3 423829 pnormand 2021-03-22 04:34:06 -0700 Comment on attachment 423829 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423829&action=review >> Source/WebCore/platform/mediastream/gstreamer/GStreamerCaptureDeviceManager.cpp:155 >> + break; > > Nit: you could avoid this break. But then we fall through the final return and don't fill the devices list at all? >> Source/WebCore/platform/mediastream/gstreamer/GStreamerCaptureDeviceManager.cpp:158 >> + break; > > And maybe this one. We don't want to fall-through and return early though :) 1742205 4 423829 calvaris 2021-03-22 05:54:24 -0700 Comment on attachment 423829 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423829&action=review >>> Source/WebCore/platform/mediastream/gstreamer/GStreamerCaptureDeviceManager.cpp:155 >>> + break; >> >> Nit: you could avoid this break. > > But then we fall through the final return and don't fill the devices list at all? True, you could remove this one but keep the second. 1749240 5 425755 pnormand 2021-04-12 09:07:57 -0700 Created attachment 425755 Patch 1749635 6 ews-feeder 2021-04-13 03:53:08 -0700 Committed r275878 (236443@main): <https://commits.webkit.org/236443@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425755. 1749636 7 webkit-bug-importer 2021-04-13 03:54:13 -0700 <rdar://problem/76585693> 423829 2021-03-21 09:51:03 -0700 2021-04-12 09:07:52 -0700 Patch bug-222889-20210321095102.patch text/plain 8843 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NzUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQ5MjI2OTk4MWQ3OWQy YjFmZjcwMjhmZGUyOGEwMGU3YzQ0MzdmMi4uM2M3OTQ2ZDZiNmM0ZGM0MDhkYmMyMmM2ZDEzYTVm OTgzNmQ0NzExZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTAzLTIxICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBDYXB0dXJlRGV2aWNlIG1vbml0b3JpbmcgaXMgbm90IGltcGxlbWVudGVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI4ODkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBHU3RyZWFtZXIgY2FwdHVyZSBk ZXZpY2UgZXZlbnRzIGFyZSBub3RpZmllZCB0aHJvdWdoIGEgbWVzc2FnZSBidXMgYXNzb2NpYXRl ZCB0byB0aGUgdGhlCisgICAgICAgIEdzdERldmljZU1vbml0b3IsIHNvIHdlIG5lZWQgdG8gd2F0 Y2ggb3V0IGZvciB0aG9zZSBtZXNzYWdlcyBhbmQgbm90aWZ5IHRoZQorICAgICAgICBSZWFsdGlt ZVNvdXJjZU1lZGlhQ2VudGVyIGFjY29yZGluZ2x5LgorCisgICAgICAgICogcGxhdGZvcm0vbWVk aWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkdTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyOjp+R1N0cmVhbWVy Q2FwdHVyZURldmljZU1hbmFnZXIpOgorICAgICAgICAoV2ViQ29yZTo6R1N0cmVhbWVyQ2FwdHVy ZURldmljZU1hbmFnZXI6OmNhcHR1cmVEZXZpY2VzKToKKyAgICAgICAgKFdlYkNvcmU6OkdTdHJl YW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyOjphZGREZXZpY2UpOgorICAgICAgICAoV2ViQ29yZTo6 R1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXI6OnJlZnJlc2hDYXB0dXJlRGV2aWNlcyk6Cisg ICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lckNhcHR1cmVE ZXZpY2VNYW5hZ2VyLmg6CisKIDIwMjEtMDMtMTkgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUu Y29tPgogCiAgICAgICAgIExpbmsgYWdhaW5zdCB0aGUgQU5HTEUgU2hhcmVkIExpYnJhcnkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9H U3RyZWFtZXJDYXB0dXJlRGV2aWNlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvR1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXIuY3Bw CmluZGV4IDM4YWY0YmQ4ZmU4MTk2NDUxYmI4NDZkZTU3YjBkYzNlZjkwZWRlOTkuLjBmYTFkZTZl YmM4ZTU5YjcxNTExNWUxOWYwYmFkZjEwMDY2ZjllMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9HU3RyZWFtZXJDYXB0dXJlRGV2aWNl TWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0 cmVhbWVyL0dTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyLmNwcApAQCAtMjgsNiArMjgsOSBA QAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK0dTVF9ERUJVR19DQVRFR09SWSh3ZWJraXRHU3Ry ZWFtZXJDYXB0dXJlRGV2aWNlTWFuYWdlckRlYnVnQ2F0ZWdvcnkpOworI2RlZmluZSBHU1RfQ0FU X0RFRkFVTFQgd2Via2l0R1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXJEZWJ1Z0NhdGVnb3J5 CisKIHN0YXRpYyBnaW50IHNvcnREZXZpY2VzKGdjb25zdHBvaW50ZXIgYSwgZ2NvbnN0cG9pbnRl ciBiKQogewogICAgIEdzdERldmljZSogYWRldiA9IEdTVF9ERVZJQ0UoYSksICpiZGV2ID0gR1NU X0RFVklDRShiKTsKQEAgLTY2LDYgKzY5LDEyIEBAIEdTdHJlYW1lckRpc3BsYXlDYXB0dXJlRGV2 aWNlTWFuYWdlciYgR1N0cmVhbWVyRGlzcGxheUNhcHR1cmVEZXZpY2VNYW5hZ2VyOjpzaW5nCiAg ICAgcmV0dXJuIG1hbmFnZXI7CiB9CiAKK0dTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyOjp+ R1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXIoKQoreworICAgIGlmIChtX2RldmljZU1vbml0 b3IpCisgICAgICAgIGdzdF9kZXZpY2VfbW9uaXRvcl9zdG9wKG1fZGV2aWNlTW9uaXRvci5nZXQo KSk7Cit9CisKIE9wdGlvbmFsPEdTdHJlYW1lckNhcHR1cmVEZXZpY2U+IEdTdHJlYW1lckNhcHR1 cmVEZXZpY2VNYW5hZ2VyOjpnc3RyZWFtZXJEZXZpY2VXaXRoVUlEKGNvbnN0IFN0cmluZyYgZGV2 aWNlSUQpCiB7CiAgICAgY2FwdHVyZURldmljZXMoKTsKQEAgLTgwLDYgKzg5LDEwIEBAIE9wdGlv bmFsPEdTdHJlYW1lckNhcHR1cmVEZXZpY2U+IEdTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2Vy Ojpnc3RyZWFtZXJEZXZpY2VXCiBjb25zdCBWZWN0b3I8Q2FwdHVyZURldmljZT4mIEdTdHJlYW1l ckNhcHR1cmVEZXZpY2VNYW5hZ2VyOjpjYXB0dXJlRGV2aWNlcygpCiB7CiAgICAgZW5zdXJlR1N0 cmVhbWVySW5pdGlhbGl6ZWQoKTsKKyAgICBzdGF0aWMgc3RkOjpvbmNlX2ZsYWcgb25jZUZsYWc7 CisgICAgc3RkOjpjYWxsX29uY2Uob25jZUZsYWcsIFtdIHsKKyAgICAgICAgR1NUX0RFQlVHX0NB VEVHT1JZX0lOSVQod2Via2l0R1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXJEZWJ1Z0NhdGVn b3J5LCAid2Via2l0Y2FwdHVyZWRldmljZW1hbmFnZXIiLCAwLCAiV2ViS2l0IENhcHR1cmUgRGV2 aWNlIE1hbmFnZXIiKTsKKyAgICB9KTsKICAgICBpZiAobV9kZXZpY2VzLmlzRW1wdHkoKSkKICAg ICAgICAgcmVmcmVzaENhcHR1cmVEZXZpY2VzKCk7CiAKQEAgLTEwNSw2ICsxMTgsNyBAQCB2b2lk IEdTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyOjphZGREZXZpY2UoR1JlZlB0cjxHc3REZXZp Y2U+JiYgZGV2aWNlKQogICAgIC8vIFRoaXMgaXNuJ3QgcmVhbGx5IGEgVUlEIGJ1dCBzaG91bGQg YmUgZ29vZCBlbm91Z2ggKGxpYndlYnJ0YwogICAgIC8vIGl0c2VsZiBkb2VzIHRoYXQgYXQgbGVh c3QgZm9yIHB1bHNlYXVkaW8gZGV2aWNlcykuCiAgICAgR1VuaXF1ZVB0cjxjaGFyPiBkZXZpY2VO YW1lKGdzdF9kZXZpY2VfZ2V0X2Rpc3BsYXlfbmFtZShkZXZpY2UuZ2V0KCkpKTsKKyAgICBHU1Rf SU5GTygiUmVnaXN0ZXJpbmcgZGV2aWNlICVzIiwgZGV2aWNlTmFtZS5nZXQoKSk7CiAgICAgZ2Jv b2xlYW4gaXNEZWZhdWx0ID0gRkFMU0U7CiAgICAgZ3N0X3N0cnVjdHVyZV9nZXRfYm9vbGVhbihw cm9wZXJ0aWVzLmdldCgpLCAiaXMtZGVmYXVsdCIsICZpc0RlZmF1bHQpOwogCkBAIC0xMjEsMzcg KzEzNSw3MiBAQCB2b2lkIEdTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyOjphZGREZXZpY2Uo R1JlZlB0cjxHc3REZXZpY2U+JiYgZGV2aWNlKQogCiB2b2lkIEdTdHJlYW1lckNhcHR1cmVEZXZp Y2VNYW5hZ2VyOjpyZWZyZXNoQ2FwdHVyZURldmljZXMoKQogeworICAgIG1fZGV2aWNlcy5jbGVh cigpOwogICAgIGlmICghbV9kZXZpY2VNb25pdG9yKSB7CiAgICAgICAgIG1fZGV2aWNlTW9uaXRv ciA9IGFkb3B0R1JlZihnc3RfZGV2aWNlX21vbml0b3JfbmV3KCkpOwogCi0gICAgICAgIENhcHR1 cmVEZXZpY2U6OkRldmljZVR5cGUgdHlwZSA9IGRldmljZVR5cGUoKTsKLSAgICAgICAgaWYgKHR5 cGUgPT0gQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6Q2FtZXJhKSB7Ci0gICAgICAgICAgICBH UmVmUHRyPEdzdENhcHM+IGNhcHMgPSBhZG9wdEdSZWYoZ3N0X2NhcHNfbmV3X2VtcHR5X3NpbXBs ZSgidmlkZW8veC1yYXciKSk7CisgICAgICAgIHN3aXRjaCAoZGV2aWNlVHlwZSgpKSB7CisgICAg ICAgIGNhc2UgQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6Q2FtZXJhOiB7CisgICAgICAgICAg ICBhdXRvIGNhcHMgPSBhZG9wdEdSZWYoZ3N0X2NhcHNfbmV3X2VtcHR5X3NpbXBsZSgidmlkZW8v eC1yYXciKSk7CiAgICAgICAgICAgICBnc3RfZGV2aWNlX21vbml0b3JfYWRkX2ZpbHRlcihtX2Rl dmljZU1vbml0b3IuZ2V0KCksICJWaWRlby9Tb3VyY2UiLCBjYXBzLmdldCgpKTsKLSAgICAgICAg fSBlbHNlIGlmICh0eXBlID09IENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6Ok1pY3JvcGhvbmUp IHsKLSAgICAgICAgICAgIEdSZWZQdHI8R3N0Q2Fwcz4gY2FwcyA9IGFkb3B0R1JlZihnc3RfY2Fw c19uZXdfZW1wdHlfc2ltcGxlKCJhdWRpby94LXJhdyIpKTsKKyAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICB9CisgICAgICAgIGNhc2UgQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6TWljcm9w aG9uZTogeworICAgICAgICAgICAgYXV0byBjYXBzID0gYWRvcHRHUmVmKGdzdF9jYXBzX25ld19l bXB0eV9zaW1wbGUoImF1ZGlvL3gtcmF3IikpOwogICAgICAgICAgICAgZ3N0X2RldmljZV9tb25p dG9yX2FkZF9maWx0ZXIobV9kZXZpY2VNb25pdG9yLmdldCgpLCAiQXVkaW8vU291cmNlIiwgY2Fw cy5nZXQoKSk7Ci0gICAgICAgIH0gZWxzZQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0K KyAgICAgICAgY2FzZSBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpTcGVha2VyOgorICAgICAg ICAgICAgLy8gRklYTUU6IEFkZCBBdWRpby9TaW5rIGZpbHRlci4gU2VlIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTY4ODAKKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICBjYXNlIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6OlNjcmVlbjoKKyAgICAgICAgY2Fz ZSBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpXaW5kb3c6CisgICAgICAgICAgICBicmVhazsK KyAgICAgICAgY2FzZSBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpVbmtub3duOgogICAgICAg ICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIC8vIEZJWE1FOiBBZGQgbW9uaXRvciBmb3IgYWRk ZWQvcmVtb3ZlZCBtZXNzYWdlcyBvbiB0aGUgYnVzLgotICAgIGlmICghZ3N0X2RldmljZV9tb25p dG9yX3N0YXJ0KG1fZGV2aWNlTW9uaXRvci5nZXQoKSkpIHsKLSAgICAgICAgR1NUX1dBUk5JTkdf T0JKRUNUKG1fZGV2aWNlTW9uaXRvci5nZXQoKSwgIkNvdWxkIG5vdCBzdGFydCBkZXZpY2UgbW9u aXRvciIpOwotICAgICAgICBtX2RldmljZU1vbml0b3IgPSBudWxscHRyOwotCi0gICAgICAgIHJl dHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGF1dG8gYnVzID0gYWRvcHRHUmVmKGdzdF9kZXZp Y2VfbW9uaXRvcl9nZXRfYnVzKG1fZGV2aWNlTW9uaXRvci5nZXQoKSkpOworICAgICAgICBnc3Rf YnVzX2FkZF93YXRjaChidXMuZ2V0KCksIHJlaW50ZXJwcmV0X2Nhc3Q8R3N0QnVzRnVuYz4oK1td KEdzdEJ1cyosIEdzdE1lc3NhZ2UqIG1lc3NhZ2UsIEdTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5h Z2VyKiBtYW5hZ2VyKSAtPiBnYm9vbGVhbiB7CisjaWZuZGVmIEdTVF9ESVNBQkxFX0dTVF9ERUJV RworICAgICAgICAgICAgR1JlZlB0cjxHc3REZXZpY2U+IGRldmljZTsKKyAgICAgICAgICAgIEdV bmlxdWVQdHI8Y2hhcj4gbmFtZTsKKyNlbmRpZgorICAgICAgICAgICAgc3dpdGNoIChHU1RfTUVT U0FHRV9UWVBFKG1lc3NhZ2UpKSB7CisgICAgICAgICAgICBjYXNlIEdTVF9NRVNTQUdFX0RFVklD RV9BRERFRDoKKyNpZm5kZWYgR1NUX0RJU0FCTEVfR1NUX0RFQlVHCisgICAgICAgICAgICAgICAg Z3N0X21lc3NhZ2VfcGFyc2VfZGV2aWNlX2FkZGVkKG1lc3NhZ2UsICZkZXZpY2Uub3V0UHRyKCkp OworICAgICAgICAgICAgICAgIG5hbWUucmVzZXQoZ3N0X2RldmljZV9nZXRfZGlzcGxheV9uYW1l KGRldmljZS5nZXQoKSkpOworICAgICAgICAgICAgICAgIEdTVF9JTkZPKCJEZXZpY2UgYWRkZWQ6 ICVzIiwgbmFtZS5nZXQoKSk7CisjZW5kaWYKKyAgICAgICAgICAgICAgICBtYW5hZ2VyLT5kZXZp Y2VDaGFuZ2VkKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIEdT VF9NRVNTQUdFX0RFVklDRV9SRU1PVkVEOgorI2lmbmRlZiBHU1RfRElTQUJMRV9HU1RfREVCVUcK KyAgICAgICAgICAgICAgICBnc3RfbWVzc2FnZV9wYXJzZV9kZXZpY2VfcmVtb3ZlZChtZXNzYWdl LCAmZGV2aWNlLm91dFB0cigpKTsKKyAgICAgICAgICAgICAgICBuYW1lLnJlc2V0KGdzdF9kZXZp Y2VfZ2V0X2Rpc3BsYXlfbmFtZShkZXZpY2UuZ2V0KCkpKTsKKyAgICAgICAgICAgICAgICBHU1Rf SU5GTygiRGV2aWNlIHJlbW92ZWQ6ICVzIiwgbmFtZS5nZXQoKSk7CisjZW5kaWYKKyAgICAgICAg ICAgICAgICBtYW5hZ2VyLT5kZXZpY2VDaGFuZ2VkKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgcmV0dXJuIEdfU09VUkNFX0NPTlRJTlVFOworICAgICAgICB9KSwg dGhpcyk7CisKKyAgICAgICAgaWYgKCFnc3RfZGV2aWNlX21vbml0b3Jfc3RhcnQobV9kZXZpY2VN b25pdG9yLmdldCgpKSkgeworICAgICAgICAgICAgR1NUX1dBUk5JTkdfT0JKRUNUKG1fZGV2aWNl TW9uaXRvci5nZXQoKSwgIkNvdWxkIG5vdCBzdGFydCBkZXZpY2UgbW9uaXRvciIpOworICAgICAg ICAgICAgbV9kZXZpY2VNb25pdG9yID0gbnVsbHB0cjsKKyAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgfQogICAgIH0KIAogICAgIEdMaXN0KiBkZXZpY2VzID0gZ19saXN0X3NvcnQoZ3N0X2Rl dmljZV9tb25pdG9yX2dldF9kZXZpY2VzKG1fZGV2aWNlTW9uaXRvci5nZXQoKSksIHNvcnREZXZp Y2VzKTsKICAgICB3aGlsZSAoZGV2aWNlcykgewotICAgICAgICBHUmVmUHRyPEdzdERldmljZT4g ZGV2aWNlID0gYWRvcHRHUmVmKEdTVF9ERVZJQ0VfQ0FTVChkZXZpY2VzLT5kYXRhKSk7Ci0KLSAg ICAgICAgYWRkRGV2aWNlKFdURk1vdmUoZGV2aWNlKSk7CisgICAgICAgIGFkZERldmljZShHU1Rf REVWSUNFX0NBU1QoZGV2aWNlcy0+ZGF0YSkpOwogICAgICAgICBkZXZpY2VzID0gZ19saXN0X2Rl bGV0ZV9saW5rKGRldmljZXMsIGRldmljZXMpOwogICAgIH0KLQotICAgIGdzdF9kZXZpY2VfbW9u aXRvcl9zdG9wKG1fZGV2aWNlTW9uaXRvci5nZXQoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dz dHJlYW1lci9HU3RyZWFtZXJDYXB0dXJlRGV2aWNlTWFuYWdlci5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5h Z2VyLmgKaW5kZXggMjdmYjBhYWJjMTBhOTVlOTEzYmVmYjY1MWQyMjdkNjkzMTJkNjgyYS4uYTYw MzYzYjNhMTBhYzc3N2M4YzRjYWRmMmFjYjNiNWU4M2UxNTQ3OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lckNhcHR1cmVE ZXZpY2VNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v Z3N0cmVhbWVyL0dTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyLmgKQEAgLTMyLDYgKzMyLDcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBHU3RyZWFtZXJDYXB0dXJlRGV2aWNlTWFu YWdlciA6IHB1YmxpYyBDYXB0dXJlRGV2aWNlTWFuYWdlciB7CiBwdWJsaWM6CisgICAgfkdTdHJl YW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyKCk7CiAgICAgT3B0aW9uYWw8R1N0cmVhbWVyQ2FwdHVy ZURldmljZT4gZ3N0cmVhbWVyRGV2aWNlV2l0aFVJRChjb25zdCBTdHJpbmcmKTsKIAogICAgIGNv bnN0IFZlY3RvcjxDYXB0dXJlRGV2aWNlPiYgY2FwdHVyZURldmljZXMoKSBmaW5hbDsKQEAgLTUz LDcgKzU0LDYgQEAgcHVibGljOgogICAgIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGUgZGV2aWNl VHlwZSgpIGZpbmFsIHsgcmV0dXJuIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6Ok1pY3JvcGhv bmU7IH0KIHByaXZhdGU6CiAgICAgR1N0cmVhbWVyQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcigp ID0gZGVmYXVsdDsKLSAgICB+R1N0cmVhbWVyQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcigpID0g ZGVmYXVsdDsKIH07CiAKIGNsYXNzIEdTdHJlYW1lclZpZGVvQ2FwdHVyZURldmljZU1hbmFnZXIg ZmluYWwgOiBwdWJsaWMgR1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXIgewpAQCAtNjQsNyAr NjQsNiBAQCBwdWJsaWM6CiAgICAgQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZSBkZXZpY2VUeXBl KCkgZmluYWwgeyByZXR1cm4gQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6Q2FtZXJhOyB9CiBw cml2YXRlOgogICAgIEdTdHJlYW1lclZpZGVvQ2FwdHVyZURldmljZU1hbmFnZXIoKSA9IGRlZmF1 bHQ7Ci0gICAgfkdTdHJlYW1lclZpZGVvQ2FwdHVyZURldmljZU1hbmFnZXIoKSA9IGRlZmF1bHQ7 CiB9OwogCiBjbGFzcyBHU3RyZWFtZXJEaXNwbGF5Q2FwdHVyZURldmljZU1hbmFnZXIgZmluYWwg OiBwdWJsaWMgR1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXIgewpAQCAtNzQsNyArNzMsNiBA QCBwdWJsaWM6CiAgICAgQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZSBkZXZpY2VUeXBlKCkgZmlu YWwgeyByZXR1cm4gQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6U2NyZWVuOyB9CiBwcml2YXRl OgogICAgIEdTdHJlYW1lckRpc3BsYXlDYXB0dXJlRGV2aWNlTWFuYWdlcigpID0gZGVmYXVsdDsK LSAgICB+R1N0cmVhbWVyRGlzcGxheUNhcHR1cmVEZXZpY2VNYW5hZ2VyKCkgPSBkZWZhdWx0Owog fTsKIAogfQo= 425755 2021-04-12 09:07:57 -0700 2021-04-13 03:53:09 -0700 Patch bug-222889-20210412090756.patch text/plain 8843 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg4MjQ2NjUyOTQwNzNl MDAzZDY2ZjYxZThmMDhjMmMwYWQ4Mjc0Yi4uZmYzNWNlNzI0OWU4NWQxYTkyZDk2MDYwOWVjMmJl ZTc4ZWY3YjU3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA0LTEyICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBDYXB0dXJlRGV2aWNlIG1vbml0b3JpbmcgaXMgbm90IGltcGxlbWVudGVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI4ODkKKworICAgICAgICBS ZXZpZXdlZCBieSBYYWJpZXIgUm9kcmlndWV6LUNhbHZhci4KKworICAgICAgICBHU3RyZWFtZXIg Y2FwdHVyZSBkZXZpY2UgZXZlbnRzIGFyZSBub3RpZmllZCB0aHJvdWdoIGEgbWVzc2FnZSBidXMg YXNzb2NpYXRlZCB0byB0aGUgdGhlCisgICAgICAgIEdzdERldmljZU1vbml0b3IsIHNvIHdlIG5l ZWQgdG8gd2F0Y2ggb3V0IGZvciB0aG9zZSBtZXNzYWdlcyBhbmQgbm90aWZ5IHRoZQorICAgICAg ICBSZWFsdGltZVNvdXJjZU1lZGlhQ2VudGVyIGFjY29yZGluZ2x5LgorCisgICAgICAgICogcGxh dGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2Vy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyOjp+ R1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXIpOgorICAgICAgICAoV2ViQ29yZTo6R1N0cmVh bWVyQ2FwdHVyZURldmljZU1hbmFnZXI6OmNhcHR1cmVEZXZpY2VzKToKKyAgICAgICAgKFdlYkNv cmU6OkdTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyOjphZGREZXZpY2UpOgorICAgICAgICAo V2ViQ29yZTo6R1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXI6OnJlZnJlc2hDYXB0dXJlRGV2 aWNlcyk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1l ckNhcHR1cmVEZXZpY2VNYW5hZ2VyLmg6CisKIDIwMjEtMDQtMTIgIFJvYiBCdWlzICA8cmJ1aXNA aWdhbGlhLmNvbT4KIAogICAgICAgICBDbGFtcCBvdmVycmlkaW5nQ29udGVudExvZ2ljYWxXaWR0 aC9IZWlnaHQgdG8gemVybwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dzdHJlYW1lci9HU3RyZWFtZXJDYXB0 dXJlRGV2aWNlTWFuYWdlci5jcHAKaW5kZXggMzhhZjRiZDhmZTgxOTY0NTFiYjg0NmRlNTdiMGRj M2VmOTBlZGU5OS4uYzA2ZmViMTVjZmY1ZTc2MWU1ZmRlYmIzNTIyMGIyZGE4YWZlMjQ2MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dT dHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9nc3RyZWFtZXIvR1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXIu Y3BwCkBAIC0yOCw2ICsyOCw5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorR1NUX0RFQlVH X0NBVEVHT1JZKHdlYmtpdEdTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyRGVidWdDYXRlZ29y eSk7CisjZGVmaW5lIEdTVF9DQVRfREVGQVVMVCB3ZWJraXRHU3RyZWFtZXJDYXB0dXJlRGV2aWNl TWFuYWdlckRlYnVnQ2F0ZWdvcnkKKwogc3RhdGljIGdpbnQgc29ydERldmljZXMoZ2NvbnN0cG9p bnRlciBhLCBnY29uc3Rwb2ludGVyIGIpCiB7CiAgICAgR3N0RGV2aWNlKiBhZGV2ID0gR1NUX0RF VklDRShhKSwgKmJkZXYgPSBHU1RfREVWSUNFKGIpOwpAQCAtNjYsNiArNjksMTIgQEAgR1N0cmVh bWVyRGlzcGxheUNhcHR1cmVEZXZpY2VNYW5hZ2VyJiBHU3RyZWFtZXJEaXNwbGF5Q2FwdHVyZURl dmljZU1hbmFnZXI6OnNpbmcKICAgICByZXR1cm4gbWFuYWdlcjsKIH0KIAorR1N0cmVhbWVyQ2Fw dHVyZURldmljZU1hbmFnZXI6On5HU3RyZWFtZXJDYXB0dXJlRGV2aWNlTWFuYWdlcigpCit7Cisg ICAgaWYgKG1fZGV2aWNlTW9uaXRvcikKKyAgICAgICAgZ3N0X2RldmljZV9tb25pdG9yX3N0b3Ao bV9kZXZpY2VNb25pdG9yLmdldCgpKTsKK30KKwogT3B0aW9uYWw8R1N0cmVhbWVyQ2FwdHVyZURl dmljZT4gR1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXI6OmdzdHJlYW1lckRldmljZVdpdGhV SUQoY29uc3QgU3RyaW5nJiBkZXZpY2VJRCkKIHsKICAgICBjYXB0dXJlRGV2aWNlcygpOwpAQCAt ODAsNiArODksMTAgQEAgT3B0aW9uYWw8R1N0cmVhbWVyQ2FwdHVyZURldmljZT4gR1N0cmVhbWVy Q2FwdHVyZURldmljZU1hbmFnZXI6OmdzdHJlYW1lckRldmljZVcKIGNvbnN0IFZlY3RvcjxDYXB0 dXJlRGV2aWNlPiYgR1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXI6OmNhcHR1cmVEZXZpY2Vz KCkKIHsKICAgICBlbnN1cmVHU3RyZWFtZXJJbml0aWFsaXplZCgpOworICAgIHN0YXRpYyBzdGQ6 Om9uY2VfZmxhZyBvbmNlRmxhZzsKKyAgICBzdGQ6OmNhbGxfb25jZShvbmNlRmxhZywgW10gewor ICAgICAgICBHU1RfREVCVUdfQ0FURUdPUllfSU5JVCh3ZWJraXRHU3RyZWFtZXJDYXB0dXJlRGV2 aWNlTWFuYWdlckRlYnVnQ2F0ZWdvcnksICJ3ZWJraXRjYXB0dXJlZGV2aWNlbWFuYWdlciIsIDAs ICJXZWJLaXQgQ2FwdHVyZSBEZXZpY2UgTWFuYWdlciIpOworICAgIH0pOwogICAgIGlmIChtX2Rl dmljZXMuaXNFbXB0eSgpKQogICAgICAgICByZWZyZXNoQ2FwdHVyZURldmljZXMoKTsKIApAQCAt MTA1LDYgKzExOCw3IEBAIHZvaWQgR1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXI6OmFkZERl dmljZShHUmVmUHRyPEdzdERldmljZT4mJiBkZXZpY2UpCiAgICAgLy8gVGhpcyBpc24ndCByZWFs bHkgYSBVSUQgYnV0IHNob3VsZCBiZSBnb29kIGVub3VnaCAobGlid2VicnRjCiAgICAgLy8gaXRz ZWxmIGRvZXMgdGhhdCBhdCBsZWFzdCBmb3IgcHVsc2VhdWRpbyBkZXZpY2VzKS4KICAgICBHVW5p cXVlUHRyPGNoYXI+IGRldmljZU5hbWUoZ3N0X2RldmljZV9nZXRfZGlzcGxheV9uYW1lKGRldmlj ZS5nZXQoKSkpOworICAgIEdTVF9JTkZPKCJSZWdpc3RlcmluZyBkZXZpY2UgJXMiLCBkZXZpY2VO YW1lLmdldCgpKTsKICAgICBnYm9vbGVhbiBpc0RlZmF1bHQgPSBGQUxTRTsKICAgICBnc3Rfc3Ry dWN0dXJlX2dldF9ib29sZWFuKHByb3BlcnRpZXMuZ2V0KCksICJpcy1kZWZhdWx0IiwgJmlzRGVm YXVsdCk7CiAKQEAgLTEyMSwzNyArMTM1LDcxIEBAIHZvaWQgR1N0cmVhbWVyQ2FwdHVyZURldmlj ZU1hbmFnZXI6OmFkZERldmljZShHUmVmUHRyPEdzdERldmljZT4mJiBkZXZpY2UpCiAKIHZvaWQg R1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXI6OnJlZnJlc2hDYXB0dXJlRGV2aWNlcygpCiB7 CisgICAgbV9kZXZpY2VzLmNsZWFyKCk7CiAgICAgaWYgKCFtX2RldmljZU1vbml0b3IpIHsKICAg ICAgICAgbV9kZXZpY2VNb25pdG9yID0gYWRvcHRHUmVmKGdzdF9kZXZpY2VfbW9uaXRvcl9uZXco KSk7CiAKLSAgICAgICAgQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZSB0eXBlID0gZGV2aWNlVHlw ZSgpOwotICAgICAgICBpZiAodHlwZSA9PSBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpDYW1l cmEpIHsKLSAgICAgICAgICAgIEdSZWZQdHI8R3N0Q2Fwcz4gY2FwcyA9IGFkb3B0R1JlZihnc3Rf Y2Fwc19uZXdfZW1wdHlfc2ltcGxlKCJ2aWRlby94LXJhdyIpKTsKKyAgICAgICAgc3dpdGNoIChk ZXZpY2VUeXBlKCkpIHsKKyAgICAgICAgY2FzZSBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpD YW1lcmE6IHsKKyAgICAgICAgICAgIGF1dG8gY2FwcyA9IGFkb3B0R1JlZihnc3RfY2Fwc19uZXdf ZW1wdHlfc2ltcGxlKCJ2aWRlby94LXJhdyIpKTsKICAgICAgICAgICAgIGdzdF9kZXZpY2VfbW9u aXRvcl9hZGRfZmlsdGVyKG1fZGV2aWNlTW9uaXRvci5nZXQoKSwgIlZpZGVvL1NvdXJjZSIsIGNh cHMuZ2V0KCkpOwotICAgICAgICB9IGVsc2UgaWYgKHR5cGUgPT0gQ2FwdHVyZURldmljZTo6RGV2 aWNlVHlwZTo6TWljcm9waG9uZSkgewotICAgICAgICAgICAgR1JlZlB0cjxHc3RDYXBzPiBjYXBz ID0gYWRvcHRHUmVmKGdzdF9jYXBzX25ld19lbXB0eV9zaW1wbGUoImF1ZGlvL3gtcmF3IikpOwor ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAgICAgY2FzZSBDYXB0dXJlRGV2aWNl OjpEZXZpY2VUeXBlOjpNaWNyb3Bob25lOiB7CisgICAgICAgICAgICBhdXRvIGNhcHMgPSBhZG9w dEdSZWYoZ3N0X2NhcHNfbmV3X2VtcHR5X3NpbXBsZSgiYXVkaW8veC1yYXciKSk7CiAgICAgICAg ICAgICBnc3RfZGV2aWNlX21vbml0b3JfYWRkX2ZpbHRlcihtX2RldmljZU1vbml0b3IuZ2V0KCks ICJBdWRpby9Tb3VyY2UiLCBjYXBzLmdldCgpKTsKLSAgICAgICAgfSBlbHNlCisgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBjYXNlIENhcHR1cmVEZXZpY2U6OkRldmljZVR5 cGU6OlNwZWFrZXI6CisgICAgICAgICAgICAvLyBGSVhNRTogQWRkIEF1ZGlvL1NpbmsgZmlsdGVy LiBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjg4MAorICAg ICAgICBjYXNlIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6OlNjcmVlbjoKKyAgICAgICAgY2Fz ZSBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpXaW5kb3c6CisgICAgICAgICAgICBicmVhazsK KyAgICAgICAgY2FzZSBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpVbmtub3duOgogICAgICAg ICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIC8vIEZJWE1FOiBBZGQgbW9uaXRvciBmb3IgYWRk ZWQvcmVtb3ZlZCBtZXNzYWdlcyBvbiB0aGUgYnVzLgotICAgIGlmICghZ3N0X2RldmljZV9tb25p dG9yX3N0YXJ0KG1fZGV2aWNlTW9uaXRvci5nZXQoKSkpIHsKLSAgICAgICAgR1NUX1dBUk5JTkdf T0JKRUNUKG1fZGV2aWNlTW9uaXRvci5nZXQoKSwgIkNvdWxkIG5vdCBzdGFydCBkZXZpY2UgbW9u aXRvciIpOwotICAgICAgICBtX2RldmljZU1vbml0b3IgPSBudWxscHRyOwotCi0gICAgICAgIHJl dHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGF1dG8gYnVzID0gYWRvcHRHUmVmKGdzdF9kZXZp Y2VfbW9uaXRvcl9nZXRfYnVzKG1fZGV2aWNlTW9uaXRvci5nZXQoKSkpOworICAgICAgICBnc3Rf YnVzX2FkZF93YXRjaChidXMuZ2V0KCksIHJlaW50ZXJwcmV0X2Nhc3Q8R3N0QnVzRnVuYz4oK1td KEdzdEJ1cyosIEdzdE1lc3NhZ2UqIG1lc3NhZ2UsIEdTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5h Z2VyKiBtYW5hZ2VyKSAtPiBnYm9vbGVhbiB7CisjaWZuZGVmIEdTVF9ESVNBQkxFX0dTVF9ERUJV RworICAgICAgICAgICAgR1JlZlB0cjxHc3REZXZpY2U+IGRldmljZTsKKyAgICAgICAgICAgIEdV bmlxdWVQdHI8Y2hhcj4gbmFtZTsKKyNlbmRpZgorICAgICAgICAgICAgc3dpdGNoIChHU1RfTUVT U0FHRV9UWVBFKG1lc3NhZ2UpKSB7CisgICAgICAgICAgICBjYXNlIEdTVF9NRVNTQUdFX0RFVklD RV9BRERFRDoKKyNpZm5kZWYgR1NUX0RJU0FCTEVfR1NUX0RFQlVHCisgICAgICAgICAgICAgICAg Z3N0X21lc3NhZ2VfcGFyc2VfZGV2aWNlX2FkZGVkKG1lc3NhZ2UsICZkZXZpY2Uub3V0UHRyKCkp OworICAgICAgICAgICAgICAgIG5hbWUucmVzZXQoZ3N0X2RldmljZV9nZXRfZGlzcGxheV9uYW1l KGRldmljZS5nZXQoKSkpOworICAgICAgICAgICAgICAgIEdTVF9JTkZPKCJEZXZpY2UgYWRkZWQ6 ICVzIiwgbmFtZS5nZXQoKSk7CisjZW5kaWYKKyAgICAgICAgICAgICAgICBtYW5hZ2VyLT5kZXZp Y2VDaGFuZ2VkKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIEdT VF9NRVNTQUdFX0RFVklDRV9SRU1PVkVEOgorI2lmbmRlZiBHU1RfRElTQUJMRV9HU1RfREVCVUcK KyAgICAgICAgICAgICAgICBnc3RfbWVzc2FnZV9wYXJzZV9kZXZpY2VfcmVtb3ZlZChtZXNzYWdl LCAmZGV2aWNlLm91dFB0cigpKTsKKyAgICAgICAgICAgICAgICBuYW1lLnJlc2V0KGdzdF9kZXZp Y2VfZ2V0X2Rpc3BsYXlfbmFtZShkZXZpY2UuZ2V0KCkpKTsKKyAgICAgICAgICAgICAgICBHU1Rf SU5GTygiRGV2aWNlIHJlbW92ZWQ6ICVzIiwgbmFtZS5nZXQoKSk7CisjZW5kaWYKKyAgICAgICAg ICAgICAgICBtYW5hZ2VyLT5kZXZpY2VDaGFuZ2VkKCk7CisgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgcmV0dXJuIEdfU09VUkNFX0NPTlRJTlVFOworICAgICAgICB9KSwg dGhpcyk7CisKKyAgICAgICAgaWYgKCFnc3RfZGV2aWNlX21vbml0b3Jfc3RhcnQobV9kZXZpY2VN b25pdG9yLmdldCgpKSkgeworICAgICAgICAgICAgR1NUX1dBUk5JTkdfT0JKRUNUKG1fZGV2aWNl TW9uaXRvci5nZXQoKSwgIkNvdWxkIG5vdCBzdGFydCBkZXZpY2UgbW9uaXRvciIpOworICAgICAg ICAgICAgbV9kZXZpY2VNb25pdG9yID0gbnVsbHB0cjsKKyAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgfQogICAgIH0KIAogICAgIEdMaXN0KiBkZXZpY2VzID0gZ19saXN0X3NvcnQoZ3N0X2Rl dmljZV9tb25pdG9yX2dldF9kZXZpY2VzKG1fZGV2aWNlTW9uaXRvci5nZXQoKSksIHNvcnREZXZp Y2VzKTsKICAgICB3aGlsZSAoZGV2aWNlcykgewotICAgICAgICBHUmVmUHRyPEdzdERldmljZT4g ZGV2aWNlID0gYWRvcHRHUmVmKEdTVF9ERVZJQ0VfQ0FTVChkZXZpY2VzLT5kYXRhKSk7Ci0KLSAg ICAgICAgYWRkRGV2aWNlKFdURk1vdmUoZGV2aWNlKSk7CisgICAgICAgIGFkZERldmljZShHU1Rf REVWSUNFX0NBU1QoZGV2aWNlcy0+ZGF0YSkpOwogICAgICAgICBkZXZpY2VzID0gZ19saXN0X2Rl bGV0ZV9saW5rKGRldmljZXMsIGRldmljZXMpOwogICAgIH0KLQotICAgIGdzdF9kZXZpY2VfbW9u aXRvcl9zdG9wKG1fZGV2aWNlTW9uaXRvci5nZXQoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2dz dHJlYW1lci9HU3RyZWFtZXJDYXB0dXJlRGV2aWNlTWFuYWdlci5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5h Z2VyLmgKaW5kZXggMjdmYjBhYWJjMTBhOTVlOTEzYmVmYjY1MWQyMjdkNjkzMTJkNjgyYS4uYTYw MzYzYjNhMTBhYzc3N2M4YzRjYWRmMmFjYjNiNWU4M2UxNTQ3OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vZ3N0cmVhbWVyL0dTdHJlYW1lckNhcHR1cmVE ZXZpY2VNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v Z3N0cmVhbWVyL0dTdHJlYW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyLmgKQEAgLTMyLDYgKzMyLDcg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBHU3RyZWFtZXJDYXB0dXJlRGV2aWNlTWFu YWdlciA6IHB1YmxpYyBDYXB0dXJlRGV2aWNlTWFuYWdlciB7CiBwdWJsaWM6CisgICAgfkdTdHJl YW1lckNhcHR1cmVEZXZpY2VNYW5hZ2VyKCk7CiAgICAgT3B0aW9uYWw8R1N0cmVhbWVyQ2FwdHVy ZURldmljZT4gZ3N0cmVhbWVyRGV2aWNlV2l0aFVJRChjb25zdCBTdHJpbmcmKTsKIAogICAgIGNv bnN0IFZlY3RvcjxDYXB0dXJlRGV2aWNlPiYgY2FwdHVyZURldmljZXMoKSBmaW5hbDsKQEAgLTUz LDcgKzU0LDYgQEAgcHVibGljOgogICAgIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGUgZGV2aWNl VHlwZSgpIGZpbmFsIHsgcmV0dXJuIENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6Ok1pY3JvcGhv bmU7IH0KIHByaXZhdGU6CiAgICAgR1N0cmVhbWVyQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcigp ID0gZGVmYXVsdDsKLSAgICB+R1N0cmVhbWVyQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcigpID0g ZGVmYXVsdDsKIH07CiAKIGNsYXNzIEdTdHJlYW1lclZpZGVvQ2FwdHVyZURldmljZU1hbmFnZXIg ZmluYWwgOiBwdWJsaWMgR1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXIgewpAQCAtNjQsNyAr NjQsNiBAQCBwdWJsaWM6CiAgICAgQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZSBkZXZpY2VUeXBl KCkgZmluYWwgeyByZXR1cm4gQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6Q2FtZXJhOyB9CiBw cml2YXRlOgogICAgIEdTdHJlYW1lclZpZGVvQ2FwdHVyZURldmljZU1hbmFnZXIoKSA9IGRlZmF1 bHQ7Ci0gICAgfkdTdHJlYW1lclZpZGVvQ2FwdHVyZURldmljZU1hbmFnZXIoKSA9IGRlZmF1bHQ7 CiB9OwogCiBjbGFzcyBHU3RyZWFtZXJEaXNwbGF5Q2FwdHVyZURldmljZU1hbmFnZXIgZmluYWwg OiBwdWJsaWMgR1N0cmVhbWVyQ2FwdHVyZURldmljZU1hbmFnZXIgewpAQCAtNzQsNyArNzMsNiBA QCBwdWJsaWM6CiAgICAgQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZSBkZXZpY2VUeXBlKCkgZmlu YWwgeyByZXR1cm4gQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6U2NyZWVuOyB9CiBwcml2YXRl OgogICAgIEdTdHJlYW1lckRpc3BsYXlDYXB0dXJlRGV2aWNlTWFuYWdlcigpID0gZGVmYXVsdDsK LSAgICB+R1N0cmVhbWVyRGlzcGxheUNhcHR1cmVEZXZpY2VNYW5hZ2VyKCkgPSBkZWZhdWx0Owog fTsKIAogfQo=