223565 2021-03-21 20:24:53 -0700 Add AVAudioSessionCaptureDeviceManager::isolatedCopy and use it to copy device list calculated on background queue 2021-03-22 17:52:42 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw youennf oldest_to_newest 1742121 0 eric.carlson 2021-03-21 20:24:53 -0700 AVAudioSessionCaptureDeviceManager should use crossThreadCopy on CaptureDevice list allocated on a background queue. 1742122 1 eric.carlson 2021-03-21 20:25:46 -0700 <rdar://75480589> 1742124 2 423848 eric.carlson 2021-03-21 20:34:06 -0700 Created attachment 423848 Patch 1742168 3 423848 youennf 2021-03-22 02:40:27 -0700 Comment on attachment 423848 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423848&action=review > Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDevice.h:42 > + AVAudioSessionCaptureDevice isolatedCopy() const; We could try to change it to: AVAudioSessionCaptureDevice isolatedCopy() &&; > Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDevice.mm:61 > + groupId().isolatedCopy(), If we go with isolatedCopy() &&, doing WTFMove(m_persistentId).isolatedCopy(), WTFMove(m_groupId).isolatedCopy() will most probably remove the memory allocation of a new string. 1742277 4 423905 eric.carlson 2021-03-22 10:15:27 -0700 Created attachment 423905 Patch for landing 1742311 5 423905 youennf 2021-03-22 11:27:18 -0700 Comment on attachment 423905 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=423905&action=review > Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDevice.mm:58 > + m_persistentId.isolatedCopy(), WTFMove(m_persistentId) would remove a potential memory allocation. > Source/WebCore/platform/mediastream/ios/AVAudioSessionCaptureDevice.mm:61 > + m_groupId.isolatedCopy(), Ditto for m_label and m_groupId. 1742468 6 423938 eric.carlson 2021-03-22 14:16:21 -0700 Created attachment 423938 Updated patch for landing 1742571 7 ews-feeder 2021-03-22 16:57:40 -0700 Committed r274819: <https://commits.webkit.org/r274819> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423938. 423848 2021-03-21 20:34:06 -0700 2021-03-22 10:15:25 -0700 Patch bug-223565-20210321203405.patch text/plain 5268 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmM0NjYzODU4OGJkMGFh ZmVkYTJhYmM3ZDMwZGJhNDlkODE5ZDU1Zi4uNTUxZDIxZGI5NjdlOTg1YTY3MGM0ODg4NjVjMDQz YjA2NDliOGI4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIxLTAzLTIxICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFWQXVkaW9TZXNz aW9uQ2FwdHVyZURldmljZU1hbmFnZXIgc2hvdWxkIHVzZSBjcm9zc1RocmVhZENvcHkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzU2NQorICAgICAg ICA8cmRhcjovLzc1NDgwNTg5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGhpcyBjYW4gb25seSBiZSB0ZXN0ZWQgb24gZGV2 aWNlLgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9u Q2FwdHVyZURldmljZS5oOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL2lvcy9BVkF1 ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2UubW06CisgICAgICAgIChXZWJDb3JlOjpBVkF1ZGlvU2Vz c2lvbkNhcHR1cmVEZXZpY2U6OkFWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZSk6IE5ldyBjb25z dHJ1Y3Rvci4KKyAgICAgICAgKFdlYkNvcmU6OkFWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZTo6 aXNvbGF0ZWRDb3B5IGNvbnN0KTogTmV3LgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJl YW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZU1hbmFnZXIubW06CisgICAgICAgIChX ZWJDb3JlOjpBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2VNYW5hZ2VyOjpyZWZyZXNoQXVkaW9D YXB0dXJlRGV2aWNlcyk6IENhbGwKKyAgICAgICAgYGNyb3NzVGhyZWFkQ29weWAgd2hlbiBtb3Zp bmcgZnJvbSBBVkF1ZGlvU2Vzc2lvbiBxdWV1ZSB0byBtYWluIHRocmVhZC4KKyAgICAgICAgKFdl YkNvcmU6OkFWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZU1hbmFnZXI6OmdldENhcHR1cmVEZXZp Y2VzKTogRGl0dG8uCisKIDIwMjEtMDMtMTcgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CiAKICAgICAgICAgW0dQVVBdIG1lZGlhL3ZpZGVvLXNldC1yYXRlLWZyb20tcGF1 c2UuaHRtbCBmYWlscwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZS5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZS5oCmlu ZGV4IDExMDE1ZjY0NGQ0NDhlYTFiMmZjN2FkNWJjYTg0Mzc0YzRlZGE5YzUuLmI4OTkyNjI1MDUz N2ZkMDc5OTgyNmMyY2RjNTVlYTlkMTQ0YzI0M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhc3RyZWFtL2lvcy9BVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2UuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nlc3Np b25DYXB0dXJlRGV2aWNlLmgKQEAgLTM5LDggKzM5LDExIEBAIHB1YmxpYzoKICAgICBzdGF0aWMg QVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlIGNyZWF0ZShBVkF1ZGlvU2Vzc2lvblBvcnREZXNj cmlwdGlvbiAqZGV2aWNlSW5wdXQsIEFWQXVkaW9TZXNzaW9uUG9ydERlc2NyaXB0aW9uICpkZWZh dWx0SW5wdXQpOwogICAgIHZpcnR1YWwgfkFWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZSgpID0g ZGVmYXVsdDsKIAorICAgIEFWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZSBpc29sYXRlZENvcHko KSBjb25zdDsKKwogcHJpdmF0ZToKICAgICBBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2UoQVZB dWRpb1Nlc3Npb25Qb3J0RGVzY3JpcHRpb24gKmRldmljZUlucHV0LCBBVkF1ZGlvU2Vzc2lvblBv cnREZXNjcmlwdGlvbiAqZGVmYXVsdElucHV0KTsKKyAgICBBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVE ZXZpY2UoY29uc3QgU3RyaW5nJiBwZXJzaXN0ZW50SWQsIERldmljZVR5cGUsIGNvbnN0IFN0cmlu ZyYgbGFiZWwsIGNvbnN0IFN0cmluZyYgZ3JvdXBJZCwgYm9vbCBpc0VuYWJsZWQsIGJvb2wgaXNE ZWZhdWx0LCBib29sIGlzTW9jayk7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nl c3Npb25DYXB0dXJlRGV2aWNlLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZS5tbQppbmRleCAwZmE3MWZhZDE2ZTJk ZDU3MjQ3ZGYyM2Y3MmI2NmQ3YTBhYjM5YWVjLi4xYzI2MDExYzc2NGI2YTI3OGRiNGE3ZTEwY2Zi NTFmZGYxNDY3ZDg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9pb3MvQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2lvcy9BVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2Uu bW0KQEAgLTQ0LDYgKzQ0LDI3IEBAIEFWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZTo6QVZBdWRp b1Nlc3Npb25DYXB0dXJlRGV2aWNlKEFWQXVkaW9TZXNzaW9uUG9ydERlc2NyCiAgICAgc2V0SXNE ZWZhdWx0KGRlZmF1bHRJbnB1dCAmJiBbZGVmYXVsdElucHV0LlVJRCBpc0VxdWFsVG9TdHJpbmc6 ZGV2aWNlSW5wdXQuVUlEXSk7CiB9CiAKK0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZTo6QVZB dWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlKGNvbnN0IFN0cmluZyYgcGVyc2lzdGVudElkLCBEZXZp Y2VUeXBlIHR5cGUsIGNvbnN0IFN0cmluZyYgbGFiZWwsIGNvbnN0IFN0cmluZyYgZ3JvdXBJZCwg Ym9vbCBpc0VuYWJsZWQsIGJvb2wgaXNEZWZhdWx0LCBib29sIGlzTW9jaykKKyAgICA6IENhcHR1 cmVEZXZpY2UocGVyc2lzdGVudElkLCB0eXBlLCBsYWJlbCwgZ3JvdXBJZCkKK3sKKyAgICBzZXRF bmFibGVkKGlzRW5hYmxlZCk7CisgICAgc2V0SXNEZWZhdWx0KGlzRGVmYXVsdCk7CisgICAgc2V0 SXNNb2NrRGV2aWNlKGlzTW9jayk7Cit9CisKK0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZSBB VkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2U6Omlzb2xhdGVkQ29weSgpIGNvbnN0Cit7CisgICAg cmV0dXJuIHsKKyAgICAgICAgcGVyc2lzdGVudElkKCkuaXNvbGF0ZWRDb3B5KCksCisgICAgICAg IHR5cGUoKSwKKyAgICAgICAgbGFiZWwoKS5pc29sYXRlZENvcHkoKSwKKyAgICAgICAgZ3JvdXBJ ZCgpLmlzb2xhdGVkQ29weSgpLAorICAgICAgICBlbmFibGVkKCksCisgICAgICAgIGlzRGVmYXVs dCgpLAorICAgICAgICBpc01vY2tEZXZpY2UoKSwKKyAgICB9OworfQorCiB9CiAKICNlbmRpZiAv LyBFTkFCTEUoTUVESUFfU1RSRUFNKSAmJiBQTEFURk9STShJT1NfRkFNSUxZKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9u Q2FwdHVyZURldmljZU1hbmFnZXIubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9pb3MvQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlTWFuYWdlci5tbQppbmRleCAyYmVk YWZmMGNhMjBiMTE2ZTE1NmJlZTBiODJiYTEzYzE5YzBkMDA3Li4zNzU4OTE1NmY1NTMyNGQwNDZj OWQxOTMzM2U0MDVjNTQzN2NkY2YwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlTWFuYWdlci5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nlc3Np b25DYXB0dXJlRGV2aWNlTWFuYWdlci5tbQpAQCAtMTYzLDcgKzE2Myw3IEBAIHZvaWQgQVZBdWRp b1Nlc3Npb25DYXB0dXJlRGV2aWNlTWFuYWdlcjo6cmVmcmVzaEF1ZGlvQ2FwdHVyZURldmljZXMo KQogICAgIG1fZGlzcGF0Y2hRdWV1ZS0+ZGlzcGF0Y2hTeW5jKFsmXSB7CiAgICAgICAgIG5ld0F1 ZGlvRGV2aWNlcyA9IHJldHJpZXZlQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZXMoKTsKICAgICB9 KTsKLSAgICBzZXRBdWRpb0NhcHR1cmVEZXZpY2VzKFdURk1vdmUobmV3QXVkaW9EZXZpY2VzKSk7 CisgICAgc2V0QXVkaW9DYXB0dXJlRGV2aWNlcyhjcm9zc1RocmVhZENvcHkoV1RGTW92ZShuZXdB dWRpb0RldmljZXMpKSk7CiB9CiAKIHZvaWQgQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlTWFu YWdlcjo6Z2V0Q2FwdHVyZURldmljZXMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8Q2Fw dHVyZURldmljZT4mJik+JiYgY29tcGxldGlvbikKQEAgLTE3OCw3ICsxNzgsNyBAQCB2b2lkIEFW QXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZU1hbmFnZXI6OmdldENhcHR1cmVEZXZpY2VzKENvbXBs ZXRpb25IYW5kbGVyPHZvaQogCiAgICAgbV9kaXNwYXRjaFF1ZXVlLT5kaXNwYXRjaChbdGhpcywg Y29tcGxldGlvbiA9IFdURk1vdmUoY29tcGxldGlvbildICgpIG11dGFibGUgewogICAgICAgICBh dXRvIG5ld0F1ZGlvRGV2aWNlcyA9IHJldHJpZXZlQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZXMo KTsKLSAgICAgICAgY2FsbE9uV2ViVGhyZWFkT3JEaXNwYXRjaEFzeW5jT25NYWluVGhyZWFkKG1h a2VCbG9ja1B0cihbdGhpcywgY29tcGxldGlvbiA9IFdURk1vdmUoY29tcGxldGlvbiksIG5ld0F1 ZGlvRGV2aWNlcyA9IFdURk1vdmUobmV3QXVkaW9EZXZpY2VzKV0gKCkgbXV0YWJsZSB7CisgICAg ICAgIGNhbGxPbldlYlRocmVhZE9yRGlzcGF0Y2hBc3luY09uTWFpblRocmVhZChtYWtlQmxvY2tQ dHIoW3RoaXMsIGNvbXBsZXRpb24gPSBXVEZNb3ZlKGNvbXBsZXRpb24pLCBuZXdBdWRpb0Rldmlj ZXMgPSBjcm9zc1RocmVhZENvcHkoV1RGTW92ZShuZXdBdWRpb0RldmljZXMpKV0gKCkgbXV0YWJs ZSB7CiAgICAgICAgICAgICBzZXRBdWRpb0NhcHR1cmVEZXZpY2VzKFdURk1vdmUobmV3QXVkaW9E ZXZpY2VzKSk7CiAgICAgICAgICAgICBjb21wbGV0aW9uKGNvcHlUb1ZlY3RvcigqbV9kZXZpY2Vz KSk7CiAgICAgICAgIH0pLmdldCgpKTsK 423905 2021-03-22 10:15:27 -0700 2021-03-22 14:16:19 -0700 Patch for landing bug-223565-20210322101526.patch text/plain 5975 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmM0NjYzODU4OGJkMGFh ZmVkYTJhYmM3ZDMwZGJhNDlkODE5ZDU1Zi4uNGI4ZDMyMTdiMDdjY2VkZjYwZGIzNTBhZjVjZjMx YWUwNzMyMDUyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAzLTIxICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFWQXVkaW9TZXNz aW9uQ2FwdHVyZURldmljZU1hbmFnZXIgc2hvdWxkIHVzZSBjcm9zc1RocmVhZENvcHkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzU2NQorICAgICAg ICA8cmRhcjovLzc1NDgwNTg5PgorCisgICAgICAgIFJldmlld2VkIGJ5IFlvdWVubiBGYWJsZXQu CisKKyAgICAgICAgVGVzdGVkIG1hbnVhbGx5LCB0aGlzIGNhbiBvbmx5IGJlIHRlc3RlZCBvbiBk ZXZpY2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9DYXB0dXJlRGV2aWNlLmg6 IENoYW5nZSBhY2Nlc3MgcmVzdHJpY3Rpb24gZm9yIG1lbWJlcgorICAgICAgICB2YXJpYWJsZXMg ZnJvbSBgcHJpdmF0ZTpgIHRvIGBwcm90ZWN0ZWQ6YCBzbyBkZXJpdmVkIGNsYXNzZXMgY2FuIGFj Y2VzcyB0aGVtCisgICAgICAgIGRpcmVjdGx5LgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFz dHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZS5oOgorICAgICAgICAqIHBsYXRm b3JtL21lZGlhc3RyZWFtL2lvcy9BVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2UubW06CisgICAg ICAgIChXZWJDb3JlOjpBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2U6OkFWQXVkaW9TZXNzaW9u Q2FwdHVyZURldmljZSk6IE5ldyBjb25zdHJ1Y3Rvci4KKyAgICAgICAgKFdlYkNvcmU6OkFWQXVk aW9TZXNzaW9uQ2FwdHVyZURldmljZTo6aXNvbGF0ZWRDb3B5IGNvbnN0KTogTmV3LgorCisgICAg ICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmlj ZU1hbmFnZXIubW06CisgICAgICAgIChXZWJDb3JlOjpBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZp Y2VNYW5hZ2VyOjpyZWZyZXNoQXVkaW9DYXB0dXJlRGV2aWNlcyk6IFVzZQorICAgICAgICBgV1RG TW92ZShkZXZpY2VMaXN0KS5pc29sYXRlZENvcHkoKWAgd2hlbiBtb3ZpbmcgZnJvbSBBVkF1ZGlv U2Vzc2lvbiBxdWV1ZQorICAgICAgICB0byBtYWluIHRocmVhZC4KKyAgICAgICAgKFdlYkNvcmU6 OkFWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZU1hbmFnZXI6OmdldENhcHR1cmVEZXZpY2VzKTog RGl0dG8uCisKIDIwMjEtMDMtMTcgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0dQVVBdIG1lZGlhL3ZpZGVvLXNldC1yYXRlLWZyb20tcGF1c2UuaHRt bCBmYWlscwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v Q2FwdHVyZURldmljZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vQ2Fw dHVyZURldmljZS5oCmluZGV4IGE5NGYwOGJmOGVjZDA1Yjc0YTdjOGNhYzU5MDIzMWMyNzRlMzFj OTYuLjNmMGMyMWY4ZWFlMzg2NGM2OTkyYjBiNGQwM2NhNGY0NzE2MmJiOTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL0NhcHR1cmVEZXZpY2UuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9DYXB0dXJlRGV2aWNlLmgKQEAg LTEzMCw3ICsxMzAsNyBAQCBwdWJsaWM6CiAgICAgfQogI2VuZGlmCiAKLXByaXZhdGU6Citwcm90 ZWN0ZWQ6CiAgICAgU3RyaW5nIG1fcGVyc2lzdGVudElkOwogICAgIERldmljZVR5cGUgbV90eXBl IHsgRGV2aWNlVHlwZTo6VW5rbm93biB9OwogICAgIFN0cmluZyBtX2xhYmVsOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9u Q2FwdHVyZURldmljZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9z L0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZS5oCmluZGV4IDExMDE1ZjY0NGQ0NDhlYTFiMmZj N2FkNWJjYTg0Mzc0YzRlZGE5YzUuLjRjMTIwOGMxZjQ4YWEwN2NlMjYzNTUxNjFlMWVmNGI5Y2Jj MjRlYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2lv cy9BVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlLmgKQEAgLTM5 LDggKzM5LDExIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2 aWNlIGNyZWF0ZShBVkF1ZGlvU2Vzc2lvblBvcnREZXNjcmlwdGlvbiAqZGV2aWNlSW5wdXQsIEFW QXVkaW9TZXNzaW9uUG9ydERlc2NyaXB0aW9uICpkZWZhdWx0SW5wdXQpOwogICAgIHZpcnR1YWwg fkFWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZSgpID0gZGVmYXVsdDsKIAorICAgIEFWQXVkaW9T ZXNzaW9uQ2FwdHVyZURldmljZSBpc29sYXRlZENvcHkoKSAmJjsKKwogcHJpdmF0ZToKICAgICBB VkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2UoQVZBdWRpb1Nlc3Npb25Qb3J0RGVzY3JpcHRpb24g KmRldmljZUlucHV0LCBBVkF1ZGlvU2Vzc2lvblBvcnREZXNjcmlwdGlvbiAqZGVmYXVsdElucHV0 KTsKKyAgICBBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2UoY29uc3QgU3RyaW5nJiBwZXJzaXN0 ZW50SWQsIERldmljZVR5cGUsIGNvbnN0IFN0cmluZyYgbGFiZWwsIGNvbnN0IFN0cmluZyYgZ3Jv dXBJZCwgYm9vbCBpc0VuYWJsZWQsIGJvb2wgaXNEZWZhdWx0LCBib29sIGlzTW9jayk7CiB9Owog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlLm1tIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVy ZURldmljZS5tbQppbmRleCAwZmE3MWZhZDE2ZTJkZDU3MjQ3ZGYyM2Y3MmI2NmQ3YTBhYjM5YWVj Li4zNGE4ZGUyNDM5YTEwMzI3MDRkMDNmNzcwOWViM2I4ZmYyNTQ0ZWUzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nlc3Npb25DYXB0 dXJlRGV2aWNlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2lv cy9BVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2UubW0KQEAgLTQ0LDYgKzQ0LDI3IEBAIEFWQXVk aW9TZXNzaW9uQ2FwdHVyZURldmljZTo6QVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlKEFWQXVk aW9TZXNzaW9uUG9ydERlc2NyCiAgICAgc2V0SXNEZWZhdWx0KGRlZmF1bHRJbnB1dCAmJiBbZGVm YXVsdElucHV0LlVJRCBpc0VxdWFsVG9TdHJpbmc6ZGV2aWNlSW5wdXQuVUlEXSk7CiB9CiAKK0FW QXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZTo6QVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlKGNv bnN0IFN0cmluZyYgcGVyc2lzdGVudElkLCBEZXZpY2VUeXBlIHR5cGUsIGNvbnN0IFN0cmluZyYg bGFiZWwsIGNvbnN0IFN0cmluZyYgZ3JvdXBJZCwgYm9vbCBpc0VuYWJsZWQsIGJvb2wgaXNEZWZh dWx0LCBib29sIGlzTW9jaykKKyAgICA6IENhcHR1cmVEZXZpY2UocGVyc2lzdGVudElkLCB0eXBl LCBsYWJlbCwgZ3JvdXBJZCkKK3sKKyAgICBzZXRFbmFibGVkKGlzRW5hYmxlZCk7CisgICAgc2V0 SXNEZWZhdWx0KGlzRGVmYXVsdCk7CisgICAgc2V0SXNNb2NrRGV2aWNlKGlzTW9jayk7Cit9CisK K0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZSBBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2U6 Omlzb2xhdGVkQ29weSgpICYmCit7CisgICAgcmV0dXJuIHsKKyAgICAgICAgbV9wZXJzaXN0ZW50 SWQuaXNvbGF0ZWRDb3B5KCksCisgICAgICAgIHR5cGUoKSwKKyAgICAgICAgbV9sYWJlbC5pc29s YXRlZENvcHkoKSwKKyAgICAgICAgbV9ncm91cElkLmlzb2xhdGVkQ29weSgpLAorICAgICAgICBl bmFibGVkKCksCisgICAgICAgIGlzRGVmYXVsdCgpLAorICAgICAgICBpc01vY2tEZXZpY2UoKSwK KyAgICB9OworfQorCiB9CiAKICNlbmRpZiAvLyBFTkFCTEUoTUVESUFfU1RSRUFNKSAmJiBQTEFU Rk9STShJT1NfRkFNSUxZKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZU1hbmFnZXIubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nlc3Npb25DYXB0dXJl RGV2aWNlTWFuYWdlci5tbQppbmRleCAyYmVkYWZmMGNhMjBiMTE2ZTE1NmJlZTBiODJiYTEzYzE5 YzBkMDA3Li4yMjNjNzVkZjZkMmVjYmE0MDA4ZDM1MDQ2NjcxNmFmMDUyNjVjZDhmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nlc3Np b25DYXB0dXJlRGV2aWNlTWFuYWdlci5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlTWFuYWdlci5tbQpAQCAt MTYzLDcgKzE2Myw3IEBAIHZvaWQgQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlTWFuYWdlcjo6 cmVmcmVzaEF1ZGlvQ2FwdHVyZURldmljZXMoKQogICAgIG1fZGlzcGF0Y2hRdWV1ZS0+ZGlzcGF0 Y2hTeW5jKFsmXSB7CiAgICAgICAgIG5ld0F1ZGlvRGV2aWNlcyA9IHJldHJpZXZlQXVkaW9TZXNz aW9uQ2FwdHVyZURldmljZXMoKTsKICAgICB9KTsKLSAgICBzZXRBdWRpb0NhcHR1cmVEZXZpY2Vz KFdURk1vdmUobmV3QXVkaW9EZXZpY2VzKSk7CisgICAgc2V0QXVkaW9DYXB0dXJlRGV2aWNlcyhX VEZNb3ZlKG5ld0F1ZGlvRGV2aWNlcykuaXNvbGF0ZWRDb3B5KCkpOwogfQogCiB2b2lkIEFWQXVk aW9TZXNzaW9uQ2FwdHVyZURldmljZU1hbmFnZXI6OmdldENhcHR1cmVEZXZpY2VzKENvbXBsZXRp b25IYW5kbGVyPHZvaWQoVmVjdG9yPENhcHR1cmVEZXZpY2U+JiYpPiYmIGNvbXBsZXRpb24pCkBA IC0xNzgsNyArMTc4LDcgQEAgdm9pZCBBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2VNYW5hZ2Vy OjpnZXRDYXB0dXJlRGV2aWNlcyhDb21wbGV0aW9uSGFuZGxlcjx2b2kKIAogICAgIG1fZGlzcGF0 Y2hRdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIGNvbXBsZXRpb24gPSBXVEZNb3ZlKGNvbXBsZXRpb24p XSAoKSBtdXRhYmxlIHsKICAgICAgICAgYXV0byBuZXdBdWRpb0RldmljZXMgPSByZXRyaWV2ZUF1 ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2VzKCk7Ci0gICAgICAgIGNhbGxPbldlYlRocmVhZE9yRGlz cGF0Y2hBc3luY09uTWFpblRocmVhZChtYWtlQmxvY2tQdHIoW3RoaXMsIGNvbXBsZXRpb24gPSBX VEZNb3ZlKGNvbXBsZXRpb24pLCBuZXdBdWRpb0RldmljZXMgPSBXVEZNb3ZlKG5ld0F1ZGlvRGV2 aWNlcyldICgpIG11dGFibGUgeworICAgICAgICBjYWxsT25XZWJUaHJlYWRPckRpc3BhdGNoQXN5 bmNPbk1haW5UaHJlYWQobWFrZUJsb2NrUHRyKFt0aGlzLCBjb21wbGV0aW9uID0gV1RGTW92ZShj b21wbGV0aW9uKSwgbmV3QXVkaW9EZXZpY2VzID0gV1RGTW92ZShuZXdBdWRpb0RldmljZXMpLmlz b2xhdGVkQ29weSgpXSAoKSBtdXRhYmxlIHsKICAgICAgICAgICAgIHNldEF1ZGlvQ2FwdHVyZURl dmljZXMoV1RGTW92ZShuZXdBdWRpb0RldmljZXMpKTsKICAgICAgICAgICAgIGNvbXBsZXRpb24o Y29weVRvVmVjdG9yKCptX2RldmljZXMpKTsKICAgICAgICAgfSkuZ2V0KCkpOwo= 423938 2021-03-22 14:16:21 -0700 2021-03-22 16:57:41 -0700 Updated patch for landing bug-223565-20210322141620.patch text/plain 5994 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTFkNDUyM2Q1OWE2MzRm M2QyNzFjNDVkZTk1NWYwMjk3ZWIyODc2Ny4uYTA0MGRkMjA1MzBhMDBlZjkzNzI4YmNiOGE1NWI0 MzAyMjcyYjBiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAzLTIxICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFWQXVkaW9TZXNz aW9uQ2FwdHVyZURldmljZU1hbmFnZXIgc2hvdWxkIHVzZSBjcm9zc1RocmVhZENvcHkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzU2NQorICAgICAg ICA8cmRhcjovLzc1NDgwNTg5PgorCisgICAgICAgIFJldmlld2VkIGJ5IFlvdWVubiBGYWJsZXQu CisKKyAgICAgICAgVGVzdGVkIG1hbnVhbGx5LCB0aGlzIGNhbiBvbmx5IGJlIHRlc3RlZCBvbiBk ZXZpY2UuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9DYXB0dXJlRGV2aWNlLmg6 IENoYW5nZSBhY2Nlc3MgcmVzdHJpY3Rpb24gZm9yIG1lbWJlcgorICAgICAgICB2YXJpYWJsZXMg ZnJvbSBgcHJpdmF0ZTpgIHRvIGBwcm90ZWN0ZWQ6YCBzbyBkZXJpdmVkIGNsYXNzZXMgY2FuIGFj Y2VzcyB0aGVtCisgICAgICAgIGRpcmVjdGx5LgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFz dHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZS5oOgorICAgICAgICAqIHBsYXRm b3JtL21lZGlhc3RyZWFtL2lvcy9BVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2UubW06CisgICAg ICAgIChXZWJDb3JlOjpBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2U6OkFWQXVkaW9TZXNzaW9u Q2FwdHVyZURldmljZSk6IE5ldyBjb25zdHJ1Y3Rvci4KKyAgICAgICAgKFdlYkNvcmU6OkFWQXVk aW9TZXNzaW9uQ2FwdHVyZURldmljZTo6aXNvbGF0ZWRDb3B5IGNvbnN0KTogTmV3LgorCisgICAg ICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmlj ZU1hbmFnZXIubW06CisgICAgICAgIChXZWJDb3JlOjpBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZp Y2VNYW5hZ2VyOjpyZWZyZXNoQXVkaW9DYXB0dXJlRGV2aWNlcyk6IFVzZQorICAgICAgICBgV1RG TW92ZShkZXZpY2VMaXN0KS5pc29sYXRlZENvcHkoKWAgd2hlbiBtb3ZpbmcgZnJvbSBBVkF1ZGlv U2Vzc2lvbiBxdWV1ZQorICAgICAgICB0byBtYWluIHRocmVhZC4KKyAgICAgICAgKFdlYkNvcmU6 OkFWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZU1hbmFnZXI6OmdldENhcHR1cmVEZXZpY2VzKTog RGl0dG8uCisKIDIwMjEtMDMtMjIgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgog CiAgICAgICAgIEltcGxlbWVudCBSVENEYXRhQ2hhbm5lbCB0cmFuc2ZlciBvdXQgb2YgcHJvY2Vz cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vQ2FwdHVy ZURldmljZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vQ2FwdHVyZURl dmljZS5oCmluZGV4IGE5NGYwOGJmOGVjZDA1Yjc0YTdjOGNhYzU5MDIzMWMyNzRlMzFjOTYuLjNm MGMyMWY4ZWFlMzg2NGM2OTkyYjBiNGQwM2NhNGY0NzE2MmJiOTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL0NhcHR1cmVEZXZpY2UuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9DYXB0dXJlRGV2aWNlLmgKQEAgLTEzMCw3 ICsxMzAsNyBAQCBwdWJsaWM6CiAgICAgfQogI2VuZGlmCiAKLXByaXZhdGU6Citwcm90ZWN0ZWQ6 CiAgICAgU3RyaW5nIG1fcGVyc2lzdGVudElkOwogICAgIERldmljZVR5cGUgbV90eXBlIHsgRGV2 aWNlVHlwZTo6VW5rbm93biB9OwogICAgIFN0cmluZyBtX2xhYmVsOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVy ZURldmljZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9zL0FWQXVk aW9TZXNzaW9uQ2FwdHVyZURldmljZS5oCmluZGV4IDExMDE1ZjY0NGQ0NDhlYTFiMmZjN2FkNWJj YTg0Mzc0YzRlZGE5YzUuLjRjMTIwOGMxZjQ4YWEwN2NlMjYzNTUxNjFlMWVmNGI5Y2JjMjRlYWMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2lvcy9BVkF1 ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlLmgKQEAgLTM5LDggKzM5 LDExIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlIGNy ZWF0ZShBVkF1ZGlvU2Vzc2lvblBvcnREZXNjcmlwdGlvbiAqZGV2aWNlSW5wdXQsIEFWQXVkaW9T ZXNzaW9uUG9ydERlc2NyaXB0aW9uICpkZWZhdWx0SW5wdXQpOwogICAgIHZpcnR1YWwgfkFWQXVk aW9TZXNzaW9uQ2FwdHVyZURldmljZSgpID0gZGVmYXVsdDsKIAorICAgIEFWQXVkaW9TZXNzaW9u Q2FwdHVyZURldmljZSBpc29sYXRlZENvcHkoKSAmJjsKKwogcHJpdmF0ZToKICAgICBBVkF1ZGlv U2Vzc2lvbkNhcHR1cmVEZXZpY2UoQVZBdWRpb1Nlc3Npb25Qb3J0RGVzY3JpcHRpb24gKmRldmlj ZUlucHV0LCBBVkF1ZGlvU2Vzc2lvblBvcnREZXNjcmlwdGlvbiAqZGVmYXVsdElucHV0KTsKKyAg ICBBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2UoY29uc3QgU3RyaW5nJiBwZXJzaXN0ZW50SWQs IERldmljZVR5cGUsIGNvbnN0IFN0cmluZyYgbGFiZWwsIGNvbnN0IFN0cmluZyYgZ3JvdXBJZCwg Ym9vbCBpc0VuYWJsZWQsIGJvb2wgaXNEZWZhdWx0LCBib29sIGlzTW9jayk7CiB9OwogCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmlj ZS5tbQppbmRleCAwZmE3MWZhZDE2ZTJkZDU3MjQ3ZGYyM2Y3MmI2NmQ3YTBhYjM5YWVjLi4yMTg2 MDk1ZTkyZWM1N2VmZGQ0ZjI4Yzc4YmZhZTU4ODI3NjM0MzM2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9pb3MvQVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2 aWNlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2lvcy9BVkF1 ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2UubW0KQEAgLTQ0LDYgKzQ0LDI3IEBAIEFWQXVkaW9TZXNz aW9uQ2FwdHVyZURldmljZTo6QVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlKEFWQXVkaW9TZXNz aW9uUG9ydERlc2NyCiAgICAgc2V0SXNEZWZhdWx0KGRlZmF1bHRJbnB1dCAmJiBbZGVmYXVsdElu cHV0LlVJRCBpc0VxdWFsVG9TdHJpbmc6ZGV2aWNlSW5wdXQuVUlEXSk7CiB9CiAKK0FWQXVkaW9T ZXNzaW9uQ2FwdHVyZURldmljZTo6QVZBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlKGNvbnN0IFN0 cmluZyYgcGVyc2lzdGVudElkLCBEZXZpY2VUeXBlIHR5cGUsIGNvbnN0IFN0cmluZyYgbGFiZWws IGNvbnN0IFN0cmluZyYgZ3JvdXBJZCwgYm9vbCBpc0VuYWJsZWQsIGJvb2wgaXNEZWZhdWx0LCBi b29sIGlzTW9jaykKKyAgICA6IENhcHR1cmVEZXZpY2UocGVyc2lzdGVudElkLCB0eXBlLCBsYWJl bCwgZ3JvdXBJZCkKK3sKKyAgICBzZXRFbmFibGVkKGlzRW5hYmxlZCk7CisgICAgc2V0SXNEZWZh dWx0KGlzRGVmYXVsdCk7CisgICAgc2V0SXNNb2NrRGV2aWNlKGlzTW9jayk7Cit9CisKK0FWQXVk aW9TZXNzaW9uQ2FwdHVyZURldmljZSBBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2U6Omlzb2xh dGVkQ29weSgpICYmCit7CisgICAgcmV0dXJuIHsKKyAgICAgICAgV1RGTW92ZShtX3BlcnNpc3Rl bnRJZCkuaXNvbGF0ZWRDb3B5KCksCisgICAgICAgIG1fdHlwZSwKKyAgICAgICAgV1RGTW92ZSht X2xhYmVsKS5pc29sYXRlZENvcHkoKSwKKyAgICAgICAgV1RGTW92ZShtX2dyb3VwSWQpLmlzb2xh dGVkQ29weSgpLAorICAgICAgICBtX2VuYWJsZWQsCisgICAgICAgIG1fZGVmYXVsdCwKKyAgICAg ICAgbV9pc01vY2tEZXZpY2UsCisgICAgfTsKK30KKwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKE1F RElBX1NUUkVBTSkgJiYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2lvcy9BVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZp Y2VNYW5hZ2VyLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9zL0FW QXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZU1hbmFnZXIubW0KaW5kZXggMmJlZGFmZjBjYTIwYjEx NmUxNTZiZWUwYjgyYmExM2MxOWMwZDAwNy4uMjIzYzc1ZGY2ZDJlY2JhNDAwOGQzNTA0NjY3MTZh ZjA1MjY1Y2Q4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURldmljZU1hbmFnZXIubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vaW9zL0FWQXVkaW9TZXNzaW9uQ2FwdHVyZURl dmljZU1hbmFnZXIubW0KQEAgLTE2Myw3ICsxNjMsNyBAQCB2b2lkIEFWQXVkaW9TZXNzaW9uQ2Fw dHVyZURldmljZU1hbmFnZXI6OnJlZnJlc2hBdWRpb0NhcHR1cmVEZXZpY2VzKCkKICAgICBtX2Rp c3BhdGNoUXVldWUtPmRpc3BhdGNoU3luYyhbJl0gewogICAgICAgICBuZXdBdWRpb0RldmljZXMg PSByZXRyaWV2ZUF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2VzKCk7CiAgICAgfSk7Ci0gICAgc2V0 QXVkaW9DYXB0dXJlRGV2aWNlcyhXVEZNb3ZlKG5ld0F1ZGlvRGV2aWNlcykpOworICAgIHNldEF1 ZGlvQ2FwdHVyZURldmljZXMoV1RGTW92ZShuZXdBdWRpb0RldmljZXMpLmlzb2xhdGVkQ29weSgp KTsKIH0KIAogdm9pZCBBVkF1ZGlvU2Vzc2lvbkNhcHR1cmVEZXZpY2VNYW5hZ2VyOjpnZXRDYXB0 dXJlRGV2aWNlcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxDYXB0dXJlRGV2aWNlPiYm KT4mJiBjb21wbGV0aW9uKQpAQCAtMTc4LDcgKzE3OCw3IEBAIHZvaWQgQVZBdWRpb1Nlc3Npb25D YXB0dXJlRGV2aWNlTWFuYWdlcjo6Z2V0Q2FwdHVyZURldmljZXMoQ29tcGxldGlvbkhhbmRsZXI8 dm9pCiAKICAgICBtX2Rpc3BhdGNoUXVldWUtPmRpc3BhdGNoKFt0aGlzLCBjb21wbGV0aW9uID0g V1RGTW92ZShjb21wbGV0aW9uKV0gKCkgbXV0YWJsZSB7CiAgICAgICAgIGF1dG8gbmV3QXVkaW9E ZXZpY2VzID0gcmV0cmlldmVBdWRpb1Nlc3Npb25DYXB0dXJlRGV2aWNlcygpOwotICAgICAgICBj YWxsT25XZWJUaHJlYWRPckRpc3BhdGNoQXN5bmNPbk1haW5UaHJlYWQobWFrZUJsb2NrUHRyKFt0 aGlzLCBjb21wbGV0aW9uID0gV1RGTW92ZShjb21wbGV0aW9uKSwgbmV3QXVkaW9EZXZpY2VzID0g V1RGTW92ZShuZXdBdWRpb0RldmljZXMpXSAoKSBtdXRhYmxlIHsKKyAgICAgICAgY2FsbE9uV2Vi VGhyZWFkT3JEaXNwYXRjaEFzeW5jT25NYWluVGhyZWFkKG1ha2VCbG9ja1B0cihbdGhpcywgY29t cGxldGlvbiA9IFdURk1vdmUoY29tcGxldGlvbiksIG5ld0F1ZGlvRGV2aWNlcyA9IFdURk1vdmUo bmV3QXVkaW9EZXZpY2VzKS5pc29sYXRlZENvcHkoKV0gKCkgbXV0YWJsZSB7CiAgICAgICAgICAg ICBzZXRBdWRpb0NhcHR1cmVEZXZpY2VzKFdURk1vdmUobmV3QXVkaW9EZXZpY2VzKSk7CiAgICAg ICAgICAgICBjb21wbGV0aW9uKGNvcHlUb1ZlY3RvcigqbV9kZXZpY2VzKSk7CiAgICAgICAgIH0p LmdldCgpKTsK