171097 2017-04-20 19:29:08 -0700 Make CoreAudioCaptureDevice stackable. 2017-04-21 17:14:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson jonlee oldest_to_newest 1299463 0 jer.noble 2017-04-20 19:29:08 -0700 Make CoreAudioCaptureDevice stackable. 1299468 1 307685 jer.noble 2017-04-20 19:33:29 -0700 Created attachment 307685 Patch 1299904 2 307685 jonlee 2017-04-21 14:38:17 -0700 Comment on attachment 307685 Patch looks fine, but please make it build. 1299978 3 307829 jer.noble 2017-04-21 16:22:25 -0700 Created attachment 307829 Patch 1300012 4 307829 commit-queue 2017-04-21 17:14:13 -0700 Comment on attachment 307829 Patch Clearing flags on attachment: 307829 Committed r215655: <http://trac.webkit.org/changeset/215655> 1300013 5 commit-queue 2017-04-21 17:14:14 -0700 All reviewed patches have been landed. Closing bug. 307685 2017-04-20 19:33:29 -0700 2017-04-21 16:22:23 -0700 Patch bug-171097-20170420193328.patch text/plain 11361 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzNiZmZjMmM2M2YwMDY1 ZDVlMTdjYmJkMWE2NDBiMmNhNjA4NzNlNi4uMzllNTIxNDc3M2UwNzg1NTNlMTI5MDgzODFkMmU1 MzVkZDJjZTE3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDE3LTA0LTIwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIE1ha2UgQ29yZUF1ZGlvQ2Fw dHVyZURldmljZSBzdGFja2FibGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNzEwOTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGVyZSdzIG5vIHJlYWwgcmVhc29uIHRvIGtlZXAgQ29yZUF1ZGlvQ2Fw dHVyZURldmljZSBmcm9tIGJlaW5nIGNyZWF0ZWQgb24gdGhlIHN0YWNrLiAKKyAgICAgICAgTWFr ZSBpdCB1bi1SZWZDb3VudGVkLCBhbmQgaGF2ZSBpdCdzIHN0YXRpYyBmYWN0b3J5IG1ldGhvZCBy ZXR1cm4gYW4gc3RkOjpvcHRpb25hbCByYXRoZXIKKyAgICAgICAgdGhhbiBhIFJlZlB0ci4KKwor ICAgICAgICBEcml2ZS1ieSBmaXg6IGNsZWFuIHVwIHRoZSBmYWN0b3J5IG1ldGhvZCBvZiBDb3Jl QXVkaW9DYXB0dXJlU291cmNlIGEgYml0LgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJl YW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVEZXZpY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29y ZUF1ZGlvQ2FwdHVyZURldmljZTo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvcmVBdWRp b0NhcHR1cmVEZXZpY2U6OmRldmljZUlEKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9t ZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmljZS5oOgorICAgICAgICAoV2ViQ29y ZTo6Q29yZUF1ZGlvQ2FwdHVyZURldmljZTo6ZGV2aWNlSUQpOgorICAgICAgICAqIHBsYXRmb3Jt L21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDb3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcjo6Y29yZUF1ZGlvQ2Fw dHVyZURldmljZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1ZGlvQ2FwdHVyZURldmljZU1h bmFnZXI6OmNvcmVBdWRpb0RldmljZVdpdGhVSUQpOgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1 ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6OnJlZnJlc2hBdWRpb0NhcHR1cmVEZXZpY2VzKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1h bmFnZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2Fw dHVyZVNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb3JlQXVkaW9DYXB0dXJlU291cmNl OjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6Q29y ZUF1ZGlvQ2FwdHVyZVNvdXJjZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0NvcmVBdWRpb0NhcHR1cmVTb3VyY2UuaDoKKworMjAxNy0wNC0yMCAgSmVyIE5vYmxlICA8amVy Lm5vYmxlQGFwcGxlLmNvbT4KKwogICAgICAgICBGaXggc29tZSBzcHVyaW91cyBBU1NFUlRzIHdo ZW4gd29ya2luZyB3aXRoIGNhcHR1cmluZyBtZWRpYSBlbGVtZW50cwogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxMDk2CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2 aWNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVk aW9DYXB0dXJlRGV2aWNlLmNwcAppbmRleCA4NTI1MzJkNjVmMjI1OTMxYTBlYjVjNTA1NWM0NzQw NjE0MjcyOTI2Li41YWM5NGM0YzQ2M2U5MjNiNjVmMjk0MmE3NTdmYWZlNjg4MWE5YThiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlv Q2FwdHVyZURldmljZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVEZXZpY2UuY3BwCkBAIC02NCwxNCArNjQsMTQgQEAgc3Rh dGljIGJvb2wgZ2V0RGV2aWNlSW5mbyh1aW50MzJfdCBkZXZpY2VJRCwgU3RyaW5nJiBwZXJzaXN0 ZW50SUQsIFN0cmluZyYgbGFiZWwKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotUmVmUHRyPENvcmVB dWRpb0NhcHR1cmVEZXZpY2U+IENvcmVBdWRpb0NhcHR1cmVEZXZpY2U6OmNyZWF0ZSh1aW50MzJf dCBkZXZpY2VJRCkKK3N0ZDo6b3B0aW9uYWw8Q29yZUF1ZGlvQ2FwdHVyZURldmljZT4gQ29yZUF1 ZGlvQ2FwdHVyZURldmljZTo6Y3JlYXRlKHVpbnQzMl90IGRldmljZUlEKQogewogICAgIFN0cmlu ZyBwZXJzaXN0ZW50SUQ7CiAgICAgU3RyaW5nIGxhYmVsOwogICAgIGlmICghZ2V0RGV2aWNlSW5m byhkZXZpY2VJRCwgcGVyc2lzdGVudElELCBsYWJlbCkpCi0gICAgICAgIHJldHVybiBudWxscHRy OworICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogCi0gICAgcmV0dXJuIGFkb3B0UmVmKG5l dyBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlKGRldmljZUlELCBwZXJzaXN0ZW50SUQsIGxhYmVsKSk7 CisgICAgcmV0dXJuIENvcmVBdWRpb0NhcHR1cmVEZXZpY2UoZGV2aWNlSUQsIHBlcnNpc3RlbnRJ RCwgbGFiZWwpOwogfQogCiBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlOjpDb3JlQXVkaW9DYXB0dXJl RGV2aWNlKHVpbnQzMl90IGRldmljZUlELCBjb25zdCBTdHJpbmcmIHBlcnNpc3RlbnRJRCwgY29u c3QgU3RyaW5nJiBsYWJlbCkKQEAgLTgwLDExICs4MCw2IEBAIENvcmVBdWRpb0NhcHR1cmVEZXZp Y2U6OkNvcmVBdWRpb0NhcHR1cmVEZXZpY2UodWludDMyX3QgZGV2aWNlSUQsIGNvbnN0IFN0cmlu ZyYKIHsKIH0KIAotdWludDMyX3QgQ29yZUF1ZGlvQ2FwdHVyZURldmljZTo6ZGV2aWNlSUQoKQot ewotICAgIHJldHVybiBtX2RldmljZUlEOwotfQotCiBSZXRhaW5QdHI8Q01DbG9ja1JlZj4gQ29y ZUF1ZGlvQ2FwdHVyZURldmljZTo6ZGV2aWNlQ2xvY2soKQogewogICAgIGlmIChtX2RldmljZUNs b2NrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0NvcmVBdWRpb0NhcHR1cmVEZXZpY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlLmgKaW5kZXggNzllZjEzOWNlZTI4ZTZm NDU5ZGMxNzk1MjVkMWZkNGE5MTQ4YTc1ZS4uZjhmOWJiMzlhNGJmZDQ5NDYyZGMyYjJlZGE4MzM3 OWI5NjY2N2E1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVEZXZpY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmljZS5oCkBAIC0zNSwxMyAr MzUsMTMgQEAgdHlwZWRlZiBzdHJ1Y3QgT3BhcXVlQ01DbG9jayogQ01DbG9ja1JlZjsKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlIDogcHVibGlj IENhcHR1cmVEZXZpY2UsIHB1YmxpYyBSZWZDb3VudGVkPENvcmVBdWRpb0NhcHR1cmVEZXZpY2U+ IHsKK2NsYXNzIENvcmVBdWRpb0NhcHR1cmVEZXZpY2UgOiBwdWJsaWMgQ2FwdHVyZURldmljZSB7 CiBwdWJsaWM6CiAKLSAgICBzdGF0aWMgUmVmUHRyPENvcmVBdWRpb0NhcHR1cmVEZXZpY2U+IGNy ZWF0ZSh1aW50MzJfdCk7CisgICAgc3RhdGljIHN0ZDo6b3B0aW9uYWw8Q29yZUF1ZGlvQ2FwdHVy ZURldmljZT4gY3JlYXRlKHVpbnQzMl90KTsKICAgICB2aXJ0dWFsIH5Db3JlQXVkaW9DYXB0dXJl RGV2aWNlKCkgPSBkZWZhdWx0OwogCi0gICAgdWludDMyX3QgZGV2aWNlSUQoKTsKKyAgICB1aW50 MzJfdCBkZXZpY2VJRCgpIGNvbnN0IHsgcmV0dXJuIG1fZGV2aWNlSUQ7IH0KICAgICBSZXRhaW5Q dHI8Q01DbG9ja1JlZj4gZGV2aWNlQ2xvY2soKTsKICAgICBib29sIGlzQWxpdmUoKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRp b0NhcHR1cmVEZXZpY2VNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlci5jcHAKaW5kZXggYjM2Y2Mx NTdhNDAwN2E0NzEwYmJmZTZiNzc5YjJkOWIzZDFkOTE2Ny4uNmRkMzIzMzBmMjU0MmMwNWQzZjVi ZTc5Yzk0ODczMzU0NTVlZTIyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVEZXZpY2VNYW5hZ2VyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURl dmljZU1hbmFnZXIuY3BwCkBAIC01OSw3ICs1OSw3IEBAIHN0YXRpYyBib29sIGRldmljZUhhc0lu cHV0U3RyZWFtcyhBdWRpb09iamVjdElEIGRldmljZUlEKQogICAgIHJldHVybiAhZXJyICYmIGRh dGFTaXplOwogfQogCi1WZWN0b3I8UmVmPENvcmVBdWRpb0NhcHR1cmVEZXZpY2U+PiYgQ29yZUF1 ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6OmNvcmVBdWRpb0NhcHR1cmVEZXZpY2VzKCkKK1ZlY3Rv cjxDb3JlQXVkaW9DYXB0dXJlRGV2aWNlPiYgQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6 OmNvcmVBdWRpb0NhcHR1cmVEZXZpY2VzKCkKIHsKICAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXpl ZDsKICAgICBpZiAoIWluaXRpYWxpemVkKSB7CkBAIC03NSw2ICs3NSwxNiBAQCBWZWN0b3I8UmVm PENvcmVBdWRpb0NhcHR1cmVEZXZpY2U+PiYgQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6 OmNvcmVBdWRpb0NhcAogICAgIHJldHVybiBtX2NvcmVBdWRpb0NhcHR1cmVEZXZpY2VzOwogfQog CitzdGQ6Om9wdGlvbmFsPENvcmVBdWRpb0NhcHR1cmVEZXZpY2U+IENvcmVBdWRpb0NhcHR1cmVE ZXZpY2VNYW5hZ2VyOjpjb3JlQXVkaW9EZXZpY2VXaXRoVUlEKGNvbnN0IFN0cmluZyYgZGV2aWNl SUQpCit7CisgICAgZm9yIChhdXRvJiBkZXZpY2UgOiBjb3JlQXVkaW9DYXB0dXJlRGV2aWNlcygp KSB7CisgICAgICAgIGlmIChkZXZpY2UucGVyc2lzdGVudElkKCkgPT0gZGV2aWNlSUQpCisgICAg ICAgICAgICByZXR1cm4gZGV2aWNlOworICAgIH0KKyAgICByZXR1cm4gc3RkOjpudWxsb3B0Owor fQorCisKIHZvaWQgQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6OnJlZnJlc2hBdWRpb0Nh cHR1cmVEZXZpY2VzKCkKIHsKICAgICBBdWRpb09iamVjdFByb3BlcnR5QWRkcmVzcyBhZGRyZXNz ID0geyBrQXVkaW9IYXJkd2FyZVByb3BlcnR5RGV2aWNlcywga0F1ZGlvT2JqZWN0UHJvcGVydHlT Y29wZUdsb2JhbCwga0F1ZGlvT2JqZWN0UHJvcGVydHlFbGVtZW50TWFzdGVyIH07CkBAIC05OSwy MSArMTA5LDIxIEBAIHZvaWQgQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6OnJlZnJlc2hB dWRpb0NhcHR1cmVEZXZpY2VzKCkKICAgICAgICAgaWYgKCFkZXZpY2VIYXNJbnB1dFN0cmVhbXMo ZGV2aWNlSUQpKQogICAgICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgaWYgKHN0ZDo6YW55 X29mKG1fY29yZUF1ZGlvQ2FwdHVyZURldmljZXMuYmVnaW4oKSwgbV9jb3JlQXVkaW9DYXB0dXJl RGV2aWNlcy5lbmQoKSwgW2RldmljZUlEXShhdXRvJiBkZXZpY2UpIHsgcmV0dXJuIGRldmljZS0+ ZGV2aWNlSUQoKSA9PSBkZXZpY2VJRDsgfSkpCisgICAgICAgIGlmIChzdGQ6OmFueV9vZihtX2Nv cmVBdWRpb0NhcHR1cmVEZXZpY2VzLmJlZ2luKCksIG1fY29yZUF1ZGlvQ2FwdHVyZURldmljZXMu ZW5kKCksIFtkZXZpY2VJRF0oYXV0byYgZGV2aWNlKSB7IHJldHVybiBkZXZpY2UuZGV2aWNlSUQo KSA9PSBkZXZpY2VJRDsgfSkpCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBhdXRv IGRldmljZSA9IENvcmVBdWRpb0NhcHR1cmVEZXZpY2U6OmNyZWF0ZShkZXZpY2VJRCk7CiAgICAg ICAgIGlmICghZGV2aWNlKQogICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIG1fY29yZUF1 ZGlvQ2FwdHVyZURldmljZXMuYXBwZW5kKGRldmljZS5yZWxlYXNlTm9uTnVsbCgpKTsKKyAgICAg ICAgbV9jb3JlQXVkaW9DYXB0dXJlRGV2aWNlcy5hcHBlbmQoV1RGTW92ZShkZXZpY2UudmFsdWUo KSkpOwogCiAgICAgICAgIGhhdmVEZXZpY2VDaGFuZ2VzID0gdHJ1ZTsKICAgICB9CiAKICAgICBm b3IgKGF1dG8mIGRldmljZSA6IG1fY29yZUF1ZGlvQ2FwdHVyZURldmljZXMpIHsKLSAgICAgICAg Ym9vbCBpc0FsaXZlID0gZGV2aWNlLT5pc0FsaXZlKCk7Ci0gICAgICAgIGlmIChkZXZpY2UtPmVu YWJsZWQoKSAhPSBpc0FsaXZlKSB7Ci0gICAgICAgICAgICBkZXZpY2UtPnNldEVuYWJsZWQoaXNB bGl2ZSk7CisgICAgICAgIGJvb2wgaXNBbGl2ZSA9IGRldmljZS5pc0FsaXZlKCk7CisgICAgICAg IGlmIChkZXZpY2UuZW5hYmxlZCgpICE9IGlzQWxpdmUpIHsKKyAgICAgICAgICAgIGRldmljZS5z ZXRFbmFibGVkKGlzQWxpdmUpOwogICAgICAgICAgICAgaGF2ZURldmljZUNoYW5nZXMgPSB0cnVl OwogICAgICAgICB9CiAgICAgfQpAQCAtMTIyLDggKzEzMiw4IEBAIHZvaWQgQ29yZUF1ZGlvQ2Fw dHVyZURldmljZU1hbmFnZXI6OnJlZnJlc2hBdWRpb0NhcHR1cmVEZXZpY2VzKCkKICAgICAgICAg bV9kZXZpY2VzID0gVmVjdG9yPENhcHR1cmVEZXZpY2U+KCk7CiAKICAgICAgICAgZm9yIChhdXRv ICZkZXZpY2UgOiBtX2NvcmVBdWRpb0NhcHR1cmVEZXZpY2VzKSB7Ci0gICAgICAgICAgICBDYXB0 dXJlRGV2aWNlIGNhcHR1cmVEZXZpY2UoZGV2aWNlLT5wZXJzaXN0ZW50SWQoKSwgQ2FwdHVyZURl dmljZTo6RGV2aWNlVHlwZTo6QXVkaW8sIGRldmljZS0+bGFiZWwoKSk7Ci0gICAgICAgICAgICBj YXB0dXJlRGV2aWNlLnNldEVuYWJsZWQoZGV2aWNlLT5lbmFibGVkKCkpOworICAgICAgICAgICAg Q2FwdHVyZURldmljZSBjYXB0dXJlRGV2aWNlKGRldmljZS5wZXJzaXN0ZW50SWQoKSwgQ2FwdHVy ZURldmljZTo6RGV2aWNlVHlwZTo6QXVkaW8sIGRldmljZS5sYWJlbCgpKTsKKyAgICAgICAgICAg IGNhcHR1cmVEZXZpY2Uuc2V0RW5hYmxlZChkZXZpY2UuZW5hYmxlZCgpKTsKICAgICAgICAgICAg IG1fZGV2aWNlcy5hcHBlbmQoY2FwdHVyZURldmljZSk7CiAgICAgICAgIH0KICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlv Q2FwdHVyZURldmljZU1hbmFnZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlci5oCmluZGV4IDViNGYxNjRiMTJh YjIyNzRmZWVjMTJlZDg4YzdmYzRmYWU4NzdjMWMuLmM1MWEzNmYzN2U3OWZjZTkzYTY1ZjM1MmJi Nzc2ZmJjZmI4OWRmZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFu YWdlci5oCkBAIC00NSw3ICs0NSw4IEBAIHB1YmxpYzoKIAogICAgIFZlY3RvcjxDYXB0dXJlRGV2 aWNlPiYgY2FwdHVyZURldmljZXMoKSBmaW5hbDsKIAotICAgIFZlY3RvcjxSZWY8Q29yZUF1ZGlv Q2FwdHVyZURldmljZT4+JiBjb3JlQXVkaW9DYXB0dXJlRGV2aWNlcygpOworICAgIFZlY3RvcjxD b3JlQXVkaW9DYXB0dXJlRGV2aWNlPiYgY29yZUF1ZGlvQ2FwdHVyZURldmljZXMoKTsKKyAgICBz dGQ6Om9wdGlvbmFsPENvcmVBdWRpb0NhcHR1cmVEZXZpY2U+IGNvcmVBdWRpb0RldmljZVdpdGhV SUQoY29uc3QgU3RyaW5nJik7CiAKIHByaXZhdGU6CiAgICAgQ29yZUF1ZGlvQ2FwdHVyZURldmlj ZU1hbmFnZXIoKSA9IGRlZmF1bHQ7CkBAIC01Niw3ICs1Nyw3IEBAIHByaXZhdGU6CiAgICAgdm9p ZCByZWZyZXNoQXVkaW9DYXB0dXJlRGV2aWNlcygpOwogCiAgICAgVmVjdG9yPENhcHR1cmVEZXZp Y2U+IG1fZGV2aWNlczsKLSAgICBWZWN0b3I8UmVmPENvcmVBdWRpb0NhcHR1cmVEZXZpY2U+PiBt X2NvcmVBdWRpb0NhcHR1cmVEZXZpY2VzOworICAgIFZlY3RvcjxDb3JlQXVkaW9DYXB0dXJlRGV2 aWNlPiBtX2NvcmVBdWRpb0NhcHR1cmVEZXZpY2VzOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0NvcmVBdWRpb0NhcHR1cmVTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVk aWFzdHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVTb3VyY2UuY3BwCmluZGV4IGEwNjJjZjlkZDNk ZmU5OGNlY2M0YjFiZTNiNDc5NjdhOGQwMTY2ZDUuLjE4ZjIxOWZiNmY4YmEwYmI5ZmU0NDVjMjZk YTM2OTRkMDA5NTQ1MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlh c3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZS5jcHAKQEAg LTYwLDEzICs2MCwxOCBAQCBSZWZQdHI8Q29yZUF1ZGlvQ2FwdHVyZVNvdXJjZT4gQ29yZUF1ZGlv Q2FwdHVyZVNvdXJjZTo6Y3JlYXRlKGNvbnN0IFN0cmluZyYgZGV2aQogICAgIGlmICh0eXBlICE9 IENhcHR1cmVEZXZpY2U6OkRldmljZVR5cGU6OkF1ZGlvKQogICAgICAgICByZXR1cm4gbnVsbHB0 cjsKIAorICAgIFN0cmluZyBsYWJlbDsKKyAgICB1aW50MzJfdCBwZXJzaXN0ZW50SUQgPSAwOwog I2lmIFBMQVRGT1JNKE1BQykKLSAgICBhdXRvIGRldmljZSA9IENvcmVBdWRpb0NhcHR1cmVEZXZp Y2VNYW5hZ2VyOjpzaW5nbGV0b24oKS5kZXZpY2VXaXRoVUlEKGRldmljZUlELCBSZWFsdGltZU1l ZGlhU291cmNlOjpUeXBlOjpBdWRpbyk7CisgICAgYXV0byBkZXZpY2UgPSBDb3JlQXVkaW9DYXB0 dXJlRGV2aWNlTWFuYWdlcjo6c2luZ2xldG9uKCkuY29yZUF1ZGlvRGV2aWNlV2l0aFVJRChkZXZp Y2VJRCk7CiAgICAgaWYgKCFkZXZpY2UpCiAgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAg bGFiZWwgPSBkZXZpY2UubGFiZWwoKTsKKyAgICBwZXJzaXN0ZW50SUQgPSBkZXZpY2UucGVyc2lz dGVudElEKCk7CiAjZW5kaWYKKyAgICBhdXRvIHNvdXJjZSA9IGFkb3B0UmVmKG5ldyBDb3JlQXVk aW9DYXB0dXJlU291cmNlKGRldmljZUlELCBsYWJlbCwgcGVyc2lzdGVudElEKSk7CiAKLSAgICBh dXRvIHNvdXJjZSA9IGFkb3B0UmVmKG5ldyBDb3JlQXVkaW9DYXB0dXJlU291cmNlKGRldmljZUlE KSk7CiAgICAgaWYgKGNvbnN0cmFpbnRzKSB7CiAgICAgICAgIGF1dG8gcmVzdWx0ID0gc291cmNl LT5hcHBseUNvbnN0cmFpbnRzKCpjb25zdHJhaW50cyk7CiAgICAgICAgIGlmIChyZXN1bHQpIHsK QEAgLTg0LDIxICs4OSwxMCBAQCBSZWFsdGltZU1lZGlhU291cmNlOjpDYXB0dXJlRmFjdG9yeSYg Q29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6ZmFjdG9yeSgpCiAgICAgcmV0dXJuIGZhY3RvcnkuZ2V0 KCk7CiB9CiAKLUNvcmVBdWRpb0NhcHR1cmVTb3VyY2U6OkNvcmVBdWRpb0NhcHR1cmVTb3VyY2Uo Y29uc3QgU3RyaW5nJiBkZXZpY2VJRCkKLSAgICA6IFJlYWx0aW1lTWVkaWFTb3VyY2UoZW1wdHlT dHJpbmcoKSwgUmVhbHRpbWVNZWRpYVNvdXJjZTo6VHlwZTo6QXVkaW8sIGVtcHR5U3RyaW5nKCkp Ci0gICAgLCBtX2NhcHR1cmVEZXZpY2VJRCgwKQorQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6Q29y ZUF1ZGlvQ2FwdHVyZVNvdXJjZShjb25zdCBTdHJpbmcmIGRldmljZUlELCBjb25zdCBTdHJpbmcm IGxhYmVsLCB1aW50MzJfdCBwZXJzaXN0ZW50SUQpCisgICAgOiBSZWFsdGltZU1lZGlhU291cmNl KGRldmljZUlELCBSZWFsdGltZU1lZGlhU291cmNlOjpUeXBlOjpBdWRpbywgbGFiZWwpCisgICAg LCBtX2NhcHR1cmVEZXZpY2VJRChwZXJzaXN0ZW50SUQpCiB7Ci0jaWYgUExBVEZPUk0oTUFDKQot ICAgIGZvciAoYXV0byYgcGxhdGZvcm1EZXZpY2UgOiBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFu YWdlcjo6c2luZ2xldG9uKCkuY29yZUF1ZGlvQ2FwdHVyZURldmljZXMoKSkgewotICAgICAgICBp ZiAocGxhdGZvcm1EZXZpY2UtPnBlcnNpc3RlbnRJZCgpID09IGRldmljZUlEKSB7Ci0gICAgICAg ICAgICBtX2NhcHR1cmVEZXZpY2VJRCA9IHBsYXRmb3JtRGV2aWNlLT5kZXZpY2VJRCgpOwotICAg ICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICB9Ci0gICAgQVNTRVJUKG1fY2FwdHVyZURl dmljZUlEKTsKLSNlbmRpZgotCi0gICAgc2V0UGVyc2lzdGVudElEKGRldmljZUlEKTsKICAgICBt X211dGVkID0gdHJ1ZTsKIAogICAgIG1fY3VycmVudFNldHRpbmdzLnNldFZvbHVtZSgxLjApOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVB dWRpb0NhcHR1cmVTb3VyY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L21hYy9Db3JlQXVkaW9DYXB0dXJlU291cmNlLmgKaW5kZXggOTA4ZjJjNTUzZjExZDU2M2I3Mjg5 ZTU3YjliYWY5MjVmY2ZlNjgyNi4uOTEwZjdkNDQ0NTJhY2U4ZmY1NzYxNGUyYTAzYzMzOTNjOWUz YjFhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0NvcmVBdWRpb0NhcHR1cmVTb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZS5oCkBAIC02OCw3ICs2OCw3IEBA IHB1YmxpYzoKICAgICBDTUNsb2NrUmVmIHRpbWViYXNlQ2xvY2soKTsKIAogcHJpdmF0ZToKLSAg ICBDb3JlQXVkaW9DYXB0dXJlU291cmNlKGNvbnN0IFN0cmluZyYgZGV2aWNlSUQpOworICAgIENv cmVBdWRpb0NhcHR1cmVTb3VyY2UoY29uc3QgU3RyaW5nJiBkZXZpY2VJRCwgY29uc3QgU3RyaW5n JiBsYWJlbCwgdWludDMyX3QgcGVyc2lzdGVudElEKTsKICAgICB2aXJ0dWFsIH5Db3JlQXVkaW9D YXB0dXJlU291cmNlKCk7CiAKICAgICBib29sIGlzQ2FwdHVyZVNvdXJjZSgpIGNvbnN0IGZpbmFs IHsgcmV0dXJuIHRydWU7IH0K 307829 2017-04-21 16:22:25 -0700 2017-04-21 17:14:13 -0700 Patch bug-171097-20170421162224.patch text/plain 11280 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNmMmE1YmM1M2QyNDU3 YTMxMGJlNjQ3ZTExYjM5NGQ4YTJjNTQ1ZC4uYjA1NGMxMjhhYzAyZjQ5ZDUzZTkxMmNmZmYzNGI5 ZTI3MzZiMTY3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE3LTA0LTIwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgQ29yZUF1ZGlvQ2Fw dHVyZURldmljZSBzdGFja2FibGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNzEwOTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGVyZSdzIG5vIHJlYWwgcmVhc29uIHRvIGtlZXAgQ29yZUF1ZGlvQ2Fw dHVyZURldmljZSBmcm9tIGJlaW5nIGNyZWF0ZWQgb24gdGhlIHN0YWNrLiAKKyAgICAgICAgTWFr ZSBpdCB1bi1SZWZDb3VudGVkLCBhbmQgaGF2ZSBpdCdzIHN0YXRpYyBmYWN0b3J5IG1ldGhvZCBy ZXR1cm4gYW4gc3RkOjpvcHRpb25hbCByYXRoZXIKKyAgICAgICAgdGhhbiBhIFJlZlB0ci4KKwor ICAgICAgICBEcml2ZS1ieSBmaXg6IGNsZWFuIHVwIHRoZSBmYWN0b3J5IG1ldGhvZCBvZiBDb3Jl QXVkaW9DYXB0dXJlU291cmNlIGEgYml0LgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJl YW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVEZXZpY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29y ZUF1ZGlvQ2FwdHVyZURldmljZTo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvcmVBdWRp b0NhcHR1cmVEZXZpY2U6OmRldmljZUlEKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9t ZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmljZS5oOgorICAgICAgICAoV2ViQ29y ZTo6Q29yZUF1ZGlvQ2FwdHVyZURldmljZTo6ZGV2aWNlSUQpOgorICAgICAgICAqIHBsYXRmb3Jt L21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDb3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcjo6Y29yZUF1ZGlvQ2Fw dHVyZURldmljZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1ZGlvQ2FwdHVyZURldmljZU1h bmFnZXI6OmNvcmVBdWRpb0RldmljZVdpdGhVSUQpOgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1 ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6OnJlZnJlc2hBdWRpb0NhcHR1cmVEZXZpY2VzKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1h bmFnZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2Fw dHVyZVNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb3JlQXVkaW9DYXB0dXJlU291cmNl OjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6Q29y ZUF1ZGlvQ2FwdHVyZVNvdXJjZSk6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0NvcmVBdWRpb0NhcHR1cmVTb3VyY2UuaDoKKwogMjAxNy0wNC0yMSAgSmVyIE5vYmxlICA8amVy Lm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGZpeCBhZnRlciByMjE1NjI0 OyBudWxsLWRlcmVmIGNyYXNoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVEZXZpY2UuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVEZXZpY2UuY3BwCmlu ZGV4IDg1MjUzMmQ2NWYyMjU5MzFhMGViNWM1MDU1YzQ3NDA2MTQyNzI5MjYuLjVhYzk0YzRjNDYz ZTkyM2I2NWYyOTQyYTc1N2ZhZmU2ODgxYTlhOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVy ZURldmljZS5jcHAKQEAgLTY0LDE0ICs2NCwxNCBAQCBzdGF0aWMgYm9vbCBnZXREZXZpY2VJbmZv KHVpbnQzMl90IGRldmljZUlELCBTdHJpbmcmIHBlcnNpc3RlbnRJRCwgU3RyaW5nJiBsYWJlbAog ICAgIHJldHVybiB0cnVlOwogfQogCi1SZWZQdHI8Q29yZUF1ZGlvQ2FwdHVyZURldmljZT4gQ29y ZUF1ZGlvQ2FwdHVyZURldmljZTo6Y3JlYXRlKHVpbnQzMl90IGRldmljZUlEKQorc3RkOjpvcHRp b25hbDxDb3JlQXVkaW9DYXB0dXJlRGV2aWNlPiBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlOjpjcmVh dGUodWludDMyX3QgZGV2aWNlSUQpCiB7CiAgICAgU3RyaW5nIHBlcnNpc3RlbnRJRDsKICAgICBT dHJpbmcgbGFiZWw7CiAgICAgaWYgKCFnZXREZXZpY2VJbmZvKGRldmljZUlELCBwZXJzaXN0ZW50 SUQsIGxhYmVsKSkKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgIHJldHVybiBzdGQ6 Om51bGxvcHQ7CiAKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IENvcmVBdWRpb0NhcHR1cmVEZXZp Y2UoZGV2aWNlSUQsIHBlcnNpc3RlbnRJRCwgbGFiZWwpKTsKKyAgICByZXR1cm4gQ29yZUF1ZGlv Q2FwdHVyZURldmljZShkZXZpY2VJRCwgcGVyc2lzdGVudElELCBsYWJlbCk7CiB9CiAKIENvcmVB dWRpb0NhcHR1cmVEZXZpY2U6OkNvcmVBdWRpb0NhcHR1cmVEZXZpY2UodWludDMyX3QgZGV2aWNl SUQsIGNvbnN0IFN0cmluZyYgcGVyc2lzdGVudElELCBjb25zdCBTdHJpbmcmIGxhYmVsKQpAQCAt ODAsMTEgKzgwLDYgQEAgQ29yZUF1ZGlvQ2FwdHVyZURldmljZTo6Q29yZUF1ZGlvQ2FwdHVyZURl dmljZSh1aW50MzJfdCBkZXZpY2VJRCwgY29uc3QgU3RyaW5nJgogewogfQogCi11aW50MzJfdCBD b3JlQXVkaW9DYXB0dXJlRGV2aWNlOjpkZXZpY2VJRCgpCi17Ci0gICAgcmV0dXJuIG1fZGV2aWNl SUQ7Ci19Ci0KIFJldGFpblB0cjxDTUNsb2NrUmVmPiBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlOjpk ZXZpY2VDbG9jaygpCiB7CiAgICAgaWYgKG1fZGV2aWNlQ2xvY2spCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmlj ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0Nh cHR1cmVEZXZpY2UuaAppbmRleCA3OWVmMTM5Y2VlMjhlNmY0NTlkYzE3OTUyNWQxZmQ0YTkxNDhh NzVlLi5mOGY5YmIzOWE0YmZkNDk0NjJkYzJiMmVkYTgzMzc5Yjk2NjY3YTVlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVy ZURldmljZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9D b3JlQXVkaW9DYXB0dXJlRGV2aWNlLmgKQEAgLTM1LDEzICszNSwxMyBAQCB0eXBlZGVmIHN0cnVj dCBPcGFxdWVDTUNsb2NrKiBDTUNsb2NrUmVmOwogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLWNs YXNzIENvcmVBdWRpb0NhcHR1cmVEZXZpY2UgOiBwdWJsaWMgQ2FwdHVyZURldmljZSwgcHVibGlj IFJlZkNvdW50ZWQ8Q29yZUF1ZGlvQ2FwdHVyZURldmljZT4geworY2xhc3MgQ29yZUF1ZGlvQ2Fw dHVyZURldmljZSA6IHB1YmxpYyBDYXB0dXJlRGV2aWNlIHsKIHB1YmxpYzoKIAotICAgIHN0YXRp YyBSZWZQdHI8Q29yZUF1ZGlvQ2FwdHVyZURldmljZT4gY3JlYXRlKHVpbnQzMl90KTsKKyAgICBz dGF0aWMgc3RkOjpvcHRpb25hbDxDb3JlQXVkaW9DYXB0dXJlRGV2aWNlPiBjcmVhdGUodWludDMy X3QpOwogICAgIHZpcnR1YWwgfkNvcmVBdWRpb0NhcHR1cmVEZXZpY2UoKSA9IGRlZmF1bHQ7CiAK LSAgICB1aW50MzJfdCBkZXZpY2VJRCgpOworICAgIHVpbnQzMl90IGRldmljZUlEKCkgY29uc3Qg eyByZXR1cm4gbV9kZXZpY2VJRDsgfQogICAgIFJldGFpblB0cjxDTUNsb2NrUmVmPiBkZXZpY2VD bG9jaygpOwogICAgIGJvb2wgaXNBbGl2ZSgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0Nh cHR1cmVEZXZpY2VNYW5hZ2VyLmNwcAppbmRleCBiMzZjYzE1N2E0MDA3YTQ3MTBiYmZlNmI3Nzli MmQ5YjNkMWQ5MTY3Li42ZGQzMjMzMGYyNTQyYzA1ZDNmNWJlNzljOTQ4NzMzNTQ1NWVlMjI4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1 ZGlvQ2FwdHVyZURldmljZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlci5jcHAKQEAgLTU5 LDcgKzU5LDcgQEAgc3RhdGljIGJvb2wgZGV2aWNlSGFzSW5wdXRTdHJlYW1zKEF1ZGlvT2JqZWN0 SUQgZGV2aWNlSUQpCiAgICAgcmV0dXJuICFlcnIgJiYgZGF0YVNpemU7CiB9CiAKLVZlY3RvcjxS ZWY8Q29yZUF1ZGlvQ2FwdHVyZURldmljZT4+JiBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdl cjo6Y29yZUF1ZGlvQ2FwdHVyZURldmljZXMoKQorVmVjdG9yPENvcmVBdWRpb0NhcHR1cmVEZXZp Y2U+JiBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcjo6Y29yZUF1ZGlvQ2FwdHVyZURldmlj ZXMoKQogewogICAgIHN0YXRpYyBib29sIGluaXRpYWxpemVkOwogICAgIGlmICghaW5pdGlhbGl6 ZWQpIHsKQEAgLTc1LDYgKzc1LDE2IEBAIFZlY3RvcjxSZWY8Q29yZUF1ZGlvQ2FwdHVyZURldmlj ZT4+JiBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcjo6Y29yZUF1ZGlvQ2FwCiAgICAgcmV0 dXJuIG1fY29yZUF1ZGlvQ2FwdHVyZURldmljZXM7CiB9CiAKK3N0ZDo6b3B0aW9uYWw8Q29yZUF1 ZGlvQ2FwdHVyZURldmljZT4gQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6OmNvcmVBdWRp b0RldmljZVdpdGhVSUQoY29uc3QgU3RyaW5nJiBkZXZpY2VJRCkKK3sKKyAgICBmb3IgKGF1dG8m IGRldmljZSA6IGNvcmVBdWRpb0NhcHR1cmVEZXZpY2VzKCkpIHsKKyAgICAgICAgaWYgKGRldmlj ZS5wZXJzaXN0ZW50SWQoKSA9PSBkZXZpY2VJRCkKKyAgICAgICAgICAgIHJldHVybiBkZXZpY2U7 CisgICAgfQorICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Cit9CisKKwogdm9pZCBDb3JlQXVkaW9D YXB0dXJlRGV2aWNlTWFuYWdlcjo6cmVmcmVzaEF1ZGlvQ2FwdHVyZURldmljZXMoKQogewogICAg IEF1ZGlvT2JqZWN0UHJvcGVydHlBZGRyZXNzIGFkZHJlc3MgPSB7IGtBdWRpb0hhcmR3YXJlUHJv cGVydHlEZXZpY2VzLCBrQXVkaW9PYmplY3RQcm9wZXJ0eVNjb3BlR2xvYmFsLCBrQXVkaW9PYmpl Y3RQcm9wZXJ0eUVsZW1lbnRNYXN0ZXIgfTsKQEAgLTk5LDIxICsxMDksMjEgQEAgdm9pZCBDb3Jl QXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcjo6cmVmcmVzaEF1ZGlvQ2FwdHVyZURldmljZXMoKQog ICAgICAgICBpZiAoIWRldmljZUhhc0lucHV0U3RyZWFtcyhkZXZpY2VJRCkpCiAgICAgICAgICAg ICBjb250aW51ZTsKIAotICAgICAgICBpZiAoc3RkOjphbnlfb2YobV9jb3JlQXVkaW9DYXB0dXJl RGV2aWNlcy5iZWdpbigpLCBtX2NvcmVBdWRpb0NhcHR1cmVEZXZpY2VzLmVuZCgpLCBbZGV2aWNl SURdKGF1dG8mIGRldmljZSkgeyByZXR1cm4gZGV2aWNlLT5kZXZpY2VJRCgpID09IGRldmljZUlE OyB9KSkKKyAgICAgICAgaWYgKHN0ZDo6YW55X29mKG1fY29yZUF1ZGlvQ2FwdHVyZURldmljZXMu YmVnaW4oKSwgbV9jb3JlQXVkaW9DYXB0dXJlRGV2aWNlcy5lbmQoKSwgW2RldmljZUlEXShhdXRv JiBkZXZpY2UpIHsgcmV0dXJuIGRldmljZS5kZXZpY2VJRCgpID09IGRldmljZUlEOyB9KSkKICAg ICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIGF1dG8gZGV2aWNlID0gQ29yZUF1ZGlvQ2Fw dHVyZURldmljZTo6Y3JlYXRlKGRldmljZUlEKTsKICAgICAgICAgaWYgKCFkZXZpY2UpCiAgICAg ICAgICAgICBjb250aW51ZTsKLSAgICAgICAgbV9jb3JlQXVkaW9DYXB0dXJlRGV2aWNlcy5hcHBl bmQoZGV2aWNlLnJlbGVhc2VOb25OdWxsKCkpOworICAgICAgICBtX2NvcmVBdWRpb0NhcHR1cmVE ZXZpY2VzLmFwcGVuZChXVEZNb3ZlKGRldmljZS52YWx1ZSgpKSk7CiAKICAgICAgICAgaGF2ZURl dmljZUNoYW5nZXMgPSB0cnVlOwogICAgIH0KIAogICAgIGZvciAoYXV0byYgZGV2aWNlIDogbV9j b3JlQXVkaW9DYXB0dXJlRGV2aWNlcykgewotICAgICAgICBib29sIGlzQWxpdmUgPSBkZXZpY2Ut PmlzQWxpdmUoKTsKLSAgICAgICAgaWYgKGRldmljZS0+ZW5hYmxlZCgpICE9IGlzQWxpdmUpIHsK LSAgICAgICAgICAgIGRldmljZS0+c2V0RW5hYmxlZChpc0FsaXZlKTsKKyAgICAgICAgYm9vbCBp c0FsaXZlID0gZGV2aWNlLmlzQWxpdmUoKTsKKyAgICAgICAgaWYgKGRldmljZS5lbmFibGVkKCkg IT0gaXNBbGl2ZSkgeworICAgICAgICAgICAgZGV2aWNlLnNldEVuYWJsZWQoaXNBbGl2ZSk7CiAg ICAgICAgICAgICBoYXZlRGV2aWNlQ2hhbmdlcyA9IHRydWU7CiAgICAgICAgIH0KICAgICB9CkBA IC0xMjIsOCArMTMyLDggQEAgdm9pZCBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcjo6cmVm cmVzaEF1ZGlvQ2FwdHVyZURldmljZXMoKQogICAgICAgICBtX2RldmljZXMgPSBWZWN0b3I8Q2Fw dHVyZURldmljZT4oKTsKIAogICAgICAgICBmb3IgKGF1dG8gJmRldmljZSA6IG1fY29yZUF1ZGlv Q2FwdHVyZURldmljZXMpIHsKLSAgICAgICAgICAgIENhcHR1cmVEZXZpY2UgY2FwdHVyZURldmlj ZShkZXZpY2UtPnBlcnNpc3RlbnRJZCgpLCBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpBdWRp bywgZGV2aWNlLT5sYWJlbCgpKTsKLSAgICAgICAgICAgIGNhcHR1cmVEZXZpY2Uuc2V0RW5hYmxl ZChkZXZpY2UtPmVuYWJsZWQoKSk7CisgICAgICAgICAgICBDYXB0dXJlRGV2aWNlIGNhcHR1cmVE ZXZpY2UoZGV2aWNlLnBlcnNpc3RlbnRJZCgpLCBDYXB0dXJlRGV2aWNlOjpEZXZpY2VUeXBlOjpB dWRpbywgZGV2aWNlLmxhYmVsKCkpOworICAgICAgICAgICAgY2FwdHVyZURldmljZS5zZXRFbmFi bGVkKGRldmljZS5lbmFibGVkKCkpOwogICAgICAgICAgICAgbV9kZXZpY2VzLmFwcGVuZChjYXB0 dXJlRGV2aWNlKTsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlci5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1 cmVEZXZpY2VNYW5hZ2VyLmgKaW5kZXggNWI0ZjE2NGIxMmFiMjI3NGZlZWMxMmVkODhjN2ZjNGZh ZTg3N2MxYy4uYzUxYTM2ZjM3ZTc5ZmNlOTNhNjVmMzUyYmI3NzZmYmNmYjg5ZGZlNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0Nh cHR1cmVEZXZpY2VNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFz dHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVEZXZpY2VNYW5hZ2VyLmgKQEAgLTQ1LDcgKzQ1LDgg QEAgcHVibGljOgogCiAgICAgVmVjdG9yPENhcHR1cmVEZXZpY2U+JiBjYXB0dXJlRGV2aWNlcygp IGZpbmFsOwogCi0gICAgVmVjdG9yPFJlZjxDb3JlQXVkaW9DYXB0dXJlRGV2aWNlPj4mIGNvcmVB dWRpb0NhcHR1cmVEZXZpY2VzKCk7CisgICAgVmVjdG9yPENvcmVBdWRpb0NhcHR1cmVEZXZpY2U+ JiBjb3JlQXVkaW9DYXB0dXJlRGV2aWNlcygpOworICAgIHN0ZDo6b3B0aW9uYWw8Q29yZUF1ZGlv Q2FwdHVyZURldmljZT4gY29yZUF1ZGlvRGV2aWNlV2l0aFVJRChjb25zdCBTdHJpbmcmKTsKIAog cHJpdmF0ZToKICAgICBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcigpID0gZGVmYXVsdDsK QEAgLTU2LDcgKzU3LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlZnJlc2hBdWRpb0NhcHR1cmVE ZXZpY2VzKCk7CiAKICAgICBWZWN0b3I8Q2FwdHVyZURldmljZT4gbV9kZXZpY2VzOwotICAgIFZl Y3RvcjxSZWY8Q29yZUF1ZGlvQ2FwdHVyZURldmljZT4+IG1fY29yZUF1ZGlvQ2FwdHVyZURldmlj ZXM7CisgICAgVmVjdG9yPENvcmVBdWRpb0NhcHR1cmVEZXZpY2U+IG1fY29yZUF1ZGlvQ2FwdHVy ZURldmljZXM7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZVNvdXJj ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlv Q2FwdHVyZVNvdXJjZS5jcHAKaW5kZXggYTA2MmNmOWRkM2RmZTk4Y2VjYzRiMWJlM2I0Nzk2N2E4 ZDAxNjZkNS4uMDg2NjE1MzVjYTAyYjA1YjUyMGVmOGEwYTdlZmIxMDYyMjczNDI1ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0Nh cHR1cmVTb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L21hYy9Db3JlQXVkaW9DYXB0dXJlU291cmNlLmNwcApAQCAtNjAsMTMgKzYwLDE4IEBAIFJlZlB0 cjxDb3JlQXVkaW9DYXB0dXJlU291cmNlPiBDb3JlQXVkaW9DYXB0dXJlU291cmNlOjpjcmVhdGUo Y29uc3QgU3RyaW5nJiBkZXZpCiAgICAgaWYgKHR5cGUgIT0gQ2FwdHVyZURldmljZTo6RGV2aWNl VHlwZTo6QXVkaW8pCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCisgICAgU3RyaW5nIGxhYmVs OworICAgIHVpbnQzMl90IHBlcnNpc3RlbnRJRCA9IDA7CiAjaWYgUExBVEZPUk0oTUFDKQotICAg IGF1dG8gZGV2aWNlID0gQ29yZUF1ZGlvQ2FwdHVyZURldmljZU1hbmFnZXI6OnNpbmdsZXRvbigp LmRldmljZVdpdGhVSUQoZGV2aWNlSUQsIFJlYWx0aW1lTWVkaWFTb3VyY2U6OlR5cGU6OkF1ZGlv KTsKKyAgICBhdXRvIGRldmljZSA9IENvcmVBdWRpb0NhcHR1cmVEZXZpY2VNYW5hZ2VyOjpzaW5n bGV0b24oKS5jb3JlQXVkaW9EZXZpY2VXaXRoVUlEKGRldmljZUlEKTsKICAgICBpZiAoIWRldmlj ZSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBsYWJlbCA9IGRldmljZS0+bGFiZWwo KTsKKyAgICBwZXJzaXN0ZW50SUQgPSBkZXZpY2UtPmRldmljZUlEKCk7CiAjZW5kaWYKKyAgICBh dXRvIHNvdXJjZSA9IGFkb3B0UmVmKG5ldyBDb3JlQXVkaW9DYXB0dXJlU291cmNlKGRldmljZUlE LCBsYWJlbCwgcGVyc2lzdGVudElEKSk7CiAKLSAgICBhdXRvIHNvdXJjZSA9IGFkb3B0UmVmKG5l dyBDb3JlQXVkaW9DYXB0dXJlU291cmNlKGRldmljZUlEKSk7CiAgICAgaWYgKGNvbnN0cmFpbnRz KSB7CiAgICAgICAgIGF1dG8gcmVzdWx0ID0gc291cmNlLT5hcHBseUNvbnN0cmFpbnRzKCpjb25z dHJhaW50cyk7CiAgICAgICAgIGlmIChyZXN1bHQpIHsKQEAgLTg0LDIxICs4OSwxMCBAQCBSZWFs dGltZU1lZGlhU291cmNlOjpDYXB0dXJlRmFjdG9yeSYgQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6 ZmFjdG9yeSgpCiAgICAgcmV0dXJuIGZhY3RvcnkuZ2V0KCk7CiB9CiAKLUNvcmVBdWRpb0NhcHR1 cmVTb3VyY2U6OkNvcmVBdWRpb0NhcHR1cmVTb3VyY2UoY29uc3QgU3RyaW5nJiBkZXZpY2VJRCkK LSAgICA6IFJlYWx0aW1lTWVkaWFTb3VyY2UoZW1wdHlTdHJpbmcoKSwgUmVhbHRpbWVNZWRpYVNv dXJjZTo6VHlwZTo6QXVkaW8sIGVtcHR5U3RyaW5nKCkpCi0gICAgLCBtX2NhcHR1cmVEZXZpY2VJ RCgwKQorQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6Q29yZUF1ZGlvQ2FwdHVyZVNvdXJjZShjb25z dCBTdHJpbmcmIGRldmljZUlELCBjb25zdCBTdHJpbmcmIGxhYmVsLCB1aW50MzJfdCBwZXJzaXN0 ZW50SUQpCisgICAgOiBSZWFsdGltZU1lZGlhU291cmNlKGRldmljZUlELCBSZWFsdGltZU1lZGlh U291cmNlOjpUeXBlOjpBdWRpbywgbGFiZWwpCisgICAgLCBtX2NhcHR1cmVEZXZpY2VJRChwZXJz aXN0ZW50SUQpCiB7Ci0jaWYgUExBVEZPUk0oTUFDKQotICAgIGZvciAoYXV0byYgcGxhdGZvcm1E ZXZpY2UgOiBDb3JlQXVkaW9DYXB0dXJlRGV2aWNlTWFuYWdlcjo6c2luZ2xldG9uKCkuY29yZUF1 ZGlvQ2FwdHVyZURldmljZXMoKSkgewotICAgICAgICBpZiAocGxhdGZvcm1EZXZpY2UtPnBlcnNp c3RlbnRJZCgpID09IGRldmljZUlEKSB7Ci0gICAgICAgICAgICBtX2NhcHR1cmVEZXZpY2VJRCA9 IHBsYXRmb3JtRGV2aWNlLT5kZXZpY2VJRCgpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IH0KLSAgICB9Ci0gICAgQVNTRVJUKG1fY2FwdHVyZURldmljZUlEKTsKLSNlbmRpZgotCi0gICAg c2V0UGVyc2lzdGVudElEKGRldmljZUlEKTsKICAgICBtX211dGVkID0gdHJ1ZTsKIAogICAgIG1f Y3VycmVudFNldHRpbmdzLnNldFZvbHVtZSgxLjApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVTb3VyY2UuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlU291 cmNlLmgKaW5kZXggOTA4ZjJjNTUzZjExZDU2M2I3Mjg5ZTU3YjliYWY5MjVmY2ZlNjgyNi4uOTEw ZjdkNDQ0NTJhY2U4ZmY1NzYxNGUyYTAzYzMzOTNjOWUzYjFhMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVTb3VyY2Uu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlv Q2FwdHVyZVNvdXJjZS5oCkBAIC02OCw3ICs2OCw3IEBAIHB1YmxpYzoKICAgICBDTUNsb2NrUmVm IHRpbWViYXNlQ2xvY2soKTsKIAogcHJpdmF0ZToKLSAgICBDb3JlQXVkaW9DYXB0dXJlU291cmNl KGNvbnN0IFN0cmluZyYgZGV2aWNlSUQpOworICAgIENvcmVBdWRpb0NhcHR1cmVTb3VyY2UoY29u c3QgU3RyaW5nJiBkZXZpY2VJRCwgY29uc3QgU3RyaW5nJiBsYWJlbCwgdWludDMyX3QgcGVyc2lz dGVudElEKTsKICAgICB2aXJ0dWFsIH5Db3JlQXVkaW9DYXB0dXJlU291cmNlKCk7CiAKICAgICBi b29sIGlzQ2FwdHVyZVNvdXJjZSgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIHRydWU7IH0K