170736 2017-04-11 10:34:05 -0700 [MediaStream] Set correct audio session category when capturing audio 2017-04-12 15:35:24 -0700 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue jer.noble webkit-bug-importer oldest_to_newest 1296471 0 eric.carlson 2017-04-11 10:34:05 -0700 Set correct audio session category when capturing audio 1296473 1 webkit-bug-importer 2017-04-11 10:34:53 -0700 <rdar://problem/31559405> 1296482 2 306832 eric.carlson 2017-04-11 10:51:22 -0700 Created attachment 306832 Proposed patch. 1296498 3 306832 commit-queue 2017-04-11 11:27:04 -0700 Comment on attachment 306832 Proposed patch. Clearing flags on attachment: 306832 Committed r215242: <http://trac.webkit.org/changeset/215242> 1296499 4 commit-queue 2017-04-11 11:27:06 -0700 All reviewed patches have been landed. Closing bug. 1296868 5 eric.carlson 2017-04-12 15:35:24 -0700 Plus r215300: <http://trac.webkit.org/changeset/215300> 306832 2017-04-11 10:51:22 -0700 2017-04-11 11:27:04 -0700 Proposed patch. audio_session_category_patch_1.txt text/plain 14631 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTE4NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE3LTA0LTExICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV0g U2V0IGNvcnJlY3QgYXVkaW8gc2Vzc2lvbiBjYXRlZ29yeSB3aGVuIGNhcHR1cmluZyBhdWRpbwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNzM2Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMTU1OTQwNT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgeWV0LCBmaWxlZCBidWcgMTcw NzM3LgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6TWVkaWFTdHJlYW0pOiBJbml0aWFsaXplIG1f bWVkaWFTZXNzaW9uLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW06OnN0YXR1c0RpZENo YW5nZSk6IENhbGwgY2FuUHJvZHVjZUF1ZGlvQ2hhbmdlZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhU3RyZWFtOjptZWRpYVR5cGUpOiBOZXcuIFJldHVybiBNZWRpYVN0cmVhbUNhcHR1cmluZ0F1 ZGlvIHdoZW4gYWN0aXZlbHkKKyAgICAgICAgY2FwdHVyaW5nIGF1ZGlvLgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFTdHJlYW06OnByZXNlbnRhdGlvblR5cGUpOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFTdHJlYW06OmNoYXJhY3RlcmlzdGljcyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0 cmVhbTo6bWF5UmVzdW1lUGxheWJhY2spOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTdHJlYW06 OnN1c3BlbmRQbGF5YmFjayk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbTo6c291cmNl QXBwbGljYXRpb25JZGVudGlmaWVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU3RyZWFtOjpj YW5Qcm9kdWNlQXVkaW8pOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJl YW0uaDoKKworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmg6 IEFkZCBNZWRpYVN0cmVhbUNhcHR1cmluZ0F1ZGlvLgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlv L1BsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbGF0 Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6Omhhcyk6IEFkanVzdCBhc3NlcnQgZm9yIE1lZGlhU3Ry ZWFtQ2FwdHVyaW5nQXVkaW8uCisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhU2Vzc2lv bk1hbmFnZXI6OmNvdW50KTogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vY29jb2Ev TWVkaWFTZXNzaW9uTWFuYWdlckNvY29hLmNwcDoKKyAgICAgICAgKFBsYXRmb3JtTWVkaWFTZXNz aW9uTWFuYWdlcjo6dXBkYXRlU2Vzc2lvblN0YXRlKTogU2V0IHNtYWxsIHByZWZlcnJlZCBidWZm ZXIgc2l6ZSB3aGVuCisgICAgICAgIGNhcHR1cmluZyBhdWRpby4gU2V0IGF1ZGlvIHNlc3Npb24g Y2F0ZWdvcnkgdG8gUGxheUFuZFJlY29yZCB3aGVuZXZlciB0aGVyZSBpcyBhIG1lZGlhCisgICAg ICAgIHN0cmVhbSB0aGF0IGlzIGNhcHR1cmluZyBhdWRpby4KKwogMjAxNy0wNC0xMCAgUnlhbiBI YWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMjE1MTc1LgpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9NZWRpYVN0cmVhbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAJKHJldmlzaW9uIDIxNTE4NSkKKysrIFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0zMyw5ICszMywxMSBAQAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRXZl bnQuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCisjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNs dWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiTWVkaWFTdHJlYW1SZWdpc3RyeS5oIgogI2luY2x1 ZGUgIk1lZGlhU3RyZWFtVHJhY2tFdmVudC5oIgorI2luY2x1ZGUgIk5ldHdvcmtpbmdDb250ZXh0 LmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlJlYWx0aW1lTWVkaWFTb3VyY2UuaCIK ICNpbmNsdWRlICJVUkwuaCIKQEAgLTY1LDYgKzY3LDcgQEAgUmVmPE1lZGlhU3RyZWFtPiBNZWRp YVN0cmVhbTo6Y3JlYXRlKFNjcgogTWVkaWFTdHJlYW06Ok1lZGlhU3RyZWFtKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQmIGNvbnRleHQsIGNvbnN0IE1lZGlhU3RyZWFtVHJhY2tWZWN0b3ImIHRyYWNr cykKICAgICA6IENvbnRleHREZXN0cnVjdGlvbk9ic2VydmVyKCZjb250ZXh0KQogICAgICwgbV9h Y3Rpdml0eUV2ZW50VGltZXIoKnRoaXMsICZNZWRpYVN0cmVhbTo6YWN0aXZpdHlFdmVudFRpbWVy RmlyZWQpCisgICAgLCBtX21lZGlhU2Vzc2lvbihQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6Y3JlYXRl KCp0aGlzKSkKIHsKICAgICAvLyBUaGlzIGNvbnN0cnVjdG9yIHByZXNlcnZlcyBNZWRpYVN0cmVh bVRyYWNrIGluc3RhbmNlcyBhbmQgbXVzdCBiZSB1c2VkIGJ5IGNhbGxzIG9yaWdpbmF0aW5nCiAg ICAgLy8gZnJvbSB0aGUgSmF2YVNjcmlwdCBNZWRpYVN0cmVhbSBjb25zdHJ1Y3Rvci4KQEAgLTg4 LDYgKzkxLDcgQEAgTWVkaWFTdHJlYW06Ok1lZGlhU3RyZWFtKFNjcmlwdEV4ZWN1dGlvbgogICAg IDogQ29udGV4dERlc3RydWN0aW9uT2JzZXJ2ZXIoJmNvbnRleHQpCiAgICAgLCBtX3ByaXZhdGUo c3RyZWFtUHJpdmF0ZSkKICAgICAsIG1fYWN0aXZpdHlFdmVudFRpbWVyKCp0aGlzLCAmTWVkaWFT dHJlYW06OmFjdGl2aXR5RXZlbnRUaW1lckZpcmVkKQorICAgICwgbV9tZWRpYVNlc3Npb24oUGxh dGZvcm1NZWRpYVNlc3Npb246OmNyZWF0ZSgqdGhpcykpCiB7CiAgICAgQVNTRVJUKG1fcHJpdmF0 ZSk7CiAKQEAgLTMzOCw2ICszNDIsOCBAQCBNZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlRmxhZ3Mg TWVkaWFTdHJlCiAKIHZvaWQgTWVkaWFTdHJlYW06OnN0YXR1c0RpZENoYW5nZSgpCiB7CisgICAg bV9tZWRpYVNlc3Npb24tPmNhblByb2R1Y2VBdWRpb0NoYW5nZWQoKTsKKwogICAgIGlmIChEb2N1 bWVudCogZG9jdW1lbnQgPSB0aGlzLT5kb2N1bWVudCgpKSB7CiAgICAgICAgIGlmIChtX2lzQWN0 aXZlKQogICAgICAgICAgICAgZG9jdW1lbnQtPnNldEhhc0FjdGl2ZU1lZGlhU3RyZWFtVHJhY2so KTsKQEAgLTQxOSw2ICs0MjUsNjMgQEAgRG9jdW1lbnQqIE1lZGlhU3RyZWFtOjpkb2N1bWVudCgp IGNvbnN0CiAgICAgcmV0dXJuIGRvd25jYXN0PERvY3VtZW50PihzY3JpcHRFeGVjdXRpb25Db250 ZXh0KCkpOwogfQogCitQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBlIE1lZGlhU3RyZWFt OjptZWRpYVR5cGUoKSBjb25zdAoreworICAgIC8vIFdlIG9ubHkgbmVlZCB0byBvdmVycmlkZSB0 aGUgdHlwZSB3aGVuIGNhcHR1cmluZyBhdWRpbywgSFRNTE1lZGlhRWxlbWVudCBhbmQvb3IgV2Vi QXVkaW8KKyAgICAvLyB3aWxsIGRvIHRoZSByaWdodCB0aGluZyB3aGVuIGEgc3RyZWFtIGlzIGF0 dGFjaGVkIHRvIGEgbWVkaWEgZWxlbWVudCBvciBhbiBhdWRpbyBjb250ZXh0LgorICAgIGlmICht X3ByaXZhdGUtPmhhc0F1ZGlvKCkgJiYgbV9wcml2YXRlLT5pc1Byb2R1Y2luZ0RhdGEoKSAmJiBt X3ByaXZhdGUtPmhhc0NhcHR1cmVBdWRpb1NvdXJjZSgpKQorICAgICAgICByZXR1cm4gUGxhdGZv cm1NZWRpYVNlc3Npb246Ok1lZGlhU3RyZWFtQ2FwdHVyaW5nQXVkaW87CisKKyAgICByZXR1cm4g UGxhdGZvcm1NZWRpYVNlc3Npb246Ok5vbmU7Cit9CisKK1BsYXRmb3JtTWVkaWFTZXNzaW9uOjpN ZWRpYVR5cGUgTWVkaWFTdHJlYW06OnByZXNlbnRhdGlvblR5cGUoKSBjb25zdAoreworICAgIHJl dHVybiBtZWRpYVR5cGUoKTsKK30KKworUGxhdGZvcm1NZWRpYVNlc3Npb246OkNoYXJhY3Rlcmlz dGljc0ZsYWdzIE1lZGlhU3RyZWFtOjpjaGFyYWN0ZXJpc3RpY3MoKSBjb25zdAoreworICAgIFBs YXRmb3JtTWVkaWFTZXNzaW9uOjpDaGFyYWN0ZXJpc3RpY3NGbGFncyBzdGF0ZSA9IFBsYXRmb3Jt TWVkaWFTZXNzaW9uOjpIYXNOb3RoaW5nOworCisgICAgaWYgKCFtX3ByaXZhdGUtPmlzUHJvZHVj aW5nRGF0YSgpKQorICAgICAgICByZXR1cm4gc3RhdGU7CisKKyAgICBpZiAobV9wcml2YXRlLT5o YXNBdWRpbygpKQorICAgICAgICBzdGF0ZSB8PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6SGFzQXVk aW87CisKKyAgICBpZiAobV9wcml2YXRlLT5oYXNWaWRlbygpKQorICAgICAgICBzdGF0ZSB8PSBQ bGF0Zm9ybU1lZGlhU2Vzc2lvbjo6SGFzVmlkZW87CisKKyAgICByZXR1cm4gc3RhdGU7Cit9CisK K3ZvaWQgTWVkaWFTdHJlYW06Om1heVJlc3VtZVBsYXliYWNrKGJvb2wpCit7CisgICAgLy8gRklY TUU6IHNob3VsZCBhIG1lZGlhIHN0cmVhbSBwYXkgYXR0ZW50aW9uIHRvIHRoaXMgZGlyZWN0bHks IG9yIG9ubHkgd2hlbiBhdHRhY2hlZCB0byBhIG1lZGlhIGVsZW1lbnQ/Cit9CisKK3ZvaWQgTWVk aWFTdHJlYW06OnN1c3BlbmRQbGF5YmFjaygpCit7CisgICAgLy8gRklYTUU6IHNob3VsZCBhIG1l ZGlhIHN0cmVhbSBwYXkgYXR0ZW50aW9uIHRvIHRoaXMgZGlyZWN0bHksIG9yIG9ubHkgd2hlbiBh dHRhY2hlZCB0byBhIG1lZGlhIGVsZW1lbnQ/Cit9CisKK1N0cmluZyBNZWRpYVN0cmVhbTo6c291 cmNlQXBwbGljYXRpb25JZGVudGlmaWVyKCkgY29uc3QKK3sKKyAgICBEb2N1bWVudCogZG9jdW1l bnQgPSB0aGlzLT5kb2N1bWVudCgpOworICAgIGlmIChkb2N1bWVudCAmJiBkb2N1bWVudC0+ZnJh bWUoKSkgeworICAgICAgICBpZiAoTmV0d29ya2luZ0NvbnRleHQqIG5ldHdvcmtpbmdDb250ZXh0 ID0gZG9jdW1lbnQtPmZyYW1lKCktPmxvYWRlcigpLm5ldHdvcmtpbmdDb250ZXh0KCkpCisgICAg ICAgICAgICByZXR1cm4gbmV0d29ya2luZ0NvbnRleHQtPnNvdXJjZUFwcGxpY2F0aW9uSWRlbnRp ZmllcigpOworICAgIH0KKworICAgIHJldHVybiBlbXB0eVN0cmluZygpOworfQorCitib29sIE1l ZGlhU3RyZWFtOjpjYW5Qcm9kdWNlQXVkaW8oKSBjb25zdAoreworICAgIHJldHVybiAhbXV0ZWQo KSAmJiBhY3RpdmUoKSAmJiBtX3ByaXZhdGUtPmhhc0F1ZGlvKCkgJiYgbV9wcml2YXRlLT5pc1By b2R1Y2luZ0RhdGEoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8g RU5BQkxFKE1FRElBX1NUUkVBTSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vTWVkaWFTdHJlYW0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmgJKHJldmlzaW9uIDIxNTE4NSkKKysrIFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW0uaAkod29ya2luZyBjb3B5KQpA QCAtMSw3ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAxMSwgMjAxNSBFcmljc3NvbiBB Qi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqIENvcHlyaWdodCAoQykgMjAxMy0yMDE1IEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxMy0yMDE3IEFw cGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAxMyBOb2tp YSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykuCiAgKgogICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CkBAIC0zNiw2ICszNiw3IEBACiAjaW5jbHVkZSAiTWVkaWFQcm9kdWNlci5oIgogI2luY2x1 ZGUgIk1lZGlhU3RyZWFtUHJpdmF0ZS5oIgogI2luY2x1ZGUgIk1lZGlhU3RyZWFtVHJhY2suaCIK KyNpbmNsdWRlICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oIgogI2luY2x1ZGUgIlNjcmlwdFdyYXBw YWJsZS5oIgogI2luY2x1ZGUgIlRpbWVyLmgiCiAjaW5jbHVkZSAiVVJMUmVnaXN0cnkuaCIKQEAg LTU1LDYgKzU2LDcgQEAgY2xhc3MgTWVkaWFTdHJlYW0gZmluYWwKICAgICAsIHB1YmxpYyBNZWRp YVN0cmVhbVByaXZhdGU6Ok9ic2VydmVyCiAgICAgLCBwcml2YXRlIE1lZGlhUHJvZHVjZXIKICAg ICAsIHByaXZhdGUgTWVkaWFDYW5TdGFydExpc3RlbmVyCisgICAgLCBwcml2YXRlIFBsYXRmb3Jt TWVkaWFTZXNzaW9uQ2xpZW50CiAgICAgLCBwdWJsaWMgUmVmQ291bnRlZDxNZWRpYVN0cmVhbT4g ewogcHVibGljOgogICAgIGNsYXNzIE9ic2VydmVyIHsKQEAgLTEzNCw2ICsxMzYsMjAgQEAgcHJp dmF0ZToKICAgICAvLyBNZWRpYUNhblN0YXJ0TGlzdGVuZXIKICAgICB2b2lkIG1lZGlhQ2FuU3Rh cnQoRG9jdW1lbnQmKSBmaW5hbDsKIAorICAgIC8vIFBsYXRmb3JtTWVkaWFTZXNzaW9uQ2xpZW50 CisgICAgUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhVHlwZSBtZWRpYVR5cGUoKSBjb25zdCBm aW5hbDsKKyAgICBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFUeXBlIHByZXNlbnRhdGlvblR5 cGUoKSBjb25zdCBmaW5hbDsKKyAgICBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6Q2hhcmFjdGVyaXN0 aWNzRmxhZ3MgY2hhcmFjdGVyaXN0aWNzKCkgY29uc3QgZmluYWw7CisgICAgdm9pZCBtYXlSZXN1 bWVQbGF5YmFjayhib29sIHNob3VsZFJlc3VtZSkgZmluYWw7CisgICAgdm9pZCBzdXNwZW5kUGxh eWJhY2soKSBmaW5hbDsKKyAgICBib29sIGNhblJlY2VpdmVSZW1vdGVDb250cm9sQ29tbWFuZHMo KSBjb25zdCBmaW5hbCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZvaWQgZGlkUmVjZWl2ZVJlbW90 ZUNvbnRyb2xDb21tYW5kKFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpSZW1vdGVDb250cm9sQ29tbWFu ZFR5cGUsIGNvbnN0IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpSZW1vdGVDb21tYW5kQXJndW1lbnQq KSBmaW5hbCB7IH0KKyAgICBib29sIHN1cHBvcnRzU2Vla2luZygpIGNvbnN0IGZpbmFsIHsgcmV0 dXJuIGZhbHNlOyB9CisgICAgYm9vbCBzaG91bGRPdmVycmlkZUJhY2tncm91bmRQbGF5YmFja1Jl c3RyaWN0aW9uKFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpJbnRlcnJ1cHRpb25UeXBlKSBjb25zdCBm aW5hbCB7IHJldHVybiBmYWxzZTsgfQorICAgIFN0cmluZyBzb3VyY2VBcHBsaWNhdGlvbklkZW50 aWZpZXIoKSBjb25zdCBmaW5hbDsKKyAgICBib29sIGNhblByb2R1Y2VBdWRpbygpIGNvbnN0IGZp bmFsOworICAgIGNvbnN0IERvY3VtZW50KiBob3N0aW5nRG9jdW1lbnQoKSBjb25zdCBmaW5hbCB7 IHJldHVybiBkb2N1bWVudCgpOyB9CisKICAgICBib29sIGludGVybmFsQWRkVHJhY2soUmVmPE1l ZGlhU3RyZWFtVHJhY2s+JiYsIFN0cmVhbU1vZGlmaWVyKTsKICAgICBib29sIGludGVybmFsUmVt b3ZlVHJhY2soY29uc3QgU3RyaW5nJiwgU3RyZWFtTW9kaWZpZXIpOwogCkBAIC0xNTQsNiArMTcw LDcgQEAgcHJpdmF0ZToKICAgICBWZWN0b3I8UmVmPEV2ZW50Pj4gbV9zY2hlZHVsZWRBY3Rpdml0 eUV2ZW50czsKIAogICAgIFZlY3RvcjxPYnNlcnZlcio+IG1fb2JzZXJ2ZXJzOworICAgIHN0ZDo6 dW5pcXVlX3B0cjxQbGF0Zm9ybU1lZGlhU2Vzc2lvbj4gbV9tZWRpYVNlc3Npb247CiAKICAgICBi b29sIG1faXNBY3RpdmUgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc011dGVkIHsgdHJ1ZSB9OwpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24u aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1l ZGlhU2Vzc2lvbi5oCShyZXZpc2lvbiAyMTUxODUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC01OCw2ICs1 OCw3IEBAIHB1YmxpYzoKICAgICAgICAgVmlkZW9BdWRpbywKICAgICAgICAgQXVkaW8sCiAgICAg ICAgIFdlYkF1ZGlvLAorICAgICAgICBNZWRpYVN0cmVhbUNhcHR1cmluZ0F1ZGlvLAogICAgIH07 CiAgICAgTWVkaWFUeXBlIG1lZGlhVHlwZSgpIGNvbnN0OwogICAgIE1lZGlhVHlwZSBwcmVzZW50 YXRpb25UeXBlKCkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9Q bGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAJKHJldmlz aW9uIDIxNTE4NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVk aWFTZXNzaW9uTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTczLDcgKzczLDcgQEAgdm9p ZCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnJlc2V0UgogCiBib29sIFBsYXRmb3JtTWVk aWFTZXNzaW9uTWFuYWdlcjo6aGFzKFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpNZWRpYVR5cGUgdHlw ZSkgY29uc3QKIHsKLSAgICBBU1NFUlQodHlwZSA+PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6Tm9u ZSAmJiB0eXBlIDw9IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpXZWJBdWRpbyk7CisgICAgQVNTRVJU KHR5cGUgPj0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok5vbmUgJiYgdHlwZSA8PSBQbGF0Zm9ybU1l ZGlhU2Vzc2lvbjo6TWVkaWFTdHJlYW1DYXB0dXJpbmdBdWRpbyk7CiAKICAgICByZXR1cm4gYW55 T2ZTZXNzaW9ucyhbdHlwZV0gKFBsYXRmb3JtTWVkaWFTZXNzaW9uJiBzZXNzaW9uLCBzaXplX3Qp IHsKICAgICAgICAgcmV0dXJuIHNlc3Npb24ubWVkaWFUeXBlKCkgPT0gdHlwZTsKQEAgLTk2LDcg Kzk2LDcgQEAgYm9vbCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OmNhblBybwogCiBpbnQg UGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpjb3VudChQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6 TWVkaWFUeXBlIHR5cGUpIGNvbnN0CiB7Ci0gICAgQVNTRVJUKHR5cGUgPj0gUGxhdGZvcm1NZWRp YVNlc3Npb246Ok5vbmUgJiYgdHlwZSA8PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6V2ViQXVkaW8p OworICAgIEFTU0VSVCh0eXBlID49IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpOb25lICYmIHR5cGUg PD0gUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhU3RyZWFtQ2FwdHVyaW5nQXVkaW8pOwogCiAg ICAgaW50IGNvdW50ID0gMDsKICAgICBmb3IgKGF1dG8qIHNlc3Npb24gOiBtX3Nlc3Npb25zKSB7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2NvYS9NZWRpYVNlc3Npb25N YW5hZ2VyQ29jb2EuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1 ZGlvL2NvY29hL01lZGlhU2Vzc2lvbk1hbmFnZXJDb2NvYS5jcHAJKHJldmlzaW9uIDIxNTE4NSkK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29hL01lZGlhU2Vzc2lvbk1hbmFn ZXJDb2NvYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQyLDcgKzQyLDcgQEAgdm9pZCBQbGF0Zm9y bU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnVwZGF0ZQogewogICAgIExPRyhNZWRpYSwgIlBsYXRmb3Jt TWVkaWFTZXNzaW9uTWFuYWdlcjo6dXBkYXRlU2Vzc2lvblN0YXRlKCkgLSB0eXBlczogVmlkZW8o JWQpLCBBdWRpbyglZCksIFdlYkF1ZGlvKCVkKSIsIGNvdW50KFBsYXRmb3JtTWVkaWFTZXNzaW9u OjpWaWRlbyksIGNvdW50KFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpBdWRpbyksIGNvdW50KFBsYXRm b3JtTWVkaWFTZXNzaW9uOjpXZWJBdWRpbykpOwogCi0gICAgaWYgKGhhcyhQbGF0Zm9ybU1lZGlh U2Vzc2lvbjo6V2ViQXVkaW8pKQorICAgIGlmIChoYXMoUGxhdGZvcm1NZWRpYVNlc3Npb246Oldl YkF1ZGlvKSB8fCBoYXMoUGxhdGZvcm1NZWRpYVNlc3Npb246Ok1lZGlhU3RyZWFtQ2FwdHVyaW5n QXVkaW8pKQogICAgICAgICBBdWRpb1Nlc3Npb246OnNoYXJlZFNlc3Npb24oKS5zZXRQcmVmZXJy ZWRCdWZmZXJTaXplKGtXZWJBdWRpb0J1ZmZlclNpemUpOwogICAgIGVsc2UgaWYgKChoYXMoUGxh dGZvcm1NZWRpYVNlc3Npb246OlZpZGVvKSB8fCBoYXMoUGxhdGZvcm1NZWRpYVNlc3Npb246OkF1 ZGlvKSkgJiYgU2V0dGluZ3M6Omxvd1Bvd2VyVmlkZW9BdWRpb0J1ZmZlclNpemVFbmFibGVkKCkp IHsKICAgICAgICAgLy8gRklYTUU6IDxodHRwOi8vd2Via2l0Lm9yZy9iLzExNjcyNT4gRmlndXJl IG91dCB3aHkgZW5hYmxpbmcgdGhlIGNvZGUgYmVsb3cKQEAgLTYyLDE0ICs2MiwxOSBAQCB2b2lk IFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6dXBkYXRlCiAgICAgICAgIHJldHVybjsKIAog ICAgIGJvb2wgaGFzQXVkaW9NZWRpYVR5cGUgPSBmYWxzZTsKLSAgICBib29sIGhhc0F1ZGlibGVB dWRpb09yVmlkZW9NZWRpYVR5cGUgPSBhbnlPZlNlc3Npb25zKFt0aGlzLCBoYXNBdWRpb01lZGlh VHlwZV0gKFBsYXRmb3JtTWVkaWFTZXNzaW9uJiBzZXNzaW9uLCBzaXplX3QpIG11dGFibGUgewor ICAgIGJvb2wgaGFzQXVkaWJsZUF1ZGlvT3JWaWRlb01lZGlhVHlwZSA9IGZhbHNlOworICAgIGJv b2wgaGFzQXVkaW9DYXB0dXJlID0gYW55T2ZTZXNzaW9ucyhbdGhpcywgaGFzQXVkaW9NZWRpYVR5 cGUsIGhhc0F1ZGlibGVBdWRpb09yVmlkZW9NZWRpYVR5cGVdIChQbGF0Zm9ybU1lZGlhU2Vzc2lv biYgc2Vzc2lvbiwgc2l6ZV90KSBtdXRhYmxlIHsKICAgICAgICAgYXV0byB0eXBlID0gc2Vzc2lv bi5tZWRpYVR5cGUoKTsKICAgICAgICAgaWYgKHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNlc3Npb246 OlZpZGVvQXVkaW8gfHwgdHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6QXVkaW8gfHwgdHlw ZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6V2ViQXVkaW8pCiAgICAgICAgICAgICBoYXNBdWRp b01lZGlhVHlwZSA9IHRydWU7Ci0gICAgICAgIHJldHVybiAodHlwZSA9PSBQbGF0Zm9ybU1lZGlh U2Vzc2lvbjo6VmlkZW9BdWRpbyB8fCB0eXBlID09IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpBdWRp bykgJiYgc2Vzc2lvbi5jYW5Qcm9kdWNlQXVkaW8oKTsKKyAgICAgICAgaWYgKCh0eXBlID09IFBs YXRmb3JtTWVkaWFTZXNzaW9uOjpWaWRlb0F1ZGlvIHx8IHR5cGUgPT0gUGxhdGZvcm1NZWRpYVNl c3Npb246OkF1ZGlvKSAmJiBzZXNzaW9uLmNhblByb2R1Y2VBdWRpbygpKQorICAgICAgICAgICAg aGFzQXVkaWJsZUF1ZGlvT3JWaWRlb01lZGlhVHlwZSA9IHRydWU7CisgICAgICAgIHJldHVybiAo dHlwZSA9PSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6TWVkaWFTdHJlYW1DYXB0dXJpbmdBdWRpbyk7 CiAgICAgfSk7CiAKLSAgICBpZiAoaGFzQXVkaWJsZUF1ZGlvT3JWaWRlb01lZGlhVHlwZSkKKyAg ICBpZiAoaGFzQXVkaW9DYXB0dXJlKQorICAgICAgICBBdWRpb1Nlc3Npb246OnNoYXJlZFNlc3Np b24oKS5zZXRDYXRlZ29yeShBdWRpb1Nlc3Npb246OlBsYXlBbmRSZWNvcmQpOworICAgIGVsc2Ug aWYgKGhhc0F1ZGlibGVBdWRpb09yVmlkZW9NZWRpYVR5cGUpCiAgICAgICAgIEF1ZGlvU2Vzc2lv bjo6c2hhcmVkU2Vzc2lvbigpLnNldENhdGVnb3J5KEF1ZGlvU2Vzc2lvbjo6TWVkaWFQbGF5YmFj ayk7CiAgICAgZWxzZSBpZiAoaGFzQXVkaW9NZWRpYVR5cGUpCiAgICAgICAgIEF1ZGlvU2Vzc2lv bjo6c2hhcmVkU2Vzc2lvbigpLnNldENhdGVnb3J5KEF1ZGlvU2Vzc2lvbjo6QW1iaWVudFNvdW5k KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAJKHJldmlzaW9uIDIxNTE4 NSkKKysrIFNvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzIwMCw2ICszMjAwLDggQEAgc3RhdGljIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpNZWRp YVR5cGUgbQogICAgICAgICByZXR1cm4gUGxhdGZvcm1NZWRpYVNlc3Npb246OlZpZGVvQXVkaW87 CiAgICAgaWYgKGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKG1lZGlhVHlwZVN0cmluZywg IndlYmF1ZGlvIikpCiAgICAgICAgIHJldHVybiBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6V2ViQXVk aW87CisgICAgaWYgKGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKG1lZGlhVHlwZVN0cmlu ZywgIm1lZGlhc3RyZWFtY2FwdHVyaW5nYXVkaW8iKSkKKyAgICAgICAgcmV0dXJuIFBsYXRmb3Jt TWVkaWFTZXNzaW9uOjpNZWRpYVN0cmVhbUNhcHR1cmluZ0F1ZGlvOwogCiAgICAgcmV0dXJuIFBs YXRmb3JtTWVkaWFTZXNzaW9uOjpOb25lOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNpb24gMjE1 MjQwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTQgQEAKKzIwMTctMDQtMTEgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5j b20+CisKKyAgICAgICAgW01lZGlhU3RyZWFtXSBTZXQgY29ycmVjdCBhdWRpbyBzZXNzaW9uIGNh dGVnb3J5IHdoZW4gY2FwdHVyaW5nIGF1ZGlvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzA3MzYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMxNTU5 NDA1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94 eTo6aXNQbGF5aW5nTWVkaWFEaWRDaGFuZ2UpOgorCiAyMDE3LTA0LTExICBZb3Vlbm4gRmFibGV0 ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBBY3RpdmF0ZSBXZWJSVEMgZGF0YSBjaGFu bmVsIHRlc3RzIGZvciBXSzEKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCShyZXZpc2lvbiAyMTUxODUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjQ0Niw3ICs2NDQ2LDcgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmlzUGxheWluZ01lZGlhRGlkQ2hhbgogICAgIGlmIChzdGF0ZSA9PSBt X21lZGlhU3RhdGUpCiAgICAgICAgIHJldHVybjsKIAotICAgIFdlYkNvcmU6Ok1lZGlhUHJvZHVj ZXI6Ok1lZGlhU3RhdGVGbGFncyBhY3RpdmVDYXB0dXJlTWFzayA9IFdlYkNvcmU6Ok1lZGlhUHJv ZHVjZXI6Okhhc0FjdGl2ZUF1ZGlvQ2FwdHVyZURldmljZSB8IFdlYkNvcmU6Ok1lZGlhUHJvZHVj ZXI6Okhhc0FjdGl2ZVZpZGVvQ2FwdHVyZURldmljZTsKKyAgICBXZWJDb3JlOjpNZWRpYVByb2R1 Y2VyOjpNZWRpYVN0YXRlRmxhZ3MgYWN0aXZlQ2FwdHVyZU1hc2sgPSBXZWJDb3JlOjpNZWRpYVBy b2R1Y2VyOjpIYXNBY3RpdmVBdWRpb0NhcHR1cmVEZXZpY2UgfCBXZWJDb3JlOjpNZWRpYVByb2R1 Y2VyOjpIYXNBY3RpdmVWaWRlb0NhcHR1cmVEZXZpY2UgfCBXZWJDb3JlOjpNZWRpYVByb2R1Y2Vy OjpIYXNNdXRlZEF1ZGlvQ2FwdHVyZURldmljZSB8IFdlYkNvcmU6Ok1lZGlhUHJvZHVjZXI6Okhh c011dGVkVmlkZW9DYXB0dXJlRGV2aWNlOwogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCiAgICAg V2ViQ29yZTo6TWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZUZsYWdzIG9sZE1lZGlhU3RhdGVIYXNB Y3RpdmVDYXB0dXJlID0gbV9tZWRpYVN0YXRlICYgYWN0aXZlQ2FwdHVyZU1hc2s7CiAgICAgV2Vi Q29yZTo6TWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZUZsYWdzIG5ld01lZGlhU3RhdGVIYXNBY3Rp dmVDYXB0dXJlID0gc3RhdGUgJiBhY3RpdmVDYXB0dXJlTWFzazsK