217652 2020-10-13 03:31:42 -0700 Improve computation of default audio input and output devices 2020-10-13 09:13:17 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1697215 0 youennf 2020-10-13 03:31:42 -0700 Improve computation of default audio input and output devices 1697216 1 youennf 2020-10-13 03:32:02 -0700 <rdar://problem/69857857> 1697219 2 411208 youennf 2020-10-13 03:45:50 -0700 Created attachment 411208 Patch 1697275 3 ews-feeder 2020-10-13 09:13:15 -0700 Committed r268396: <https://trac.webkit.org/changeset/268396> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411208. 411208 2020-10-13 03:45:50 -0700 2020-10-13 09:13:16 -0700 Patch bug-217652-20201013124548.patch text/plain 12603 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4MzQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjM5YzEwN2ZhZjI3YzVm OGZhNTQ0MjdkYWJiYTZjYjBmZWZjZWM0MC4uNjljYTNkZTZjNWI3MzkxMjA3ODExNDJhNWE4M2Vi ODAxMTBmODAwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTEwLTEzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBJbXByb3ZlIGNvbXB1dGF0 aW9uIG9mIGRlZmF1bHQgYXVkaW8gaW5wdXQgYW5kIG91dHB1dCBkZXZpY2VzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc2NTIKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzY5ODU3ODU3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBjb21wdXRhdGlvbiBvZiB0aGUgZGVmYXVs dCBhdWRpbyBvdXRwdXQgZGV2aWNlLgorICAgICAgICBGaXggYSBidWcgaW4gdGhlIGNvbXB1dGF0 aW9uIG9mIHRoZSBkZWZhdWx0IGRldmljZSBvbiB0aGUgZmlyc3QgY2FsbCB0byByZWZyZXNoQXVk aW9DYXB0dXJlRGV2aWNlcy4KKyAgICAgICAgUmVmYWN0b3IgdGhlIGNvZGUgYXMgZm9sbG93cyB0 byBtYWtlIGl0IGVhc2llciB0byByZWFkOgorICAgICAgICAtIGZvciBlYWNoIGNhc2Ugd2Ugd2Fu dCB0byByZWZyZXNoIGRldmljZXMsIGNvbXB1dGUgYSBWZWN0b3Igb2YgYXVkaW8gZGV2aWNlcywg Zmlyc3QgbWljcm9waG9uZXMsIHRoZW4gc3BlYWtlcnMuCisgICAgICAgIC0gbWFrZSBzdXJlIHRv IHB1dCBpbiB0aGF0IGxpc3QgdGhlIGRlZmF1bHQgbWljcm9waG9uZSBmaXJzdCBpbiB0aGUgbGlz dCBhbmQgdGhlIGRlZmF1bHQgc3BlYWtlciBqdXN0IGFmdGVyIHRoZSBsYXN0IG1pY3JvcGhvbmUg aW4gdGhlIGxpc3QuCisgICAgICAgIC0gY2hlY2sgd2hldGhlciB0aGUgbGlzdCBpcyBlcXVhbCB0 byB0aGUgY3VycmVudCBsaXN0IG9mIGF1ZGlvIGRldmljZXMuIElmIGl0IGlzIGVxdWFsLCBhYm9y dC4KKyAgICAgICAgLSB1cGRhdGUgbWljcm9waG9uZSBhbmQgc3BlYWtlciBsaXN0cyBhbmQgc2Vu ZCBub3RpZmljYXRpb24gb2YgZGV2aWNlIGNoYW5nZS4KKyAgICAgICAgTWlub3IgcmVmYWN0b3Jp bmcgdG8gbWFrZSBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlIGlzQWxpdmUgYSBwcml2YXRlIG1ldGhv ZC4KKworICAgICAgICBNYW51YWxseSB0ZXN0ZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRp YXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmljZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDb3JlQXVkaW9DYXB0dXJlRGV2aWNlOjpDb3JlQXVkaW9DYXB0dXJlRGV2aWNlKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmljZS5oOgor ICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNl TWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXREZWZhdWx0Q2FwdHVyZU91dHB1dERl dmljZSk6CisgICAgICAgIChXZWJDb3JlOjpDb3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcjo6 Y29yZUF1ZGlvQ2FwdHVyZURldmljZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1ZGlvQ2Fw dHVyZURldmljZU1hbmFnZXI6OnJlZnJlc2hBdWRpb0NhcHR1cmVEZXZpY2VzKToKKwogMjAyMC0x MC0xMiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGxp YndlYnJ0Yy5keWxpYiB2ZXJzaW9uIGNoZWNrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmljZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmlj ZS5jcHAKaW5kZXggZmU2MTdiMmJmMTg5MDRjNTMwMjIyODk5MGRiOTQzYmI2MDNhNmE0Mi4uZjVl YjY4MGU0ZDkwM2MyZjc3N2MwZGY0YzZmYTdlNjliYmU5M2MzZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVEZXZpY2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVk aW9DYXB0dXJlRGV2aWNlLmNwcApAQCAtODAsNiArODAsNyBAQCBDb3JlQXVkaW9DYXB0dXJlRGV2 aWNlOjpDb3JlQXVkaW9DYXB0dXJlRGV2aWNlKHVpbnQzMl90IGRldmljZUlELCBjb25zdCBTdHJp bmcmCiAgICAgOiBDYXB0dXJlRGV2aWNlKHBlcnNpc3RlbnRJRCwgZGV2aWNlVHlwZSwgbGFiZWws IGdyb3VwSUQpCiAgICAgLCBtX2RldmljZUlEKGRldmljZUlEKQogeworICAgIHNldEVuYWJsZWQo aXNBbGl2ZSgpKTsKIH0KIAogVmVjdG9yPEF1ZGlvRGV2aWNlSUQ+IENvcmVBdWRpb0NhcHR1cmVE ZXZpY2U6OnJlbGF0ZWRBdWRpb0RldmljZUlEcyhBdWRpb0RldmljZUlEIGRldmljZUlEKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRp b0NhcHR1cmVEZXZpY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21h Yy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlLmgKaW5kZXggNThhMTJhOTExNGY2ZmZlMmQ0NDc5Yjkx ZWEwOWI3ZjJkMGUwMzYyMC4uMjY4N2JmYzYzZjY2M2NjNjIxYjJlZGU0M2Y0YWFlOTI2OGNlN2E1 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0Nv cmVBdWRpb0NhcHR1cmVEZXZpY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRp YXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmljZS5oCkBAIC00MywxMiArNDMsMTIgQEAg cHVibGljOgogCiAgICAgdWludDMyX3QgZGV2aWNlSUQoKSBjb25zdCB7IHJldHVybiBtX2Rldmlj ZUlEOyB9CiAgICAgUmV0YWluUHRyPENNQ2xvY2tSZWY+IGRldmljZUNsb2NrKCk7Ci0gICAgYm9v bCBpc0FsaXZlKCk7CiAKICAgICBzdGF0aWMgVmVjdG9yPEF1ZGlvRGV2aWNlSUQ+IHJlbGF0ZWRB dWRpb0RldmljZUlEcyhBdWRpb0RldmljZUlEKTsKIAogcHJpdmF0ZToKICAgICBDb3JlQXVkaW9D YXB0dXJlRGV2aWNlKHVpbnQzMl90LCBjb25zdCBTdHJpbmcmIHBlcnNpc3RlbnRJRCwgRGV2aWNl VHlwZSwgY29uc3QgU3RyaW5nJiBsYWJlbCwgY29uc3QgU3RyaW5nJiBncm91cElEKTsKKyAgICBi b29sIGlzQWxpdmUoKTsKIAogICAgIHVpbnQzMl90IG1fZGV2aWNlSUQgeyAwIH07CiAgICAgUmV0 YWluUHRyPENNQ2xvY2tSZWY+IG1fZGV2aWNlQ2xvY2s7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFn ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRp b0NhcHR1cmVEZXZpY2VNYW5hZ2VyLmNwcAppbmRleCA3YmU2MWJjYjY4Mzk3ODRkNmY5MTI1NDE0 ODUxNTFiMzU4OGQ0NTlhLi43MDBlZWQ5ZWQ4YWYxZjk3MDVhZTQ2N2Q2OGViNmU2MTNmYjAzMjAw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29y ZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlci5jcHAKQEAg LTE0MCw2ICsxNDAsMTggQEAgc3RhdGljIGlubGluZSBPcHRpb25hbDxDb3JlQXVkaW9DYXB0dXJl RGV2aWNlPiBnZXREZWZhdWx0Q2FwdHVyZUlucHV0RGV2aWNlKCkKICAgICByZXR1cm4gQ29yZUF1 ZGlvQ2FwdHVyZURldmljZTo6Y3JlYXRlKGRldmljZUlELCBDYXB0dXJlRGV2aWNlOjpEZXZpY2VU eXBlOjpNaWNyb3Bob25lLCB7IH0pOwogfQogCitzdGF0aWMgaW5saW5lIE9wdGlvbmFsPENvcmVB dWRpb0NhcHR1cmVEZXZpY2U+IGdldERlZmF1bHRDYXB0dXJlT3V0cHV0RGV2aWNlKCkKK3sKKyAg ICBBdWRpb09iamVjdFByb3BlcnR5QWRkcmVzcyBhZGRyZXNzIHsga0F1ZGlvSGFyZHdhcmVQcm9w ZXJ0eURlZmF1bHRPdXRwdXREZXZpY2UsIGtBdWRpb09iamVjdFByb3BlcnR5U2NvcGVHbG9iYWws IGtBdWRpb09iamVjdFByb3BlcnR5RWxlbWVudE1hc3RlciB9OworICAgIFVJbnQzMiBwcm9wZXJ0 eVNpemUgPSBzaXplb2YoQXVkaW9EZXZpY2VJRCk7CisgICAgQXVkaW9EZXZpY2VJRCBkZXZpY2VJ RCA9IGtBdWRpb0RldmljZVVua25vd247CisgICAgYXV0byBlcnIgPSBBdWRpb09iamVjdEdldFBy b3BlcnR5RGF0YShrQXVkaW9PYmplY3RTeXN0ZW1PYmplY3QsICZhZGRyZXNzLCAwLCBudWxscHRy LCAmcHJvcGVydHlTaXplLCAmZGV2aWNlSUQpOworCisgICAgaWYgKGVyciAhPSBub0VyciB8fCBk ZXZpY2VJRCA9PSBrQXVkaW9EZXZpY2VVbmtub3duKQorICAgICAgICByZXR1cm4geyB9OworICAg IHJldHVybiBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlOjpjcmVhdGUoZGV2aWNlSUQsIENhcHR1cmVE ZXZpY2U6OkRldmljZVR5cGU6OlNwZWFrZXIsIHsgfSk7Cit9CisKIFZlY3RvcjxDb3JlQXVkaW9D YXB0dXJlRGV2aWNlPiYgQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6OmNvcmVBdWRpb0Nh cHR1cmVEZXZpY2VzKCkKIHsKICAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXplZDsKQEAgLTE1MCw3 ICsxNjIsNyBAQCBWZWN0b3I8Q29yZUF1ZGlvQ2FwdHVyZURldmljZT4mIENvcmVBdWRpb0NhcHR1 cmVEZXZpY2VNYW5hZ2VyOjpjb3JlQXVkaW9DYXB0dXJlRAogICAgICAgICBhdXRvIGxpc3RlbmVy ID0gXihVSW50MzIgY291bnQsIGNvbnN0IEF1ZGlvT2JqZWN0UHJvcGVydHlBZGRyZXNzIHByb3Bl cnRpZXNbXSkgewogICAgICAgICAgICAgYm9vbCBub3RpZnkgPSBmYWxzZTsKICAgICAgICAgICAg IGZvciAoVUludDMyIGkgPSAwOyBpIDwgY291bnQ7ICsraSkKLSAgICAgICAgICAgICAgICBub3Rp ZnkgfD0gKHByb3BlcnRpZXNbaV0ubVNlbGVjdG9yID09IGtBdWRpb0hhcmR3YXJlUHJvcGVydHlE ZXZpY2VzIHx8IHByb3BlcnRpZXNbaV0ubVNlbGVjdG9yID09IGtBdWRpb0hhcmR3YXJlUHJvcGVy dHlEZWZhdWx0SW5wdXREZXZpY2UpOworICAgICAgICAgICAgICAgIG5vdGlmeSB8PSAocHJvcGVy dGllc1tpXS5tU2VsZWN0b3IgPT0ga0F1ZGlvSGFyZHdhcmVQcm9wZXJ0eURldmljZXMgfHwgcHJv cGVydGllc1tpXS5tU2VsZWN0b3IgPT0ga0F1ZGlvSGFyZHdhcmVQcm9wZXJ0eURlZmF1bHRJbnB1 dERldmljZSB8fCBwcm9wZXJ0aWVzW2ldLm1TZWxlY3RvciA9PSBrQXVkaW9IYXJkd2FyZVByb3Bl cnR5RGVmYXVsdE91dHB1dERldmljZSk7CiAKICAgICAgICAgICAgIGlmIChub3RpZnkpCiAgICAg ICAgICAgICAgICAgQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6OnNpbmdsZXRvbigpLnJl ZnJlc2hBdWRpb0NhcHR1cmVEZXZpY2VzKE5vdGlmeUlmRGV2aWNlc0hhdmVDaGFuZ2VkOjpOb3Rp ZnkpOwpAQCAtMTY1LDYgKzE3NywxMSBAQCBWZWN0b3I8Q29yZUF1ZGlvQ2FwdHVyZURldmljZT4m IENvcmVBdWRpb0NhcHR1cmVEZXZpY2VNYW5hZ2VyOjpjb3JlQXVkaW9DYXB0dXJlRAogICAgICAg ICBlcnIgPSBBdWRpb09iamVjdEFkZFByb3BlcnR5TGlzdGVuZXJCbG9jayhrQXVkaW9PYmplY3RT eXN0ZW1PYmplY3QsICZhZGRyZXNzLCBkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBsaXN0ZW5l cik7CiAgICAgICAgIGlmIChlcnIpCiAgICAgICAgICAgICBMT0dfRVJST1IoIkNvcmVBdWRpb0Nh cHR1cmVEZXZpY2VNYW5hZ2VyOjpkZXZpY2VzKCVwKSBBdWRpb09iamVjdEFkZFByb3BlcnR5TGlz dGVuZXIgZm9yIGtBdWRpb0hhcmR3YXJlUHJvcGVydHlEZWZhdWx0SW5wdXREZXZpY2UgcmV0dXJu ZWQgZXJyb3IgJWQgKCUuNHMpIiwgdGhpcywgKGludCllcnIsIChjaGFyKikmZXJyKTsKKworICAg ICAgICBhZGRyZXNzID0geyBrQXVkaW9IYXJkd2FyZVByb3BlcnR5RGVmYXVsdE91dHB1dERldmlj ZSwga0F1ZGlvT2JqZWN0UHJvcGVydHlTY29wZUdsb2JhbCwga0F1ZGlvT2JqZWN0UHJvcGVydHlF bGVtZW50TWFzdGVyIH07CisgICAgICAgIGVyciA9IEF1ZGlvT2JqZWN0QWRkUHJvcGVydHlMaXN0 ZW5lckJsb2NrKGtBdWRpb09iamVjdFN5c3RlbU9iamVjdCwgJmFkZHJlc3MsIGRpc3BhdGNoX2dl dF9tYWluX3F1ZXVlKCksIGxpc3RlbmVyKTsKKyAgICAgICAgaWYgKGVycikKKyAgICAgICAgICAg IExPR19FUlJPUigiQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6OmRldmljZXMoJXApIEF1 ZGlvT2JqZWN0QWRkUHJvcGVydHlMaXN0ZW5lciBmb3Iga0F1ZGlvSGFyZHdhcmVQcm9wZXJ0eURl ZmF1bHRPdXRwdXREZXZpY2UgcmV0dXJuZWQgZXJyb3IgJWQgKCUuNHMpIiwgdGhpcywgKGludCll cnIsIChjaGFyKikmZXJyKTsKICAgICB9CiAKICAgICByZXR1cm4gbV9jb3JlQXVkaW9DYXB0dXJl RGV2aWNlczsKQEAgLTE4Niw1NyArMjAzLDU2IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBoYXNEZXZp Y2UoY29uc3QgVmVjdG9yPENvcmVBdWRpb0NhcHR1cmVEZXZpY2U+JiBkZXZpY2VzLCB1aW50CiAg ICAgfSk7CiB9CiAKLXZvaWQgQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6OnJlZnJlc2hB dWRpb0NhcHR1cmVEZXZpY2VzKE5vdGlmeUlmRGV2aWNlc0hhdmVDaGFuZ2VkIG5vdGlmeSkKK3N0 YXRpYyBpbmxpbmUgVmVjdG9yPENvcmVBdWRpb0NhcHR1cmVEZXZpY2U+IGNvbXB1dGVBdWRpb0Rl dmljZUxpc3QoKQogewotICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0KICAgICBBdWRpb09i amVjdFByb3BlcnR5QWRkcmVzcyBhZGRyZXNzID0geyBrQXVkaW9IYXJkd2FyZVByb3BlcnR5RGV2 aWNlcywga0F1ZGlvT2JqZWN0UHJvcGVydHlTY29wZUdsb2JhbCwga0F1ZGlvT2JqZWN0UHJvcGVy dHlFbGVtZW50TWFzdGVyIH07CiAgICAgVUludDMyIGRhdGFTaXplID0gMDsKICAgICBhdXRvIGVy ciA9IEF1ZGlvT2JqZWN0R2V0UHJvcGVydHlEYXRhU2l6ZShrQXVkaW9PYmplY3RTeXN0ZW1PYmpl Y3QsICZhZGRyZXNzLCAwLCBudWxscHRyLCAmZGF0YVNpemUpOwogICAgIGlmIChlcnIpIHsKLSAg ICAgICAgTE9HKE1lZGlhLCAiQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6OnJlZnJlc2hB dWRpb0NhcHR1cmVEZXZpY2VzKCVwKSBmYWlsZWQgdG8gZ2V0IHNpemUgb2YgZGV2aWNlIGxpc3Qg JWQgKCUuNHMpIiwgdGhpcywgKGludCllcnIsIChjaGFyKikmZXJyKTsKLSAgICAgICAgcmV0dXJu OworICAgICAgICBSRUxFQVNFX0xPRyhXZWJSVEMsICJjb21wdXRlQXVkaW9EZXZpY2VMaXN0IGZh aWxlZCB0byBnZXQgc2l6ZSBvZiBkZXZpY2UgbGlzdCAlZCAoJS40cykiLCAoaW50KWVyciwgKGNo YXIqKSZlcnIpOworICAgICAgICByZXR1cm4geyB9OwogICAgIH0KIAogICAgIHNpemVfdCBkZXZp Y2VDb3VudCA9IGRhdGFTaXplIC8gc2l6ZW9mKEF1ZGlvT2JqZWN0SUQpOwogICAgIFZlY3RvcjxB dWRpb09iamVjdElEPiBkZXZpY2VJRHMoZGV2aWNlQ291bnQpOwogICAgIGVyciA9IEF1ZGlvT2Jq ZWN0R2V0UHJvcGVydHlEYXRhKGtBdWRpb09iamVjdFN5c3RlbU9iamVjdCwgJmFkZHJlc3MsIDAs IG51bGxwdHIsICZkYXRhU2l6ZSwgZGV2aWNlSURzLmRhdGEoKSk7CiAgICAgaWYgKGVycikgewot ICAgICAgICBMT0coTWVkaWEsICJDb3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcjo6cmVmcmVz aEF1ZGlvQ2FwdHVyZURldmljZXMoJXApIGZhaWxlZCB0byBnZXQgZGV2aWNlIGxpc3QgJWQgKCUu NHMpIiwgdGhpcywgKGludCllcnIsIChjaGFyKikmZXJyKTsKLSAgICAgICAgcmV0dXJuOworICAg ICAgICBSRUxFQVNFX0xPRyhXZWJSVEMsICJjb21wdXRlQXVkaW9EZXZpY2VMaXN0IGZhaWxlZCB0 byBnZXQgZGV2aWNlIGxpc3QgJWQgKCUuNHMpIiwgKGludCllcnIsIChjaGFyKikmZXJyKTsKKyAg ICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiAKKyAgICBWZWN0b3I8Q29yZUF1ZGlvQ2FwdHVyZURl dmljZT4gYXVkaW9EZXZpY2VzOworCiAgICAgYXV0byBkZWZhdWx0SW5wdXREZXZpY2UgPSBnZXRE ZWZhdWx0Q2FwdHVyZUlucHV0RGV2aWNlKCk7Ci0gICAgYm9vbCBoYXZlRGV2aWNlQ2hhbmdlcyA9 IGZhbHNlOwotICAgIGlmIChkZWZhdWx0SW5wdXREZXZpY2UgJiYgIW1fY29yZUF1ZGlvQ2FwdHVy ZURldmljZXMuaXNFbXB0eSgpICYmIG1fY29yZUF1ZGlvQ2FwdHVyZURldmljZXMuZmlyc3QoKS5k ZXZpY2VJRCgpICE9IGRlZmF1bHRJbnB1dERldmljZS0+ZGV2aWNlSUQoKSkgewotICAgICAgICBt X2NvcmVBdWRpb0NhcHR1cmVEZXZpY2VzID0gVmVjdG9yPENvcmVBdWRpb0NhcHR1cmVEZXZpY2U+ Ojpmcm9tKFdURk1vdmUoKmRlZmF1bHRJbnB1dERldmljZSkpOwotICAgICAgICBoYXZlRGV2aWNl Q2hhbmdlcyA9IHRydWU7Ci0gICAgfQorICAgIGlmIChkZWZhdWx0SW5wdXREZXZpY2UpCisgICAg ICAgIGF1ZGlvRGV2aWNlcy5hcHBlbmQoV1RGTW92ZSgqZGVmYXVsdElucHV0RGV2aWNlKSk7CiAK ICAgICAvLyBNaWNyb3Bob25lcwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZGV2aWNlQ291 bnQ7IGkrKykgewogICAgICAgICBBdWRpb09iamVjdElEIGRldmljZUlEID0gZGV2aWNlSURzW2ld OwogCi0gICAgICAgIGlmICghZGV2aWNlSGFzSW5wdXRTdHJlYW1zKGRldmljZUlEKSB8fCBoYXNE ZXZpY2UobV9jb3JlQXVkaW9DYXB0dXJlRGV2aWNlcywgZGV2aWNlSUQsIENhcHR1cmVEZXZpY2U6 OkRldmljZVR5cGU6Ok1pY3JvcGhvbmUpKQorICAgICAgICBpZiAoIWRldmljZUhhc0lucHV0U3Ry ZWFtcyhkZXZpY2VJRCkgfHwgaGFzRGV2aWNlKGF1ZGlvRGV2aWNlcywgZGV2aWNlSUQsIENhcHR1 cmVEZXZpY2U6OkRldmljZVR5cGU6Ok1pY3JvcGhvbmUpKQogICAgICAgICAgICAgY29udGludWU7 CiAKICAgICAgICAgYXV0byBtaWNyb3Bob25lRGV2aWNlID0gQ29yZUF1ZGlvQ2FwdHVyZURldmlj ZTo6Y3JlYXRlKGRldmljZUlELCBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpNaWNyb3Bob25l LCB7IH0pOwotICAgICAgICBpZiAobWljcm9waG9uZURldmljZSAmJiBpc1ZhbGlkQ2FwdHVyZURl dmljZShtaWNyb3Bob25lRGV2aWNlLnZhbHVlKCkpKSB7Ci0gICAgICAgICAgICBtX2NvcmVBdWRp b0NhcHR1cmVEZXZpY2VzLmFwcGVuZChXVEZNb3ZlKG1pY3JvcGhvbmVEZXZpY2UudmFsdWUoKSkp OwotICAgICAgICAgICAgaGF2ZURldmljZUNoYW5nZXMgPSB0cnVlOwotICAgICAgICB9CisgICAg ICAgIGlmIChtaWNyb3Bob25lRGV2aWNlICYmIGlzVmFsaWRDYXB0dXJlRGV2aWNlKG1pY3JvcGhv bmVEZXZpY2UudmFsdWUoKSkpCisgICAgICAgICAgICBhdWRpb0RldmljZXMuYXBwZW5kKFdURk1v dmUobWljcm9waG9uZURldmljZS52YWx1ZSgpKSk7CiAgICAgfQogCisgICAgYXV0byBkZWZhdWx0 T3V0cHV0RGV2aWNlID0gZ2V0RGVmYXVsdENhcHR1cmVPdXRwdXREZXZpY2UoKTsKKyAgICBpZiAo ZGVmYXVsdE91dHB1dERldmljZSkKKyAgICAgICAgYXVkaW9EZXZpY2VzLmFwcGVuZChXVEZNb3Zl KCpkZWZhdWx0T3V0cHV0RGV2aWNlKSk7CisKICAgICAvLyBTcGVha2VycwogICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgZGV2aWNlQ291bnQ7IGkrKykgewogICAgICAgICBBdWRpb09iamVjdElE IGRldmljZUlEID0gZGV2aWNlSURzW2ldOwogCi0gICAgICAgIGlmICghZGV2aWNlSGFzT3V0cHV0 U3RyZWFtcyhkZXZpY2VJRCkgfHwgaGFzRGV2aWNlKG1fY29yZUF1ZGlvQ2FwdHVyZURldmljZXMs IGRldmljZUlELCBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpTcGVha2VyKSkKKyAgICAgICAg aWYgKCFkZXZpY2VIYXNPdXRwdXRTdHJlYW1zKGRldmljZUlEKSB8fCBoYXNEZXZpY2UoYXVkaW9E ZXZpY2VzLCBkZXZpY2VJRCwgQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6U3BlYWtlcikpCiAg ICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBTdHJpbmcgZ3JvdXBJRDsKICAgICAgICAg Zm9yIChhdXRvIHJlbGF0ZWREZXZpY2VJRCA6IENvcmVBdWRpb0NhcHR1cmVEZXZpY2U6OnJlbGF0 ZWRBdWRpb0RldmljZUlEcyhkZXZpY2VJRCkpIHsKLSAgICAgICAgICAgIGZvciAoYXV0byYgZGV2 aWNlIDogbV9jb3JlQXVkaW9DYXB0dXJlRGV2aWNlcykgeworICAgICAgICAgICAgZm9yIChhdXRv JiBkZXZpY2UgOiBhdWRpb0RldmljZXMpIHsKICAgICAgICAgICAgICAgICBpZiAoZGV2aWNlLmRl dmljZUlEKCkgPT0gcmVsYXRlZERldmljZUlEICYmIGRldmljZS50eXBlKCkgPT0gQ2FwdHVyZURl dmljZTo6RGV2aWNlVHlwZTo6TWljcm9waG9uZSkgewogICAgICAgICAgICAgICAgICAgICBncm91 cElEID0gZGV2aWNlLnBlcnNpc3RlbnRJZCgpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsK QEAgLTI0OCwyOSArMjY0LDM4IEBAIHZvaWQgQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6 OnJlZnJlc2hBdWRpb0NhcHR1cmVEZXZpY2VzKE5vdGlmeUlmRGV2aWNlc0hhCiAgICAgICAgIGlm IChkZXZpY2UpIHsKICAgICAgICAgICAgIC8vIElmIHRoZXJlIGlzIG5vIGdyb3VwSUQsIHJlbGF0 ZSBkZXZpY2VzIGlmIHRoZSBsYWJlbCBpcyBtYXRjaGluZy4KICAgICAgICAgICAgIGlmIChncm91 cElELmlzTnVsbCgpKSB7Ci0gICAgICAgICAgICAgICAgZm9yIChhdXRvJiBleGlzdGluZ0Rldmlj ZSA6IG1fY29yZUF1ZGlvQ2FwdHVyZURldmljZXMpIHsKKyAgICAgICAgICAgICAgICBmb3IgKGF1 dG8mIGV4aXN0aW5nRGV2aWNlIDogYXVkaW9EZXZpY2VzKSB7CiAgICAgICAgICAgICAgICAgICAg IGlmIChleGlzdGluZ0RldmljZS5sYWJlbCgpID09IGRldmljZS0+bGFiZWwoKSAmJiBleGlzdGlu Z0RldmljZS50eXBlKCkgPT0gQ2FwdHVyZURldmljZTo6RGV2aWNlVHlwZTo6TWljcm9waG9uZSkg ewogICAgICAgICAgICAgICAgICAgICAgICAgZGV2aWNlLT5zZXRHcm91cElkKGV4aXN0aW5nRGV2 aWNlLnBlcnNpc3RlbnRJZCgpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAg ICAgICAgICAgbV9jb3JlQXVkaW9DYXB0dXJlRGV2aWNlcy5hcHBlbmQoV1RGTW92ZShkZXZpY2Uu dmFsdWUoKSkpOwotICAgICAgICAgICAgaGF2ZURldmljZUNoYW5nZXMgPSB0cnVlOworICAgICAg ICAgICAgYXVkaW9EZXZpY2VzLmFwcGVuZChXVEZNb3ZlKGRldmljZS52YWx1ZSgpKSk7CiAgICAg ICAgIH0KICAgICB9CisgICAgcmV0dXJuIGF1ZGlvRGV2aWNlczsKK30KIAotICAgIGZvciAoYXV0 byYgZGV2aWNlIDogbV9jb3JlQXVkaW9DYXB0dXJlRGV2aWNlcykgewotICAgICAgICBib29sIGlz QWxpdmUgPSBkZXZpY2UuaXNBbGl2ZSgpOwotICAgICAgICBpZiAoZGV2aWNlLmVuYWJsZWQoKSAh PSBpc0FsaXZlKSB7Ci0gICAgICAgICAgICBkZXZpY2Uuc2V0RW5hYmxlZChpc0FsaXZlKTsKLSAg ICAgICAgICAgIGhhdmVEZXZpY2VDaGFuZ2VzID0gdHJ1ZTsKK3ZvaWQgQ29yZUF1ZGlvQ2FwdHVy ZURldmljZU1hbmFnZXI6OnJlZnJlc2hBdWRpb0NhcHR1cmVEZXZpY2VzKE5vdGlmeUlmRGV2aWNl c0hhdmVDaGFuZ2VkIG5vdGlmeSkKK3sKKyAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOworCisg ICAgYXV0byBhdWRpb0RldmljZXMgPSBjb21wdXRlQXVkaW9EZXZpY2VMaXN0KCk7CisgICAgYm9v bCBoYXZlRGV2aWNlQ2hhbmdlcyA9IGF1ZGlvRGV2aWNlcy5zaXplKCkgIT0gbV9jb3JlQXVkaW9D YXB0dXJlRGV2aWNlcy5zaXplKCk7CisgICAgaWYgKCFoYXZlRGV2aWNlQ2hhbmdlcykgeworICAg ICAgICBmb3IgKHNpemVfdCBjcHRyID0gMDsgY3B0ciA8IGF1ZGlvRGV2aWNlcy5zaXplKCk7ICsr Y3B0cikgeworICAgICAgICAgICAgaWYgKGF1ZGlvRGV2aWNlc1tjcHRyXS50eXBlKCkgIT0gbV9j b3JlQXVkaW9DYXB0dXJlRGV2aWNlc1tjcHRyXS50eXBlKCkgfHwgYXVkaW9EZXZpY2VzW2NwdHJd LmRldmljZUlEKCkgIT0gbV9jb3JlQXVkaW9DYXB0dXJlRGV2aWNlc1tjcHRyXS5kZXZpY2VJRCgp IHx8IGF1ZGlvRGV2aWNlc1tjcHRyXS5lbmFibGVkKCkgIT0gbV9jb3JlQXVkaW9DYXB0dXJlRGV2 aWNlc1tjcHRyXS5lbmFibGVkKCkpIHsKKyAgICAgICAgICAgICAgICBoYXZlRGV2aWNlQ2hhbmdl cyA9IHRydWU7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9CiAgICAgICAg IH0KICAgICB9Ci0KICAgICBpZiAoIWhhdmVEZXZpY2VDaGFuZ2VzKQogICAgICAgICByZXR1cm47 CiAKKyAgICBtX2NvcmVBdWRpb0NhcHR1cmVEZXZpY2VzID0gV1RGTW92ZShhdWRpb0RldmljZXMp OworCiAgICAgbV9jYXB0dXJlRGV2aWNlcy5jbGVhcigpOwogICAgIG1fc3BlYWtlckRldmljZXMu Y2xlYXIoKTsKICAgICBmb3IgKGF1dG8mIGRldmljZSA6IG1fY29yZUF1ZGlvQ2FwdHVyZURldmlj ZXMpIHsK