216974 2020-09-25 06:54:15 -0700 Make sure our calls to AVCaptureDevice requestAccessForMediaType do processing on the main thread 2020-09-28 07:34:52 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf darin eric.carlson webkit-bug-importer youennf oldest_to_newest 1691866 0 youennf 2020-09-25 06:54:15 -0700 Make sure our calls to AVCaptureDevice requestAccessForMediaType do processing on the main thread 1691875 1 409691 youennf 2020-09-25 07:31:10 -0700 Created attachment 409691 Patch 1691878 2 409692 youennf 2020-09-25 07:43:06 -0700 Created attachment 409692 Patch 1691879 3 409693 youennf 2020-09-25 07:49:50 -0700 Created attachment 409693 Patch 1691880 4 409694 youennf 2020-09-25 08:03:58 -0700 Created attachment 409694 Patch 1691887 5 webkit-bug-importer 2020-09-25 08:17:34 -0700 <rdar://problem/69572304> 1692241 6 409694 darin 2020-09-26 16:07:27 -0700 Comment on attachment 409694 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=409694&action=review > Source/WebKit/ChangeLog:8 > + The completion handler to [AVCaptureDeviceClass requestAccessForMediaType:] may sometimes be called in a background thread on iOS. Can we make a test for this that will fail on iOS? > Source/WebKit/UIProcess/Cocoa/UIDelegate.mm:995 > + auto completionHandler = [this, weakThis = WTFMove(weakThis), frame = WTFMove(frame), protectedRequest = WTFMove(protectedRequest), webView = WTFMove(webView), topLevelOrigin = WTFMove(topLevelOrigin)](BOOL authorized) { I think it’s a bad pattern when we pass a pointer twice, once that we use and other for lifetime checking. In case like this, can we *not* capture this, please? Minimizes the chance we use it wrong. I feel the same way about capturing both "this" and "protectedThis". 1692501 7 youennf 2020-09-28 02:20:41 -0700 (In reply to Darin Adler from comment #6) > Comment on attachment 409694 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=409694&action=review > > > Source/WebKit/ChangeLog:8 > > + The completion handler to [AVCaptureDeviceClass requestAccessForMediaType:] may sometimes be called in a background thread on iOS. > > Can we make a test for this that will fail on iOS? We are only calling this code path in case the authorisation is undetermined, which will most probably trigger a prompt. We usually avoid doing so as we cannot handle prompts easily. That said, it seems we could investigate using some additional tools. I filed rdar://problem/69687122. > > > Source/WebKit/UIProcess/Cocoa/UIDelegate.mm:995 > > + auto completionHandler = [this, weakThis = WTFMove(weakThis), frame = WTFMove(frame), protectedRequest = WTFMove(protectedRequest), webView = WTFMove(webView), topLevelOrigin = WTFMove(topLevelOrigin)](BOOL authorized) { > > I think it’s a bad pattern when we pass a pointer twice, once that we use > and other for lifetime checking. In case like this, can we *not* capture > this, please? Minimizes the chance we use it wrong. I feel the same way > about capturing both "this" and "protectedThis". Will change it. I agree for weakThis, since 'this' is unsafer than using weakThis. Not sure about protectedThis though. This is no different from using 'this' in a method where this is a protectedThis before. 1692503 8 youennf 2020-09-28 02:27:26 -0700 > > > Source/WebKit/ChangeLog:8 > > > + The completion handler to [AVCaptureDeviceClass requestAccessForMediaType:] may sometimes be called in a background thread on iOS. > > > > Can we make a test for this that will fail on iOS? > > We are only calling this code path in case the authorisation is > undetermined, which will most probably trigger a prompt. > We usually avoid doing so as we cannot handle prompts easily. > That said, it seems we could investigate using some additional tools. > I filed rdar://problem/69687122. Or we could add some testing API to force explicit request. 1692504 9 409875 youennf 2020-09-28 02:28:30 -0700 Created attachment 409875 Patch for landing 1692537 10 ews-feeder 2020-09-28 07:34:51 -0700 Committed r267698: <https://trac.webkit.org/changeset/267698> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409875. 409691 2020-09-25 07:31:10 -0700 2020-09-25 07:44:09 -0700 Patch bug-216974-20200925163108.patch text/plain 4861 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdiZGFjZTk0NmUyZTVjNjhl YWYxNGQ5NjYxMjQyODIxM2NiNGVjZDIuLjM2YTQxYWUzMTZkMzczZDA3OWQyYjZlYTgwMjFkNTYx NDAxMzVhNmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDktMjUgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSBvdXIgY2FsbHMg dG8gQVZDYXB0dXJlRGV2aWNlIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGUgZG8gcHJvY2Vzc2lu ZyBvbiB0aGUgbWFpbiB0aHJlYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNjk3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBjb21wbGV0aW9uIGhhbmRsZXIgdG8gW0FWQ2FwdHVyZURldmljZUNs YXNzIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGU6XSBtYXkgc29tZXRpbWVzIGJlIGNhbGxlZCBp biBhIGJhY2tncm91bmQgdGhyZWFkIG9uIGlPUy4KKyAgICAgICAgTWFrZSBzdXJlIHRvIGhvcCB0 byB0aGUgbWFpbiB0aHJlYWQgaWYgdGhhdCBpcyB0aGUgY2FzZS4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tOgorICAgICAgICAoV2ViS2l0OjpyZXF1ZXN0QWNjZXNz Rm9yTWVkaWFUeXBlKToKKyAgICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OmRl Y2lkZVBvbGljeUZvclVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0KToKKwogMjAyMC0wOS0yNSAg WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IGRl ZmF1bHQgYmVoYXZpb3IgZm9yIGdldFVzZXJNZWRpYSByZXF1ZXN0cyBpbiBjYXNlIHdoZXJlIHRo ZXJlIGlzIG5vIGRlbGVnYXRlIHNldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJ RGVsZWdhdGUubW0KaW5kZXggYzAyYmY4OTJkOGMyYjU4OTE5MDNiZTk2NjA5ZGViN2JmZDdiYWQ0 NC4uMTViMWExNTU0ZDgwOWYzYmViNTMzMWU3ZTE0Mjc1ZWFlNmE4ZWQ2NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCkBAIC05NDEsNiArOTQxLDIwIEBA IHN0YXRpYyB2b2lkIHJlcXVlc3RVc2VyTWVkaWFBdXRob3JpemF0aW9uRm9yRnJhbWUoY29uc3Qg V2ViRnJhbWVQcm94eSYgZnJhbWUsIEFQCiB9CiAjZW5kaWYKIAorc3RhdGljIHZvaWQgcmVxdWVz dEFjY2Vzc0Zvck1lZGlhVHlwZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEJPT0wgYXV0aG9yaXpl ZCk+JiYgY29tcGxldGlvbkhhbmRsZXIsIEFWTWVkaWFUeXBlIHR5cGUpCit7CisgICAgYXV0byBk ZWNpc2lvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoW2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcildKEJPT0wgYXV0aG9yaXplZCkgbXV0YWJsZSB7CisgICAgICAg IGlmICghaXNNYWluVGhyZWFkKCkpIHsKKyAgICAgICAgICAgIGNhbGxPbk1haW5UaHJlYWQoW2Nv bXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIGF1dGhvcml6ZWRd KCkgbXV0YWJsZSB7CisgICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoYXV0aG9yaXpl ZCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAg ICAgICBjb21wbGV0aW9uSGFuZGxlcihhdXRob3JpemVkKTsKKyAgICB9KTsKKyAgICBbUEFMOjpn ZXRBVkNhcHR1cmVEZXZpY2VDbGFzcygpIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGU6dHlwZSBj b21wbGV0aW9uSGFuZGxlcjpkZWNpc2lvbkhhbmRsZXIuZ2V0KCldOworfQorCiB2b2lkIFVJRGVs ZWdhdGU6OlVJQ2xpZW50OjpkZWNpZGVQb2xpY3lGb3JVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVz dChXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYkZyYW1lUHJveHkmIGZyYW1lLCBBUEk6OlNlY3VyaXR5 T3JpZ2luJiB1c2VyTWVkaWFPcmlnaW4sIEFQSTo6U2VjdXJpdHlPcmlnaW4mIHRvcExldmVsT3Jp Z2luLCBVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdFByb3h5JiByZXF1ZXN0KQogewogI2lmIEVO QUJMRShNRURJQV9TVFJFQU0pCkBAIC05NzUsMTUgKzk4OSwxNCBAQCB2b2lkIFVJRGVsZWdhdGU6 OlVJQ2xpZW50OjpkZWNpZGVQb2xpY3lGb3JVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdChXZWJQ YWdlUHJveAogICAgICAgICAgICAgcHJvdGVjdGVkUmVxdWVzdC0+ZGVueShVc2VyTWVkaWFQZXJt aXNzaW9uUmVxdWVzdFByb3h5OjpVc2VyTWVkaWFBY2Nlc3NEZW5pYWxSZWFzb246OlBlcm1pc3Np b25EZW5pZWQpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBjYXNlIEFWQXV0aG9yaXph dGlvblN0YXR1c05vdERldGVybWluZWQ6Ci0gICAgICAgICAgICBhdXRvIGRlY2lzaW9uSGFuZGxl ciA9IG1ha2VCbG9ja1B0cihbdGhpcywgJmZyYW1lLCBwcm90ZWN0ZWRSZXF1ZXN0ID0gbWFrZVJl Zihwcm90ZWN0ZWRSZXF1ZXN0LmdldCgpKSwgd2ViVmlldyA9IFJldGFpblB0cjxXS1dlYlZpZXc+ KG1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcpLCB0b3BMZXZlbE9yaWdpbiA9IFdURk1vdmUodG9wTGV2 ZWxPcmlnaW4pXShCT09MIGF1dGhvcml6ZWQpIHsKKyAgICAgICAgICAgIGF1dG8gY29tcGxldGlv bkhhbmRsZXIgPSBbdGhpcywgJmZyYW1lLCBwcm90ZWN0ZWRSZXF1ZXN0ID0gbWFrZVJlZihwcm90 ZWN0ZWRSZXF1ZXN0LmdldCgpKSwgd2ViVmlldyA9IFJldGFpblB0cjxXS1dlYlZpZXc+KG1fdWlE ZWxlZ2F0ZS5tX3dlYlZpZXcpLCB0b3BMZXZlbE9yaWdpbiA9IFdURk1vdmUodG9wTGV2ZWxPcmln aW4pXShCT09MIGF1dGhvcml6ZWQpIHsKICAgICAgICAgICAgICAgICBpZiAoIWF1dGhvcml6ZWQp IHsKICAgICAgICAgICAgICAgICAgICAgcHJvdGVjdGVkUmVxdWVzdC0+ZGVueShVc2VyTWVkaWFQ ZXJtaXNzaW9uUmVxdWVzdFByb3h5OjpVc2VyTWVkaWFBY2Nlc3NEZW5pYWxSZWFzb246OlBlcm1p c3Npb25EZW5pZWQpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIHJlcXVlc3RVc2VyTWVkaWFBdXRob3JpemF0aW9uRm9yRnJh bWUoZnJhbWUsIHRvcExldmVsT3JpZ2luLCBwcm90ZWN0ZWRSZXF1ZXN0LCAoaWQgPFdLVUlEZWxl Z2F0ZVByaXZhdGU+KW1fdWlEZWxlZ2F0ZS5tX2RlbGVnYXRlLmdldCgpLCAqd2ViVmlldy5nZXQo KSk7Ci0gICAgICAgICAgICB9KTsKLQotICAgICAgICAgICAgW1BBTDo6Z2V0QVZDYXB0dXJlRGV2 aWNlQ2xhc3MoKSByZXF1ZXN0QWNjZXNzRm9yTWVkaWFUeXBlOkFWTWVkaWFUeXBlVmlkZW8gY29t cGxldGlvbkhhbmRsZXI6ZGVjaXNpb25IYW5kbGVyLmdldCgpXTsKKyAgICAgICAgICAgIH07Cisg ICAgICAgICAgICByZXF1ZXN0QWNjZXNzRm9yTWVkaWFUeXBlKFdURk1vdmUoY29tcGxldGlvbkhh bmRsZXIpLCBBVk1lZGlhVHlwZVZpZGVvKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9 CiAgICAgfSk7CkBAIC05OTksMTUgKzEwMTIsMTQgQEAgdm9pZCBVSURlbGVnYXRlOjpVSUNsaWVu dDo6ZGVjaWRlUG9saWN5Rm9yVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3QoV2ViUGFnZVByb3gK ICAgICAgICAgICAgIHJlcXVlc3QuZGVueShVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdFByb3h5 OjpVc2VyTWVkaWFBY2Nlc3NEZW5pYWxSZWFzb246OlBlcm1pc3Npb25EZW5pZWQpOwogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICBjYXNlIEFWQXV0aG9yaXphdGlvblN0YXR1c05vdERldGVy bWluZWQ6Ci0gICAgICAgICAgICBhdXRvIGRlY2lzaW9uSGFuZGxlciA9IG1ha2VCbG9ja1B0cihb cHJvdGVjdGVkUmVxdWVzdCA9IG1ha2VSZWYocmVxdWVzdCksIHJlcXVlc3RDYW1lcmFBdXRob3Jp emF0aW9uXShCT09MIGF1dGhvcml6ZWQpIHsKKyAgICAgICAgICAgIGF1dG8gY29tcGxldGlvbkhh bmRsZXIgPSBbcHJvdGVjdGVkUmVxdWVzdCA9IG1ha2VSZWYocmVxdWVzdCksIHJlcXVlc3RDYW1l cmFBdXRob3JpemF0aW9uXShCT09MIGF1dGhvcml6ZWQpIHsKICAgICAgICAgICAgICAgICBpZiAo IWF1dGhvcml6ZWQpIHsKICAgICAgICAgICAgICAgICAgICAgcHJvdGVjdGVkUmVxdWVzdC0+ZGVu eShVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdFByb3h5OjpVc2VyTWVkaWFBY2Nlc3NEZW5pYWxS ZWFzb246OlBlcm1pc3Npb25EZW5pZWQpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHJlcXVlc3RDYW1lcmFBdXRob3JpemF0 aW9uKCk7Ci0gICAgICAgICAgICB9KTsKLQotICAgICAgICAgICAgW1BBTDo6Z2V0QVZDYXB0dXJl RGV2aWNlQ2xhc3MoKSByZXF1ZXN0QWNjZXNzRm9yTWVkaWFUeXBlOkFWTWVkaWFUeXBlQXVkaW8g Y29tcGxldGlvbkhhbmRsZXI6ZGVjaXNpb25IYW5kbGVyLmdldCgpXTsKKyAgICAgICAgICAgIH07 CisgICAgICAgICAgICByZXF1ZXN0QWNjZXNzRm9yTWVkaWFUeXBlKFdURk1vdmUoY29tcGxldGlv bkhhbmRsZXIpLCBBVk1lZGlhVHlwZVZpZGVvKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICB9CiAgICAgfSBlbHNlCg== 409692 2020-09-25 07:43:06 -0700 2020-09-25 07:56:49 -0700 Patch bug-216974-20200925164304.patch text/plain 6522 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdiZGFjZTk0NmUyZTVjNjhl YWYxNGQ5NjYxMjQyODIxM2NiNGVjZDIuLmUyMDMwMjFhMWNkNTRiZTNhYzBkZmIxOWY5N2M1OGJm Njc0NGVmOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMDktMjUgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSBvdXIgY2FsbHMg dG8gQVZDYXB0dXJlRGV2aWNlIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGUgZG8gcHJvY2Vzc2lu ZyBvbiB0aGUgbWFpbiB0aHJlYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNjk3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBjb21wbGV0aW9uIGhhbmRsZXIgdG8gW0FWQ2FwdHVyZURldmljZUNs YXNzIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGU6XSBtYXkgc29tZXRpbWVzIGJlIGNhbGxlZCBp biBhIGJhY2tncm91bmQgdGhyZWFkIG9uIGlPUy4KKyAgICAgICAgTWFrZSBzdXJlIHRvIGhvcCB0 byB0aGUgbWFpbiB0aHJlYWQgaWYgdGhhdCBpcyB0aGUgY2FzZS4KKyAgICAgICAgQWxzbyBtYWtl IHN1cmUgdG8gcmVmL3dlYWtyZWYgbGFtYmRhIGNhcHR1cmVkIHZhcmlhYmxlcy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tOgorICAgICAgICAoV2ViS2l0OjpyZXF1 ZXN0QWNjZXNzRm9yTWVkaWFUeXBlKToKKyAgICAgICAgKFdlYktpdDo6VUlEZWxlZ2F0ZTo6VUlD bGllbnQ6OmRlY2lkZVBvbGljeUZvclVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0KToKKwogMjAy MC0wOS0yNSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1w bGVtZW50IGRlZmF1bHQgYmVoYXZpb3IgZm9yIGdldFVzZXJNZWRpYSByZXF1ZXN0cyBpbiBjYXNl IHdoZXJlIHRoZXJlIGlzIG5vIGRlbGVnYXRlIHNldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0NvY29hL1VJRGVsZWdhdGUubW0KaW5kZXggYzAyYmY4OTJkOGMyYjU4OTE5MDNiZTk2NjA5ZGVi N2JmZDdiYWQ0NC4uNWRhN2Q4M2IwY2NhMjdkZWQ4NzZlMjA2NDhiNThjMTJiMzE0MDg0MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCkBAIC05NDEsNiAr OTQxLDIwIEBAIHN0YXRpYyB2b2lkIHJlcXVlc3RVc2VyTWVkaWFBdXRob3JpemF0aW9uRm9yRnJh bWUoY29uc3QgV2ViRnJhbWVQcm94eSYgZnJhbWUsIEFQCiB9CiAjZW5kaWYKIAorc3RhdGljIHZv aWQgcmVxdWVzdEFjY2Vzc0Zvck1lZGlhVHlwZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEJPT0wg YXV0aG9yaXplZCk+JiYgY29tcGxldGlvbkhhbmRsZXIsIEFWTWVkaWFUeXBlIHR5cGUpCit7Cisg ICAgYXV0byBkZWNpc2lvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoW2NvbXBsZXRpb25IYW5kbGVy ID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKEJPT0wgYXV0aG9yaXplZCkgbXV0YWJsZSB7 CisgICAgICAgIGlmICghaXNNYWluVGhyZWFkKCkpIHsKKyAgICAgICAgICAgIGNhbGxPbk1haW5U aHJlYWQoW2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIGF1 dGhvcml6ZWRdKCkgbXV0YWJsZSB7CisgICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo YXV0aG9yaXplZCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihhdXRob3JpemVkKTsKKyAgICB9KTsKKyAg ICBbUEFMOjpnZXRBVkNhcHR1cmVEZXZpY2VDbGFzcygpIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5 cGU6dHlwZSBjb21wbGV0aW9uSGFuZGxlcjpkZWNpc2lvbkhhbmRsZXIuZ2V0KCldOworfQorCiB2 b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50OjpkZWNpZGVQb2xpY3lGb3JVc2VyTWVkaWFQZXJtaXNz aW9uUmVxdWVzdChXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYkZyYW1lUHJveHkmIGZyYW1lLCBBUEk6 OlNlY3VyaXR5T3JpZ2luJiB1c2VyTWVkaWFPcmlnaW4sIEFQSTo6U2VjdXJpdHlPcmlnaW4mIHRv cExldmVsT3JpZ2luLCBVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdFByb3h5JiByZXF1ZXN0KQog ewogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCkBAIC05NTksOCArOTczLDExIEBAIHZvaWQgVUlE ZWxlZ2F0ZTo6VUlDbGllbnQ6OmRlY2lkZVBvbGljeUZvclVzZXJNZWRpYVBlcm1pc3Npb25SZXF1 ZXN0KFdlYlBhZ2VQcm94CiAgICAgfQogCiAgICAgYm9vbCB1c2luZ01vY2tDYXB0dXJlRGV2aWNl cyA9IHBhZ2UucHJlZmVyZW5jZXMoKS5tb2NrQ2FwdHVyZURldmljZXNFbmFibGVkKCk7Ci0gICAg YXV0byByZXF1ZXN0Q2FtZXJhQXV0aG9yaXphdGlvbiA9IG1ha2VCbG9ja1B0cihbdGhpcywgJmZy YW1lLCBwcm90ZWN0ZWRSZXF1ZXN0ID0gbWFrZVJlZihyZXF1ZXN0KSwgd2ViVmlldyA9IFJldGFp blB0cjxXS1dlYlZpZXc+KG1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcpLCB0b3BMZXZlbE9yaWdpbiA9 IG1ha2VSZWYodG9wTGV2ZWxPcmlnaW4pLCB1c2luZ01vY2tDYXB0dXJlRGV2aWNlc10oKSBtdXRh YmxlIHsKLQorICAgIGF1dG8gcmVxdWVzdENhbWVyYUF1dGhvcml6YXRpb24gPSBbdGhpcywgd2Vh a1RoaXMgPSBtYWtlV2Vha1B0cih0aGlzKSwgZnJhbWUgPSBtYWtlUmVmKGZyYW1lKSwgcHJvdGVj dGVkUmVxdWVzdCA9IG1ha2VSZWYocmVxdWVzdCksIHdlYlZpZXcgPSBSZXRhaW5QdHI8V0tXZWJW aWV3PihtX3VpRGVsZWdhdGUubV93ZWJWaWV3KSwgdG9wTGV2ZWxPcmlnaW4gPSBtYWtlUmVmKHRv cExldmVsT3JpZ2luKSwgdXNpbmdNb2NrQ2FwdHVyZURldmljZXNdKCkgbXV0YWJsZSB7CisgICAg ICAgIGlmICghd2Vha1RoaXMpIHsKKyAgICAgICAgICAgIHByb3RlY3RlZFJlcXVlc3QtPmRlbnko VXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RQcm94eTo6VXNlck1lZGlhQWNjZXNzRGVuaWFsUmVh c29uOjpQZXJtaXNzaW9uRGVuaWVkKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQog ICAgICAgICBpZiAoIXByb3RlY3RlZFJlcXVlc3QtPnJlcXVpcmVzVmlkZW9DYXB0dXJlKCkpIHsK ICAgICAgICAgICAgIHJlcXVlc3RVc2VyTWVkaWFBdXRob3JpemF0aW9uRm9yRnJhbWUoZnJhbWUs IHRvcExldmVsT3JpZ2luLCBwcm90ZWN0ZWRSZXF1ZXN0LCAoaWQgPFdLVUlEZWxlZ2F0ZVByaXZh dGU+KW1fdWlEZWxlZ2F0ZS5tX2RlbGVnYXRlLmdldCgpLCAqd2ViVmlldy5nZXQoKSk7CiAgICAg ICAgICAgICByZXR1cm47CkBAIC05NzUsMTggKzk5MiwxNyBAQCB2b2lkIFVJRGVsZWdhdGU6OlVJ Q2xpZW50OjpkZWNpZGVQb2xpY3lGb3JVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdChXZWJQYWdl UHJveAogICAgICAgICAgICAgcHJvdGVjdGVkUmVxdWVzdC0+ZGVueShVc2VyTWVkaWFQZXJtaXNz aW9uUmVxdWVzdFByb3h5OjpVc2VyTWVkaWFBY2Nlc3NEZW5pYWxSZWFzb246OlBlcm1pc3Npb25E ZW5pZWQpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBjYXNlIEFWQXV0aG9yaXphdGlv blN0YXR1c05vdERldGVybWluZWQ6Ci0gICAgICAgICAgICBhdXRvIGRlY2lzaW9uSGFuZGxlciA9 IG1ha2VCbG9ja1B0cihbdGhpcywgJmZyYW1lLCBwcm90ZWN0ZWRSZXF1ZXN0ID0gbWFrZVJlZihw cm90ZWN0ZWRSZXF1ZXN0LmdldCgpKSwgd2ViVmlldyA9IFJldGFpblB0cjxXS1dlYlZpZXc+KG1f dWlEZWxlZ2F0ZS5tX3dlYlZpZXcpLCB0b3BMZXZlbE9yaWdpbiA9IFdURk1vdmUodG9wTGV2ZWxP cmlnaW4pXShCT09MIGF1dGhvcml6ZWQpIHsKLSAgICAgICAgICAgICAgICBpZiAoIWF1dGhvcml6 ZWQpIHsKKyAgICAgICAgICAgIGF1dG8gY29tcGxldGlvbkhhbmRsZXIgPSBbdGhpcywgd2Vha1Ro aXMgPSBXVEZNb3ZlKHdlYWtUaGlzKSwgZnJhbWUgPSBXVEZNb3ZlKGZyYW1lKSwgcHJvdGVjdGVk UmVxdWVzdCA9IFdURk1vdmUocHJvdGVjdGVkUmVxdWVzdCksIHdlYlZpZXcgPSBXVEZNb3ZlKHdl YlZpZXcpLCB0b3BMZXZlbE9yaWdpbiA9IFdURk1vdmUodG9wTGV2ZWxPcmlnaW4pXShCT09MIGF1 dGhvcml6ZWQpIHsKKyAgICAgICAgICAgICAgICBpZiAoIWF1dGhvcml6ZWQgfHwgIXdlYWtUaGlz KSB7CiAgICAgICAgICAgICAgICAgICAgIHByb3RlY3RlZFJlcXVlc3QtPmRlbnkoVXNlck1lZGlh UGVybWlzc2lvblJlcXVlc3RQcm94eTo6VXNlck1lZGlhQWNjZXNzRGVuaWFsUmVhc29uOjpQZXJt aXNzaW9uRGVuaWVkKTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICByZXF1ZXN0VXNlck1lZGlhQXV0aG9yaXphdGlvbkZvckZy YW1lKGZyYW1lLCB0b3BMZXZlbE9yaWdpbiwgcHJvdGVjdGVkUmVxdWVzdCwgKGlkIDxXS1VJRGVs ZWdhdGVQcml2YXRlPiltX3VpRGVsZWdhdGUubV9kZWxlZ2F0ZS5nZXQoKSwgKndlYlZpZXcuZ2V0 KCkpOwotICAgICAgICAgICAgfSk7Ci0KLSAgICAgICAgICAgIFtQQUw6OmdldEFWQ2FwdHVyZURl dmljZUNsYXNzKCkgcmVxdWVzdEFjY2Vzc0Zvck1lZGlhVHlwZTpBVk1lZGlhVHlwZVZpZGVvIGNv bXBsZXRpb25IYW5kbGVyOmRlY2lzaW9uSGFuZGxlci5nZXQoKV07CisgICAgICAgICAgICB9Owor ICAgICAgICAgICAgcmVxdWVzdEFjY2Vzc0Zvck1lZGlhVHlwZShXVEZNb3ZlKGNvbXBsZXRpb25I YW5kbGVyKSwgQVZNZWRpYVR5cGVWaWRlbyk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQotICAgIH0pOworICAgIH07CiAKICAgICBpZiAocmVxdWlyZXNBdWRpb0NhcHR1cmUpIHsKICAg ICAgICAgQVZBdXRob3JpemF0aW9uU3RhdHVzIG1pY3JvcGhvbmVBdXRob3JpemF0aW9uU3RhdHVz ID0gdXNpbmdNb2NrQ2FwdHVyZURldmljZXMgPyBBVkF1dGhvcml6YXRpb25TdGF0dXNBdXRob3Jp emVkIDogW1BBTDo6Z2V0QVZDYXB0dXJlRGV2aWNlQ2xhc3MoKSBhdXRob3JpemF0aW9uU3RhdHVz Rm9yTWVkaWFUeXBlOkFWTWVkaWFUeXBlQXVkaW9dOwpAQCAtOTk5LDE5ICsxMDE1LDE5IEBAIHZv aWQgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OmRlY2lkZVBvbGljeUZvclVzZXJNZWRpYVBlcm1pc3Np b25SZXF1ZXN0KFdlYlBhZ2VQcm94CiAgICAgICAgICAgICByZXF1ZXN0LmRlbnkoVXNlck1lZGlh UGVybWlzc2lvblJlcXVlc3RQcm94eTo6VXNlck1lZGlhQWNjZXNzRGVuaWFsUmVhc29uOjpQZXJt aXNzaW9uRGVuaWVkKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgY2FzZSBBVkF1dGhv cml6YXRpb25TdGF0dXNOb3REZXRlcm1pbmVkOgotICAgICAgICAgICAgYXV0byBkZWNpc2lvbkhh bmRsZXIgPSBtYWtlQmxvY2tQdHIoW3Byb3RlY3RlZFJlcXVlc3QgPSBtYWtlUmVmKHJlcXVlc3Qp LCByZXF1ZXN0Q2FtZXJhQXV0aG9yaXphdGlvbl0oQk9PTCBhdXRob3JpemVkKSB7CisgICAgICAg ICAgICBhdXRvIGNvbXBsZXRpb25IYW5kbGVyID0gW3Byb3RlY3RlZFJlcXVlc3QgPSBtYWtlUmVm KHJlcXVlc3QpLCByZXF1ZXN0Q2FtZXJhQXV0aG9yaXphdGlvbiA9IFdURk1vdmUocmVxdWVzdENh bWVyYUF1dGhvcml6YXRpb24pXShCT09MIGF1dGhvcml6ZWQpIG11dGFibGUgewogICAgICAgICAg ICAgICAgIGlmICghYXV0aG9yaXplZCkgewogICAgICAgICAgICAgICAgICAgICBwcm90ZWN0ZWRS ZXF1ZXN0LT5kZW55KFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0UHJveHk6OlVzZXJNZWRpYUFj Y2Vzc0RlbmlhbFJlYXNvbjo6UGVybWlzc2lvbkRlbmllZCk7CiAgICAgICAgICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgcmVxdWVzdENhbWVy YUF1dGhvcml6YXRpb24oKTsKLSAgICAgICAgICAgIH0pOwotCi0gICAgICAgICAgICBbUEFMOjpn ZXRBVkNhcHR1cmVEZXZpY2VDbGFzcygpIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGU6QVZNZWRp YVR5cGVBdWRpbyBjb21wbGV0aW9uSGFuZGxlcjpkZWNpc2lvbkhhbmRsZXIuZ2V0KCldOworICAg ICAgICAgICAgfTsKKyAgICAgICAgICAgIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGUoV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlciksIEFWTWVkaWFUeXBlVmlkZW8pOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KLSAgICB9IGVsc2UKLSAgICAgICAgcmVxdWVzdENhbWVyYUF1dGhvcml6 YXRpb24oKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKyAgICByZXF1ZXN0Q2FtZXJhQXV0aG9y aXphdGlvbigpOwogI2VuZGlmCiB9CiAK 409693 2020-09-25 07:49:50 -0700 2020-09-25 08:07:12 -0700 Patch bug-216974-20200925164948.patch text/plain 11545 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdiZGFjZTk0NmUyZTVjNjhl YWYxNGQ5NjYxMjQyODIxM2NiNGVjZDIuLjc2YzM4ZDBkOTBlNTQ0NjQ2YzhkYWZmZWEwMjRmOGI3 MjM4YWEwZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMDktMjUgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSBvdXIgY2FsbHMg dG8gQVZDYXB0dXJlRGV2aWNlIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGUgZG8gcHJvY2Vzc2lu ZyBvbiB0aGUgbWFpbiB0aHJlYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNjk3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBjb21wbGV0aW9uIGhhbmRsZXIgdG8gW0FWQ2FwdHVyZURldmljZUNs YXNzIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGU6XSBtYXkgc29tZXRpbWVzIGJlIGNhbGxlZCBp biBhIGJhY2tncm91bmQgdGhyZWFkIG9uIGlPUy4KKyAgICAgICAgTWFrZSBzdXJlIHRvIGhvcCB0 byB0aGUgbWFpbiB0aHJlYWQgaWYgdGhhdCBpcyB0aGUgY2FzZS4KKyAgICAgICAgQWxzbyBtYWtl IHN1cmUgdG8gcmVmL3dlYWtyZWYgbGFtYmRhIGNhcHR1cmVkIHZhcmlhYmxlcy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0Nv Y29hL1VJRGVsZWdhdGUubW06CisgICAgICAgIChXZWJLaXQ6OnJlcXVlc3RBY2Nlc3NGb3JNZWRp YVR5cGUpOgorICAgICAgICAoV2ViS2l0OjpVSURlbGVnYXRlOjpVSUNsaWVudDo6ZGVjaWRlUG9s aWN5Rm9yVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3QpOgorCiAyMDIwLTA5LTI1ICBZb3Vlbm4g RmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgZGVmYXVsdCBi ZWhhdmlvciBmb3IgZ2V0VXNlck1lZGlhIHJlcXVlc3RzIGluIGNhc2Ugd2hlcmUgdGhlcmUgaXMg bm8gZGVsZWdhdGUgc2V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv YS9VSURlbGVnYXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRl LmgKaW5kZXggOTExYWI2YWVjMmZlZmQyM2ZkODliYWE0YjhmZWJmM2UwOWU0OGIyZC4uZGUyOTQ0 Yzg0ZmEzZDM3NzNjZDRlMGVjNzQ3MzU3MDdhYjVjOTQ3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL1VJRGVsZWdhdGUuaApAQCAtNzYsNyArNzYsNyBAQCBwcml2YXRlOgogICAg IH07CiAjZW5kaWYKIAotICAgIGNsYXNzIFVJQ2xpZW50IDogcHVibGljIEFQSTo6VUlDbGllbnQg eworICAgIGNsYXNzIFVJQ2xpZW50IDogcHVibGljIEFQSTo6VUlDbGllbnQsIHB1YmxpYyBDYW5N YWtlV2Vha1B0cjxVSUNsaWVudD4gewogICAgIHB1YmxpYzoKICAgICAgICAgZXhwbGljaXQgVUlD bGllbnQoVUlEZWxlZ2F0ZSYpOwogICAgICAgICB+VUlDbGllbnQoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0gYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCmluZGV4IGMwMmJmODkyZDhjMmI1ODkxOTAz YmU5NjYwOWRlYjdiZmQ3YmFkNDQuLjMwMWUyOGUyYjljYTczMDJlODMxOGEwNzg1Y2JiYWFiMGQ2 NWFkODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdh dGUubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQpA QCAtOTM5LDYgKzkzOSwyMCBAQCBzdGF0aWMgdm9pZCByZXF1ZXN0VXNlck1lZGlhQXV0aG9yaXph dGlvbkZvckZyYW1lKGNvbnN0IFdlYkZyYW1lUHJveHkmIGZyYW1lLCBBUAogCiAgICAgW2RlbGVn YXRlIF93ZWJWaWV3OiZ3ZWJWaWV3IHJlcXVlc3RVc2VyTWVkaWFBdXRob3JpemF0aW9uRm9yRGV2 aWNlczpkZXZpY2VzIHVybDpyZXF1ZXN0RnJhbWVVUkwgbWFpbkZyYW1lVVJMOm1haW5GcmFtZVVS TCBkZWNpc2lvbkhhbmRsZXI6ZGVjaXNpb25IYW5kbGVyLmdldCgpXTsKIH0KKworc3RhdGljIHZv aWQgcmVxdWVzdEFjY2Vzc0Zvck1lZGlhVHlwZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEJPT0wg YXV0aG9yaXplZCk+JiYgY29tcGxldGlvbkhhbmRsZXIsIEFWTWVkaWFUeXBlIHR5cGUpCit7Cisg ICAgYXV0byBkZWNpc2lvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoW2NvbXBsZXRpb25IYW5kbGVy ID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKEJPT0wgYXV0aG9yaXplZCkgbXV0YWJsZSB7 CisgICAgICAgIGlmICghaXNNYWluVGhyZWFkKCkpIHsKKyAgICAgICAgICAgIGNhbGxPbk1haW5U aHJlYWQoW2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIGF1 dGhvcml6ZWRdKCkgbXV0YWJsZSB7CisgICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo YXV0aG9yaXplZCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihhdXRob3JpemVkKTsKKyAgICB9KTsKKyAg ICBbUEFMOjpnZXRBVkNhcHR1cmVEZXZpY2VDbGFzcygpIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5 cGU6dHlwZSBjb21wbGV0aW9uSGFuZGxlcjpkZWNpc2lvbkhhbmRsZXIuZ2V0KCldOworfQogI2Vu ZGlmCiAKIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OmRlY2lkZVBvbGljeUZvclVzZXJNZWRp YVBlcm1pc3Npb25SZXF1ZXN0KFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViRnJhbWVQcm94eSYgZnJh bWUsIEFQSTo6U2VjdXJpdHlPcmlnaW4mIHVzZXJNZWRpYU9yaWdpbiwgQVBJOjpTZWN1cml0eU9y aWdpbiYgdG9wTGV2ZWxPcmlnaW4sIFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0UHJveHkmIHJl cXVlc3QpCkBAIC05NTksOCArOTczLDExIEBAIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OmRl Y2lkZVBvbGljeUZvclVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0KFdlYlBhZ2VQcm94CiAgICAg fQogCiAgICAgYm9vbCB1c2luZ01vY2tDYXB0dXJlRGV2aWNlcyA9IHBhZ2UucHJlZmVyZW5jZXMo KS5tb2NrQ2FwdHVyZURldmljZXNFbmFibGVkKCk7Ci0gICAgYXV0byByZXF1ZXN0Q2FtZXJhQXV0 aG9yaXphdGlvbiA9IG1ha2VCbG9ja1B0cihbdGhpcywgJmZyYW1lLCBwcm90ZWN0ZWRSZXF1ZXN0 ID0gbWFrZVJlZihyZXF1ZXN0KSwgd2ViVmlldyA9IFJldGFpblB0cjxXS1dlYlZpZXc+KG1fdWlE ZWxlZ2F0ZS5tX3dlYlZpZXcpLCB0b3BMZXZlbE9yaWdpbiA9IG1ha2VSZWYodG9wTGV2ZWxPcmln aW4pLCB1c2luZ01vY2tDYXB0dXJlRGV2aWNlc10oKSBtdXRhYmxlIHsKLQorICAgIGF1dG8gcmVx dWVzdENhbWVyYUF1dGhvcml6YXRpb24gPSBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cih0 aGlzKSwgZnJhbWUgPSBtYWtlUmVmKGZyYW1lKSwgcHJvdGVjdGVkUmVxdWVzdCA9IG1ha2VSZWYo cmVxdWVzdCksIHdlYlZpZXcgPSBSZXRhaW5QdHI8V0tXZWJWaWV3PihtX3VpRGVsZWdhdGUubV93 ZWJWaWV3KSwgdG9wTGV2ZWxPcmlnaW4gPSBtYWtlUmVmKHRvcExldmVsT3JpZ2luKSwgdXNpbmdN b2NrQ2FwdHVyZURldmljZXNdKCkgbXV0YWJsZSB7CisgICAgICAgIGlmICghd2Vha1RoaXMpIHsK KyAgICAgICAgICAgIHByb3RlY3RlZFJlcXVlc3QtPmRlbnkoVXNlck1lZGlhUGVybWlzc2lvblJl cXVlc3RQcm94eTo6VXNlck1lZGlhQWNjZXNzRGVuaWFsUmVhc29uOjpQZXJtaXNzaW9uRGVuaWVk KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogICAgICAgICBpZiAoIXByb3RlY3Rl ZFJlcXVlc3QtPnJlcXVpcmVzVmlkZW9DYXB0dXJlKCkpIHsKICAgICAgICAgICAgIHJlcXVlc3RV c2VyTWVkaWFBdXRob3JpemF0aW9uRm9yRnJhbWUoZnJhbWUsIHRvcExldmVsT3JpZ2luLCBwcm90 ZWN0ZWRSZXF1ZXN0LCAoaWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+KW1fdWlEZWxlZ2F0ZS5tX2Rl bGVnYXRlLmdldCgpLCAqd2ViVmlldy5nZXQoKSk7CiAgICAgICAgICAgICByZXR1cm47CkBAIC05 NzUsMTggKzk5MiwxNyBAQCB2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50OjpkZWNpZGVQb2xpY3lG b3JVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdChXZWJQYWdlUHJveAogICAgICAgICAgICAgcHJv dGVjdGVkUmVxdWVzdC0+ZGVueShVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdFByb3h5OjpVc2Vy TWVkaWFBY2Nlc3NEZW5pYWxSZWFzb246OlBlcm1pc3Npb25EZW5pZWQpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICBjYXNlIEFWQXV0aG9yaXphdGlvblN0YXR1c05vdERldGVybWluZWQ6 Ci0gICAgICAgICAgICBhdXRvIGRlY2lzaW9uSGFuZGxlciA9IG1ha2VCbG9ja1B0cihbdGhpcywg JmZyYW1lLCBwcm90ZWN0ZWRSZXF1ZXN0ID0gbWFrZVJlZihwcm90ZWN0ZWRSZXF1ZXN0LmdldCgp KSwgd2ViVmlldyA9IFJldGFpblB0cjxXS1dlYlZpZXc+KG1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcp LCB0b3BMZXZlbE9yaWdpbiA9IFdURk1vdmUodG9wTGV2ZWxPcmlnaW4pXShCT09MIGF1dGhvcml6 ZWQpIHsKLSAgICAgICAgICAgICAgICBpZiAoIWF1dGhvcml6ZWQpIHsKKyAgICAgICAgICAgIGF1 dG8gY29tcGxldGlvbkhhbmRsZXIgPSBbdGhpcywgd2Vha1RoaXMgPSBXVEZNb3ZlKHdlYWtUaGlz KSwgZnJhbWUgPSBXVEZNb3ZlKGZyYW1lKSwgcHJvdGVjdGVkUmVxdWVzdCA9IFdURk1vdmUocHJv dGVjdGVkUmVxdWVzdCksIHdlYlZpZXcgPSBXVEZNb3ZlKHdlYlZpZXcpLCB0b3BMZXZlbE9yaWdp biA9IFdURk1vdmUodG9wTGV2ZWxPcmlnaW4pXShCT09MIGF1dGhvcml6ZWQpIHsKKyAgICAgICAg ICAgICAgICBpZiAoIWF1dGhvcml6ZWQgfHwgIXdlYWtUaGlzKSB7CiAgICAgICAgICAgICAgICAg ICAgIHByb3RlY3RlZFJlcXVlc3QtPmRlbnkoVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RQcm94 eTo6VXNlck1lZGlhQWNjZXNzRGVuaWFsUmVhc29uOjpQZXJtaXNzaW9uRGVuaWVkKTsKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICByZXF1ZXN0VXNlck1lZGlhQXV0aG9yaXphdGlvbkZvckZyYW1lKGZyYW1lLCB0b3BMZXZlbE9y aWdpbiwgcHJvdGVjdGVkUmVxdWVzdCwgKGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPiltX3VpRGVs ZWdhdGUubV9kZWxlZ2F0ZS5nZXQoKSwgKndlYlZpZXcuZ2V0KCkpOwotICAgICAgICAgICAgfSk7 Ci0KLSAgICAgICAgICAgIFtQQUw6OmdldEFWQ2FwdHVyZURldmljZUNsYXNzKCkgcmVxdWVzdEFj Y2Vzc0Zvck1lZGlhVHlwZTpBVk1lZGlhVHlwZVZpZGVvIGNvbXBsZXRpb25IYW5kbGVyOmRlY2lz aW9uSGFuZGxlci5nZXQoKV07CisgICAgICAgICAgICB9OworICAgICAgICAgICAgcmVxdWVzdEFj Y2Vzc0Zvck1lZGlhVHlwZShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgQVZNZWRpYVR5cGVW aWRlbyk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQotICAgIH0pOworICAgIH07CiAK ICAgICBpZiAocmVxdWlyZXNBdWRpb0NhcHR1cmUpIHsKICAgICAgICAgQVZBdXRob3JpemF0aW9u U3RhdHVzIG1pY3JvcGhvbmVBdXRob3JpemF0aW9uU3RhdHVzID0gdXNpbmdNb2NrQ2FwdHVyZURl dmljZXMgPyBBVkF1dGhvcml6YXRpb25TdGF0dXNBdXRob3JpemVkIDogW1BBTDo6Z2V0QVZDYXB0 dXJlRGV2aWNlQ2xhc3MoKSBhdXRob3JpemF0aW9uU3RhdHVzRm9yTWVkaWFUeXBlOkFWTWVkaWFU eXBlQXVkaW9dOwpAQCAtOTk5LDE5ICsxMDE1LDE5IEBAIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGll bnQ6OmRlY2lkZVBvbGljeUZvclVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0KFdlYlBhZ2VQcm94 CiAgICAgICAgICAgICByZXF1ZXN0LmRlbnkoVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RQcm94 eTo6VXNlck1lZGlhQWNjZXNzRGVuaWFsUmVhc29uOjpQZXJtaXNzaW9uRGVuaWVkKTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgY2FzZSBBVkF1dGhvcml6YXRpb25TdGF0dXNOb3REZXRl cm1pbmVkOgotICAgICAgICAgICAgYXV0byBkZWNpc2lvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIo W3Byb3RlY3RlZFJlcXVlc3QgPSBtYWtlUmVmKHJlcXVlc3QpLCByZXF1ZXN0Q2FtZXJhQXV0aG9y aXphdGlvbl0oQk9PTCBhdXRob3JpemVkKSB7CisgICAgICAgICAgICBhdXRvIGNvbXBsZXRpb25I YW5kbGVyID0gW3Byb3RlY3RlZFJlcXVlc3QgPSBtYWtlUmVmKHJlcXVlc3QpLCByZXF1ZXN0Q2Ft ZXJhQXV0aG9yaXphdGlvbiA9IFdURk1vdmUocmVxdWVzdENhbWVyYUF1dGhvcml6YXRpb24pXShC T09MIGF1dGhvcml6ZWQpIG11dGFibGUgewogICAgICAgICAgICAgICAgIGlmICghYXV0aG9yaXpl ZCkgewogICAgICAgICAgICAgICAgICAgICBwcm90ZWN0ZWRSZXF1ZXN0LT5kZW55KFVzZXJNZWRp YVBlcm1pc3Npb25SZXF1ZXN0UHJveHk6OlVzZXJNZWRpYUFjY2Vzc0RlbmlhbFJlYXNvbjo6UGVy bWlzc2lvbkRlbmllZCk7CiAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgcmVxdWVzdENhbWVyYUF1dGhvcml6YXRpb24oKTsKLSAg ICAgICAgICAgIH0pOwotCi0gICAgICAgICAgICBbUEFMOjpnZXRBVkNhcHR1cmVEZXZpY2VDbGFz cygpIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGU6QVZNZWRpYVR5cGVBdWRpbyBjb21wbGV0aW9u SGFuZGxlcjpkZWNpc2lvbkhhbmRsZXIuZ2V0KCldOworICAgICAgICAgICAgfTsKKyAgICAgICAg ICAgIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGUoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciks IEFWTWVkaWFUeXBlVmlkZW8pOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICB9 IGVsc2UKLSAgICAgICAgcmVxdWVzdENhbWVyYUF1dGhvcml6YXRpb24oKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KKyAgICByZXF1ZXN0Q2FtZXJhQXV0aG9yaXphdGlvbigpOwogI2VuZGlmCiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2ogYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmlu ZGV4IGI4ZDI1NDkxY2FhZmI4MjQzZGYwMGNmMzY2NmRkZTZhNjUwOTQ1ZTMuLjJlZTE3YWQ4NThm OTQzMGIxNjNiNzg2MjJkN2NiMzRkMDVmNTE3YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv V2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYktpdC9XZWJL aXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtODkzLDYgKzg5Myw3IEBACiAJCTQxMTJF RERGMjBFNDA3QTUwMEJFQTkyQSAvKiBjb20uY21iY2hpbmEuQ01CU2VjdXJpdHkuc2IgaW4gQ29w eSBQbHVnLWluIFNhbmRib3ggUHJvZmlsZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gNDExMkVERDUyMEU0MDc3NDAwQkVBOTJBIC8qIGNvbS5jbWJjaGluYS5DTUJTZWN1cml0 eS5zYiAqLzsgfTsKIAkJNDExMkVERTAyMEU0MDdBNTAwQkVBOTJBIC8qIGNvbS5mdHNhZmUuTlBB UEktQ29yZS1TYWZlLVNvZnRLZXliYW9yZC5wbHVnaW4ucmZjMTAzNGlkZW50aWZpZXIuc2IgaW4g Q29weSBQbHVnLWluIFNhbmRib3ggUHJvZmlsZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gNDExMkVERDIyMEU0MDc3MzAwQkVBOTJBIC8qIGNvbS5mdHNhZmUuTlBBUEktQ29y ZS1TYWZlLVNvZnRLZXliYW9yZC5wbHVnaW4ucmZjMTAzNGlkZW50aWZpZXIuc2IgKi87IH07CiAJ CTQxMUE4RERCMjBEREQxQUMwMDYwRDM0RiAvKiBXS01vY2tNZWRpYURldmljZS5oIGluIEhlYWRl cnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDExQThERDkyMEREQjYwNTAw NjBEMzRGIC8qIFdLTW9ja01lZGlhRGV2aWNlLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMg PSAoUHJpdmF0ZSwgKTsgfTsgfTsKKwkJNDExQTlBQTUyNTFFMjZFOTAwODA3RDdFIC8qIE1lZGlh Q2FwdHVyZVN0YXR1c0Jhck1hbmFnZXIubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSA0MTFBOUFBMzI1MUUyNkUxMDA4MDdEN0UgLyogTWVkaWFDYXB0dXJl U3RhdHVzQmFyTWFuYWdlci5tbSAqLzsgfTsKIAkJNDExQjIyNjQxRTM3MUJBNjAwNEY3MzYzIC8q IExpYldlYlJUQ05ldHdvcmsuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDQxMUIyMjYyMUUzNzEyNDQwMDRGNzM2MyAvKiBMaWJXZWJSVENOZXR3b3JrLmgg Ki87IH07CiAJCTQxMjg3RDRFMjI1RDFFQ0IwMDlBM0UyNiAvKiBXZWJTb2NrZXRUYXNrQ29jb2Eu bW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MTI4N0Q0 QjIyNUMwNUM0MDA5QTNFMjYgLyogV2ViU29ja2V0VGFza0NvY29hLm1tICovOyB9OwogCQk0MTMw NzVBQzFERTg1RjM3MDAzOUVDNjkgLyogTmV0d29ya1JUQ01vbml0b3IuaCBpbiBIZWFkZXJzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQxMzA3NTlCMURFODRGQjAwMDM5RUM2 OSAvKiBOZXR3b3JrUlRDTW9uaXRvci5oICovOyB9OwpAQCAtMzM5MCw2ICszMzkxLDggQEAKIAkJ NDExQThERDkyMEREQjYwNTAwNjBEMzRGIC8qIFdLTW9ja01lZGlhRGV2aWNlLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdLTW9ja01lZGlhRGV2aWNlLmg7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTQxMUE4RERBMjBEREI2MDUwMDYwRDM0RiAvKiBXS01vY2tNZWRp YURldmljZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBXS01vY2tN ZWRpYURldmljZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQxMUE5QTlBMjUx REU5M0UwMDgwN0Q3RSAvKiBVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdFByb3h5Lm1tICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAub2JqY3BwOyBwYXRoID0gVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RQcm94eS5tbTsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNDExQTlBQTIyNTFFMjZFMDAwODA3RDdFIC8qIE1l ZGlhQ2FwdHVyZVN0YXR1c0Jhck1hbmFnZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gTWVkaWFDYXB0dXJl U3RhdHVzQmFyTWFuYWdlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk0MTFBOUFB MzI1MUUyNkUxMDA4MDdEN0UgLyogTWVkaWFDYXB0dXJlU3RhdHVzQmFyTWFuYWdlci5tbSAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLm9iamNwcDsgcGF0aCA9IE1lZGlhQ2FwdHVyZVN0YXR1c0Jhck1hbmFnZXIubW07IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQxMUIyMjYyMUUzNzEyNDQwMDRGNzM2MyAvKiBMaWJX ZWJSVENOZXR3b3JrLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgbmFtZSA9IExpYldlYlJU Q05ldHdvcmsuaDsgcGF0aCA9IE5ldHdvcmsvd2VicnRjL0xpYldlYlJUQ05ldHdvcmsuaDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDEyODdENEIyMjVDMDVDNDAwOUEzRTI2IC8qIFdl YlNvY2tldFRhc2tDb2NvYS5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0 aCA9IFdlYlNvY2tldFRhc2tDb2NvYS5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ NDEyODdENEMyMjVDMDVDNTAwOUEzRTI2IC8qIFdlYlNvY2tldFRhc2tDb2NvYS5oICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJTb2NrZXRUYXNrQ29jb2EuaDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTYzMzYsNiArNjMzOSw4IEBACiAJCQkJNTFDMEM5NzMxRERE NzRGMDAwMzJDQUQzIC8qIEljb25Mb2FkaW5nRGVsZWdhdGUubW0gKi8sCiAJCQkJN0E4MjFGNEIx RTJGNjY0ODAwNjA0NTc3IC8qIExlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlckNsaWVudC5oICov LAogCQkJCTdBODIxRjREMUUyRjY3OUUwMDYwNDU3NyAvKiBMZWdhY3lDdXN0b21Qcm90b2NvbE1h bmFnZXJDbGllbnQubW0gKi8sCisJCQkJNDExQTlBQTIyNTFFMjZFMDAwODA3RDdFIC8qIE1lZGlh Q2FwdHVyZVN0YXR1c0Jhck1hbmFnZXIuaCAqLywKKwkJCQk0MTFBOUFBMzI1MUUyNkUxMDA4MDdE N0UgLyogTWVkaWFDYXB0dXJlU3RhdHVzQmFyTWFuYWdlci5tbSAqLywKIAkJCQk0MTEyODZFRjIx QzhBOTBDMDAzQTg1NTAgLyogTWVkaWFVdGlsaXRpZXMuaCAqLywKIAkJCQk0MTEyODZGMDIxQzhB OTBEMDAzQTg1NTAgLyogTWVkaWFVdGlsaXRpZXMubW0gKi8sCiAJCQkJMUFCQzNERjQxODk5RTQz NzAwNEYwNjI2IC8qIE5hdmlnYXRpb25TdGF0ZS5oICovLApAQCAtMTMxMjQsNiArMTMxMjksNyBA QAogCQkJCURGODRDRUU0MjQ5QUEyNEQwMDkwOTZGNiAvKiBXS1BERkhVRFZpZXcubW0gaW4gU291 cmNlcyAqLywKIAkJCQk1Q0EyNkQ4MzIxN0FEMUI4MDBGOTdBMzUgLyogV0tTYWZlQnJvd3NpbmdX YXJuaW5nLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMURCMDE5NDQyMTFDRjAwNTAwOUZCM0U4IC8q IFdLU2hhcmVTaGVldC5tbSBpbiBTb3VyY2VzICovLAorCQkJCTQxMUE5QUE1MjUxRTI2RTkwMDgw N0Q3RSAvKiBNZWRpYUNhcHR1cmVTdGF0dXNCYXJNYW5hZ2VyLm1tIGluIFNvdXJjZXMgKi8sCiAJ CQkJN0E3OEZGMzMyMjQxOTE5QjAwOTY0ODNFIC8qIFdLU3RvcmFnZUFjY2Vzc0FsZXJ0Lm1tIGlu IFNvdXJjZXMgKi8sCiAJCQkJQ0UyMTIxNjAyNDBFRTU3MTAwNkVENDQzIC8qIFdLVGV4dFBsYWNl aG9sZGVyLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQzE0RDMwNjkyNEI3OUJFMDAwNDgwMzg3IC8q IFhQQ0VuZHBvaW50Lm1tIGluIFNvdXJjZXMgKi8sCg== 409694 2020-09-25 08:03:58 -0700 2020-09-28 02:28:25 -0700 Patch bug-216974-20200925170356.patch text/plain 7242 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdiZGFjZTk0NmUyZTVjNjhl YWYxNGQ5NjYxMjQyODIxM2NiNGVjZDIuLjc2YzM4ZDBkOTBlNTQ0NjQ2YzhkYWZmZWEwMjRmOGI3 MjM4YWEwZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMDktMjUgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSBvdXIgY2FsbHMg dG8gQVZDYXB0dXJlRGV2aWNlIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGUgZG8gcHJvY2Vzc2lu ZyBvbiB0aGUgbWFpbiB0aHJlYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNjk3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBjb21wbGV0aW9uIGhhbmRsZXIgdG8gW0FWQ2FwdHVyZURldmljZUNs YXNzIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGU6XSBtYXkgc29tZXRpbWVzIGJlIGNhbGxlZCBp biBhIGJhY2tncm91bmQgdGhyZWFkIG9uIGlPUy4KKyAgICAgICAgTWFrZSBzdXJlIHRvIGhvcCB0 byB0aGUgbWFpbiB0aHJlYWQgaWYgdGhhdCBpcyB0aGUgY2FzZS4KKyAgICAgICAgQWxzbyBtYWtl IHN1cmUgdG8gcmVmL3dlYWtyZWYgbGFtYmRhIGNhcHR1cmVkIHZhcmlhYmxlcy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0Nv Y29hL1VJRGVsZWdhdGUubW06CisgICAgICAgIChXZWJLaXQ6OnJlcXVlc3RBY2Nlc3NGb3JNZWRp YVR5cGUpOgorICAgICAgICAoV2ViS2l0OjpVSURlbGVnYXRlOjpVSUNsaWVudDo6ZGVjaWRlUG9s aWN5Rm9yVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3QpOgorCiAyMDIwLTA5LTI1ICBZb3Vlbm4g RmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgZGVmYXVsdCBi ZWhhdmlvciBmb3IgZ2V0VXNlck1lZGlhIHJlcXVlc3RzIGluIGNhc2Ugd2hlcmUgdGhlcmUgaXMg bm8gZGVsZWdhdGUgc2V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2Nv YS9VSURlbGVnYXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRl LmgKaW5kZXggOTExYWI2YWVjMmZlZmQyM2ZkODliYWE0YjhmZWJmM2UwOWU0OGIyZC4uZGUyOTQ0 Yzg0ZmEzZDM3NzNjZDRlMGVjNzQ3MzU3MDdhYjVjOTQ3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL1VJRGVsZWdhdGUuaApAQCAtNzYsNyArNzYsNyBAQCBwcml2YXRlOgogICAg IH07CiAjZW5kaWYKIAotICAgIGNsYXNzIFVJQ2xpZW50IDogcHVibGljIEFQSTo6VUlDbGllbnQg eworICAgIGNsYXNzIFVJQ2xpZW50IDogcHVibGljIEFQSTo6VUlDbGllbnQsIHB1YmxpYyBDYW5N YWtlV2Vha1B0cjxVSUNsaWVudD4gewogICAgIHB1YmxpYzoKICAgICAgICAgZXhwbGljaXQgVUlD bGllbnQoVUlEZWxlZ2F0ZSYpOwogICAgICAgICB+VUlDbGllbnQoKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0gYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCmluZGV4IGMwMmJmODkyZDhjMmI1ODkxOTAz YmU5NjYwOWRlYjdiZmQ3YmFkNDQuLjMwMWUyOGUyYjljYTczMDJlODMxOGEwNzg1Y2JiYWFiMGQ2 NWFkODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdh dGUubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQpA QCAtOTM5LDYgKzkzOSwyMCBAQCBzdGF0aWMgdm9pZCByZXF1ZXN0VXNlck1lZGlhQXV0aG9yaXph dGlvbkZvckZyYW1lKGNvbnN0IFdlYkZyYW1lUHJveHkmIGZyYW1lLCBBUAogCiAgICAgW2RlbGVn YXRlIF93ZWJWaWV3OiZ3ZWJWaWV3IHJlcXVlc3RVc2VyTWVkaWFBdXRob3JpemF0aW9uRm9yRGV2 aWNlczpkZXZpY2VzIHVybDpyZXF1ZXN0RnJhbWVVUkwgbWFpbkZyYW1lVVJMOm1haW5GcmFtZVVS TCBkZWNpc2lvbkhhbmRsZXI6ZGVjaXNpb25IYW5kbGVyLmdldCgpXTsKIH0KKworc3RhdGljIHZv aWQgcmVxdWVzdEFjY2Vzc0Zvck1lZGlhVHlwZShDb21wbGV0aW9uSGFuZGxlcjx2b2lkKEJPT0wg YXV0aG9yaXplZCk+JiYgY29tcGxldGlvbkhhbmRsZXIsIEFWTWVkaWFUeXBlIHR5cGUpCit7Cisg ICAgYXV0byBkZWNpc2lvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoW2NvbXBsZXRpb25IYW5kbGVy ID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildKEJPT0wgYXV0aG9yaXplZCkgbXV0YWJsZSB7 CisgICAgICAgIGlmICghaXNNYWluVGhyZWFkKCkpIHsKKyAgICAgICAgICAgIGNhbGxPbk1haW5U aHJlYWQoW2NvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciksIGF1 dGhvcml6ZWRdKCkgbXV0YWJsZSB7CisgICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIo YXV0aG9yaXplZCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihhdXRob3JpemVkKTsKKyAgICB9KTsKKyAg ICBbUEFMOjpnZXRBVkNhcHR1cmVEZXZpY2VDbGFzcygpIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5 cGU6dHlwZSBjb21wbGV0aW9uSGFuZGxlcjpkZWNpc2lvbkhhbmRsZXIuZ2V0KCldOworfQogI2Vu ZGlmCiAKIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OmRlY2lkZVBvbGljeUZvclVzZXJNZWRp YVBlcm1pc3Npb25SZXF1ZXN0KFdlYlBhZ2VQcm94eSYgcGFnZSwgV2ViRnJhbWVQcm94eSYgZnJh bWUsIEFQSTo6U2VjdXJpdHlPcmlnaW4mIHVzZXJNZWRpYU9yaWdpbiwgQVBJOjpTZWN1cml0eU9y aWdpbiYgdG9wTGV2ZWxPcmlnaW4sIFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0UHJveHkmIHJl cXVlc3QpCkBAIC05NTksOCArOTczLDExIEBAIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6OmRl Y2lkZVBvbGljeUZvclVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0KFdlYlBhZ2VQcm94CiAgICAg fQogCiAgICAgYm9vbCB1c2luZ01vY2tDYXB0dXJlRGV2aWNlcyA9IHBhZ2UucHJlZmVyZW5jZXMo KS5tb2NrQ2FwdHVyZURldmljZXNFbmFibGVkKCk7Ci0gICAgYXV0byByZXF1ZXN0Q2FtZXJhQXV0 aG9yaXphdGlvbiA9IG1ha2VCbG9ja1B0cihbdGhpcywgJmZyYW1lLCBwcm90ZWN0ZWRSZXF1ZXN0 ID0gbWFrZVJlZihyZXF1ZXN0KSwgd2ViVmlldyA9IFJldGFpblB0cjxXS1dlYlZpZXc+KG1fdWlE ZWxlZ2F0ZS5tX3dlYlZpZXcpLCB0b3BMZXZlbE9yaWdpbiA9IG1ha2VSZWYodG9wTGV2ZWxPcmln aW4pLCB1c2luZ01vY2tDYXB0dXJlRGV2aWNlc10oKSBtdXRhYmxlIHsKLQorICAgIGF1dG8gcmVx dWVzdENhbWVyYUF1dGhvcml6YXRpb24gPSBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cih0 aGlzKSwgZnJhbWUgPSBtYWtlUmVmKGZyYW1lKSwgcHJvdGVjdGVkUmVxdWVzdCA9IG1ha2VSZWYo cmVxdWVzdCksIHdlYlZpZXcgPSBSZXRhaW5QdHI8V0tXZWJWaWV3PihtX3VpRGVsZWdhdGUubV93 ZWJWaWV3KSwgdG9wTGV2ZWxPcmlnaW4gPSBtYWtlUmVmKHRvcExldmVsT3JpZ2luKSwgdXNpbmdN b2NrQ2FwdHVyZURldmljZXNdKCkgbXV0YWJsZSB7CisgICAgICAgIGlmICghd2Vha1RoaXMpIHsK KyAgICAgICAgICAgIHByb3RlY3RlZFJlcXVlc3QtPmRlbnkoVXNlck1lZGlhUGVybWlzc2lvblJl cXVlc3RQcm94eTo6VXNlck1lZGlhQWNjZXNzRGVuaWFsUmVhc29uOjpQZXJtaXNzaW9uRGVuaWVk KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogICAgICAgICBpZiAoIXByb3RlY3Rl ZFJlcXVlc3QtPnJlcXVpcmVzVmlkZW9DYXB0dXJlKCkpIHsKICAgICAgICAgICAgIHJlcXVlc3RV c2VyTWVkaWFBdXRob3JpemF0aW9uRm9yRnJhbWUoZnJhbWUsIHRvcExldmVsT3JpZ2luLCBwcm90 ZWN0ZWRSZXF1ZXN0LCAoaWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+KW1fdWlEZWxlZ2F0ZS5tX2Rl bGVnYXRlLmdldCgpLCAqd2ViVmlldy5nZXQoKSk7CiAgICAgICAgICAgICByZXR1cm47CkBAIC05 NzUsMTggKzk5MiwxNyBAQCB2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50OjpkZWNpZGVQb2xpY3lG b3JVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdChXZWJQYWdlUHJveAogICAgICAgICAgICAgcHJv dGVjdGVkUmVxdWVzdC0+ZGVueShVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdFByb3h5OjpVc2Vy TWVkaWFBY2Nlc3NEZW5pYWxSZWFzb246OlBlcm1pc3Npb25EZW5pZWQpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICBjYXNlIEFWQXV0aG9yaXphdGlvblN0YXR1c05vdERldGVybWluZWQ6 Ci0gICAgICAgICAgICBhdXRvIGRlY2lzaW9uSGFuZGxlciA9IG1ha2VCbG9ja1B0cihbdGhpcywg JmZyYW1lLCBwcm90ZWN0ZWRSZXF1ZXN0ID0gbWFrZVJlZihwcm90ZWN0ZWRSZXF1ZXN0LmdldCgp KSwgd2ViVmlldyA9IFJldGFpblB0cjxXS1dlYlZpZXc+KG1fdWlEZWxlZ2F0ZS5tX3dlYlZpZXcp LCB0b3BMZXZlbE9yaWdpbiA9IFdURk1vdmUodG9wTGV2ZWxPcmlnaW4pXShCT09MIGF1dGhvcml6 ZWQpIHsKLSAgICAgICAgICAgICAgICBpZiAoIWF1dGhvcml6ZWQpIHsKKyAgICAgICAgICAgIGF1 dG8gY29tcGxldGlvbkhhbmRsZXIgPSBbdGhpcywgd2Vha1RoaXMgPSBXVEZNb3ZlKHdlYWtUaGlz KSwgZnJhbWUgPSBXVEZNb3ZlKGZyYW1lKSwgcHJvdGVjdGVkUmVxdWVzdCA9IFdURk1vdmUocHJv dGVjdGVkUmVxdWVzdCksIHdlYlZpZXcgPSBXVEZNb3ZlKHdlYlZpZXcpLCB0b3BMZXZlbE9yaWdp biA9IFdURk1vdmUodG9wTGV2ZWxPcmlnaW4pXShCT09MIGF1dGhvcml6ZWQpIHsKKyAgICAgICAg ICAgICAgICBpZiAoIWF1dGhvcml6ZWQgfHwgIXdlYWtUaGlzKSB7CiAgICAgICAgICAgICAgICAg ICAgIHByb3RlY3RlZFJlcXVlc3QtPmRlbnkoVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RQcm94 eTo6VXNlck1lZGlhQWNjZXNzRGVuaWFsUmVhc29uOjpQZXJtaXNzaW9uRGVuaWVkKTsKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICByZXF1ZXN0VXNlck1lZGlhQXV0aG9yaXphdGlvbkZvckZyYW1lKGZyYW1lLCB0b3BMZXZlbE9y aWdpbiwgcHJvdGVjdGVkUmVxdWVzdCwgKGlkIDxXS1VJRGVsZWdhdGVQcml2YXRlPiltX3VpRGVs ZWdhdGUubV9kZWxlZ2F0ZS5nZXQoKSwgKndlYlZpZXcuZ2V0KCkpOwotICAgICAgICAgICAgfSk7 Ci0KLSAgICAgICAgICAgIFtQQUw6OmdldEFWQ2FwdHVyZURldmljZUNsYXNzKCkgcmVxdWVzdEFj Y2Vzc0Zvck1lZGlhVHlwZTpBVk1lZGlhVHlwZVZpZGVvIGNvbXBsZXRpb25IYW5kbGVyOmRlY2lz aW9uSGFuZGxlci5nZXQoKV07CisgICAgICAgICAgICB9OworICAgICAgICAgICAgcmVxdWVzdEFj Y2Vzc0Zvck1lZGlhVHlwZShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgQVZNZWRpYVR5cGVW aWRlbyk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQotICAgIH0pOworICAgIH07CiAK ICAgICBpZiAocmVxdWlyZXNBdWRpb0NhcHR1cmUpIHsKICAgICAgICAgQVZBdXRob3JpemF0aW9u U3RhdHVzIG1pY3JvcGhvbmVBdXRob3JpemF0aW9uU3RhdHVzID0gdXNpbmdNb2NrQ2FwdHVyZURl dmljZXMgPyBBVkF1dGhvcml6YXRpb25TdGF0dXNBdXRob3JpemVkIDogW1BBTDo6Z2V0QVZDYXB0 dXJlRGV2aWNlQ2xhc3MoKSBhdXRob3JpemF0aW9uU3RhdHVzRm9yTWVkaWFUeXBlOkFWTWVkaWFU eXBlQXVkaW9dOwpAQCAtOTk5LDE5ICsxMDE1LDE5IEBAIHZvaWQgVUlEZWxlZ2F0ZTo6VUlDbGll bnQ6OmRlY2lkZVBvbGljeUZvclVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0KFdlYlBhZ2VQcm94 CiAgICAgICAgICAgICByZXF1ZXN0LmRlbnkoVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RQcm94 eTo6VXNlck1lZGlhQWNjZXNzRGVuaWFsUmVhc29uOjpQZXJtaXNzaW9uRGVuaWVkKTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgY2FzZSBBVkF1dGhvcml6YXRpb25TdGF0dXNOb3REZXRl cm1pbmVkOgotICAgICAgICAgICAgYXV0byBkZWNpc2lvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIo W3Byb3RlY3RlZFJlcXVlc3QgPSBtYWtlUmVmKHJlcXVlc3QpLCByZXF1ZXN0Q2FtZXJhQXV0aG9y aXphdGlvbl0oQk9PTCBhdXRob3JpemVkKSB7CisgICAgICAgICAgICBhdXRvIGNvbXBsZXRpb25I YW5kbGVyID0gW3Byb3RlY3RlZFJlcXVlc3QgPSBtYWtlUmVmKHJlcXVlc3QpLCByZXF1ZXN0Q2Ft ZXJhQXV0aG9yaXphdGlvbiA9IFdURk1vdmUocmVxdWVzdENhbWVyYUF1dGhvcml6YXRpb24pXShC T09MIGF1dGhvcml6ZWQpIG11dGFibGUgewogICAgICAgICAgICAgICAgIGlmICghYXV0aG9yaXpl ZCkgewogICAgICAgICAgICAgICAgICAgICBwcm90ZWN0ZWRSZXF1ZXN0LT5kZW55KFVzZXJNZWRp YVBlcm1pc3Npb25SZXF1ZXN0UHJveHk6OlVzZXJNZWRpYUFjY2Vzc0RlbmlhbFJlYXNvbjo6UGVy bWlzc2lvbkRlbmllZCk7CiAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgcmVxdWVzdENhbWVyYUF1dGhvcml6YXRpb24oKTsKLSAg ICAgICAgICAgIH0pOwotCi0gICAgICAgICAgICBbUEFMOjpnZXRBVkNhcHR1cmVEZXZpY2VDbGFz cygpIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGU6QVZNZWRpYVR5cGVBdWRpbyBjb21wbGV0aW9u SGFuZGxlcjpkZWNpc2lvbkhhbmRsZXIuZ2V0KCldOworICAgICAgICAgICAgfTsKKyAgICAgICAg ICAgIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGUoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlciks IEFWTWVkaWFUeXBlVmlkZW8pOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KLSAgICB9 IGVsc2UKLSAgICAgICAgcmVxdWVzdENhbWVyYUF1dGhvcml6YXRpb24oKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KKyAgICByZXF1ZXN0Q2FtZXJhQXV0aG9yaXphdGlvbigpOwogI2VuZGlmCiB9 CiAK 409875 2020-09-28 02:28:30 -0700 2020-09-28 07:34:51 -0700 Patch for landing bug-216974-20200928112828.patch text/plain 8198 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY3MGQ0MDgzM2UyMzBjZGQ2 N2EwZWFiMjEyOGI5N2UyYWU5MjQ2NTkuLjg3ZWFhMTM2YmVkMTczYjM5NzkwNmRjYjIxNjY3MGRl ZTEzZjA1YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMDktMjggIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSBvdXIgY2FsbHMg dG8gQVZDYXB0dXJlRGV2aWNlIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGUgZG8gcHJvY2Vzc2lu ZyBvbiB0aGUgbWFpbiB0aHJlYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNjk3NAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgor CisgICAgICAgIFRoZSBjb21wbGV0aW9uIGhhbmRsZXIgdG8gW0FWQ2FwdHVyZURldmljZUNsYXNz IHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGU6XSBtYXkgc29tZXRpbWVzIGJlIGNhbGxlZCBpbiBh IGJhY2tncm91bmQgdGhyZWFkIG9uIGlPUy4KKyAgICAgICAgTWFrZSBzdXJlIHRvIGhvcCB0byB0 aGUgbWFpbiB0aHJlYWQgaWYgdGhhdCBpcyB0aGUgY2FzZS4KKyAgICAgICAgQWxzbyBtYWtlIHN1 cmUgdG8gcmVmL3dlYWtyZWYgbGFtYmRhIGNhcHR1cmVkIHZhcmlhYmxlcy4KKworICAgICAgICAq IFVJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29h L1VJRGVsZWdhdGUubW06CisgICAgICAgIChXZWJLaXQ6OnJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5 cGUpOgorICAgICAgICAoV2ViS2l0OjpVSURlbGVnYXRlOjpVSUNsaWVudDo6ZGVjaWRlUG9saWN5 Rm9yVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3QpOgorCiAyMDIwLTA5LTI3ICBMYXVybyBNb3Vy YSAgPGxtb3VyYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI2NzY4OCkgW0dU S10gTWFueSBjb21wb3NpdGluZyB0aW1lb3V0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29j b2EvVUlEZWxlZ2F0ZS5oCmluZGV4IDkxMWFiNmFlYzJmZWZkMjNmZDg5YmFhNGI4ZmViZjNlMDll NDhiMmQuLmRlMjk0NGM4NGZhM2QzNzczY2Q0ZTBlYzc0NzM1NzA3YWI1Yzk0NzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmgKQEAgLTc2LDcgKzc2LDcgQEAg cHJpdmF0ZToKICAgICB9OwogI2VuZGlmCiAKLSAgICBjbGFzcyBVSUNsaWVudCA6IHB1YmxpYyBB UEk6OlVJQ2xpZW50IHsKKyAgICBjbGFzcyBVSUNsaWVudCA6IHB1YmxpYyBBUEk6OlVJQ2xpZW50 LCBwdWJsaWMgQ2FuTWFrZVdlYWtQdHI8VUlDbGllbnQ+IHsKICAgICBwdWJsaWM6CiAgICAgICAg IGV4cGxpY2l0IFVJQ2xpZW50KFVJRGVsZWdhdGUmKTsKICAgICAgICAgflVJQ2xpZW50KCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5tbQppbmRleCBjMDJiZjg5 MmQ4YzJiNTg5MTkwM2JlOTY2MDlkZWI3YmZkN2JhZDQ0Li4zYzg4YWQ2NWNiZWVlYmRkYWI0YTA0 NGZkZDVlZDUxNWRlZGEwMWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9D b2NvYS9VSURlbGVnYXRlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1VJ RGVsZWdhdGUubW0KQEAgLTkzOSw2ICs5MzksMjAgQEAgc3RhdGljIHZvaWQgcmVxdWVzdFVzZXJN ZWRpYUF1dGhvcml6YXRpb25Gb3JGcmFtZShjb25zdCBXZWJGcmFtZVByb3h5JiBmcmFtZSwgQVAK IAogICAgIFtkZWxlZ2F0ZSBfd2ViVmlldzomd2ViVmlldyByZXF1ZXN0VXNlck1lZGlhQXV0aG9y aXphdGlvbkZvckRldmljZXM6ZGV2aWNlcyB1cmw6cmVxdWVzdEZyYW1lVVJMIG1haW5GcmFtZVVS TDptYWluRnJhbWVVUkwgZGVjaXNpb25IYW5kbGVyOmRlY2lzaW9uSGFuZGxlci5nZXQoKV07CiB9 CisKK3N0YXRpYyB2b2lkIHJlcXVlc3RBY2Nlc3NGb3JNZWRpYVR5cGUoQ29tcGxldGlvbkhhbmRs ZXI8dm9pZChCT09MIGF1dGhvcml6ZWQpPiYmIGNvbXBsZXRpb25IYW5kbGVyLCBBVk1lZGlhVHlw ZSB0eXBlKQoreworICAgIGF1dG8gZGVjaXNpb25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKFtjb21w bGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXShCT09MIGF1dGhvcml6 ZWQpIG11dGFibGUgeworICAgICAgICBpZiAoIWlzTWFpblRocmVhZCgpKSB7CisgICAgICAgICAg ICBjYWxsT25NYWluVGhyZWFkKFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlv bkhhbmRsZXIpLCBhdXRob3JpemVkXSgpIG11dGFibGUgeworICAgICAgICAgICAgICAgIGNvbXBs ZXRpb25IYW5kbGVyKGF1dGhvcml6ZWQpOworICAgICAgICAgICAgfSk7CisgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoYXV0aG9yaXplZCk7 CisgICAgfSk7CisgICAgW1BBTDo6Z2V0QVZDYXB0dXJlRGV2aWNlQ2xhc3MoKSByZXF1ZXN0QWNj ZXNzRm9yTWVkaWFUeXBlOnR5cGUgY29tcGxldGlvbkhhbmRsZXI6ZGVjaXNpb25IYW5kbGVyLmdl dCgpXTsKK30KICNlbmRpZgogCiB2b2lkIFVJRGVsZWdhdGU6OlVJQ2xpZW50OjpkZWNpZGVQb2xp Y3lGb3JVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdChXZWJQYWdlUHJveHkmIHBhZ2UsIFdlYkZy YW1lUHJveHkmIGZyYW1lLCBBUEk6OlNlY3VyaXR5T3JpZ2luJiB1c2VyTWVkaWFPcmlnaW4sIEFQ STo6U2VjdXJpdHlPcmlnaW4mIHRvcExldmVsT3JpZ2luLCBVc2VyTWVkaWFQZXJtaXNzaW9uUmVx dWVzdFByb3h5JiByZXF1ZXN0KQpAQCAtOTU5LDM0ICs5NzMsMzYgQEAgdm9pZCBVSURlbGVnYXRl OjpVSUNsaWVudDo6ZGVjaWRlUG9saWN5Rm9yVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3QoV2Vi UGFnZVByb3gKICAgICB9CiAKICAgICBib29sIHVzaW5nTW9ja0NhcHR1cmVEZXZpY2VzID0gcGFn ZS5wcmVmZXJlbmNlcygpLm1vY2tDYXB0dXJlRGV2aWNlc0VuYWJsZWQoKTsKLSAgICBhdXRvIHJl cXVlc3RDYW1lcmFBdXRob3JpemF0aW9uID0gbWFrZUJsb2NrUHRyKFt0aGlzLCAmZnJhbWUsIHBy b3RlY3RlZFJlcXVlc3QgPSBtYWtlUmVmKHJlcXVlc3QpLCB3ZWJWaWV3ID0gUmV0YWluUHRyPFdL V2ViVmlldz4obV91aURlbGVnYXRlLm1fd2ViVmlldyksIHRvcExldmVsT3JpZ2luID0gbWFrZVJl Zih0b3BMZXZlbE9yaWdpbiksIHVzaW5nTW9ja0NhcHR1cmVEZXZpY2VzXSgpIG11dGFibGUgewot CisgICAgYXV0byByZXF1ZXN0Q2FtZXJhQXV0aG9yaXphdGlvbiA9IFt3ZWFrVGhpcyA9IG1ha2VX ZWFrUHRyKHRoaXMpLCBmcmFtZSA9IG1ha2VSZWYoZnJhbWUpLCBwcm90ZWN0ZWRSZXF1ZXN0ID0g bWFrZVJlZihyZXF1ZXN0KSwgd2ViVmlldyA9IFJldGFpblB0cjxXS1dlYlZpZXc+KG1fdWlEZWxl Z2F0ZS5tX3dlYlZpZXcpLCB0b3BMZXZlbE9yaWdpbiA9IG1ha2VSZWYodG9wTGV2ZWxPcmlnaW4p LCB1c2luZ01vY2tDYXB0dXJlRGV2aWNlc10oKSBtdXRhYmxlIHsKKyAgICAgICAgaWYgKCF3ZWFr VGhpcykgeworICAgICAgICAgICAgcHJvdGVjdGVkUmVxdWVzdC0+ZGVueShVc2VyTWVkaWFQZXJt aXNzaW9uUmVxdWVzdFByb3h5OjpVc2VyTWVkaWFBY2Nlc3NEZW5pYWxSZWFzb246OlBlcm1pc3Np b25EZW5pZWQpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAgICAgICAgIGlmICgh cHJvdGVjdGVkUmVxdWVzdC0+cmVxdWlyZXNWaWRlb0NhcHR1cmUoKSkgewotICAgICAgICAgICAg cmVxdWVzdFVzZXJNZWRpYUF1dGhvcml6YXRpb25Gb3JGcmFtZShmcmFtZSwgdG9wTGV2ZWxPcmln aW4sIHByb3RlY3RlZFJlcXVlc3QsIChpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4pbV91aURlbGVn YXRlLm1fZGVsZWdhdGUuZ2V0KCksICp3ZWJWaWV3LmdldCgpKTsKKyAgICAgICAgICAgIHJlcXVl c3RVc2VyTWVkaWFBdXRob3JpemF0aW9uRm9yRnJhbWUoZnJhbWUsIHRvcExldmVsT3JpZ2luLCBw cm90ZWN0ZWRSZXF1ZXN0LCAoaWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+KXdlYWtUaGlzLT5tX3Vp RGVsZWdhdGUubV9kZWxlZ2F0ZS5nZXQoKSwgKndlYlZpZXcuZ2V0KCkpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIEFWQXV0aG9yaXphdGlvblN0YXR1cyBjYW1lcmFB dXRob3JpemF0aW9uU3RhdHVzID0gdXNpbmdNb2NrQ2FwdHVyZURldmljZXMgPyBBVkF1dGhvcml6 YXRpb25TdGF0dXNBdXRob3JpemVkIDogW1BBTDo6Z2V0QVZDYXB0dXJlRGV2aWNlQ2xhc3MoKSBh dXRob3JpemF0aW9uU3RhdHVzRm9yTWVkaWFUeXBlOkFWTWVkaWFUeXBlVmlkZW9dOwogICAgICAg ICBzd2l0Y2ggKGNhbWVyYUF1dGhvcml6YXRpb25TdGF0dXMpIHsKICAgICAgICAgY2FzZSBBVkF1 dGhvcml6YXRpb25TdGF0dXNBdXRob3JpemVkOgotICAgICAgICAgICAgcmVxdWVzdFVzZXJNZWRp YUF1dGhvcml6YXRpb25Gb3JGcmFtZShmcmFtZSwgdG9wTGV2ZWxPcmlnaW4sIHByb3RlY3RlZFJl cXVlc3QsIChpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4pbV91aURlbGVnYXRlLm1fZGVsZWdhdGUu Z2V0KCksICp3ZWJWaWV3LmdldCgpKTsKKyAgICAgICAgICAgIHJlcXVlc3RVc2VyTWVkaWFBdXRo b3JpemF0aW9uRm9yRnJhbWUoZnJhbWUsIHRvcExldmVsT3JpZ2luLCBwcm90ZWN0ZWRSZXF1ZXN0 LCAoaWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+KXdlYWtUaGlzLT5tX3VpRGVsZWdhdGUubV9kZWxl Z2F0ZS5nZXQoKSwgKndlYlZpZXcuZ2V0KCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IGNhc2UgQVZBdXRob3JpemF0aW9uU3RhdHVzRGVuaWVkOgogICAgICAgICBjYXNlIEFWQXV0aG9y aXphdGlvblN0YXR1c1Jlc3RyaWN0ZWQ6CiAgICAgICAgICAgICBwcm90ZWN0ZWRSZXF1ZXN0LT5k ZW55KFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0UHJveHk6OlVzZXJNZWRpYUFjY2Vzc0Rlbmlh bFJlYXNvbjo6UGVybWlzc2lvbkRlbmllZCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IGNhc2UgQVZBdXRob3JpemF0aW9uU3RhdHVzTm90RGV0ZXJtaW5lZDoKLSAgICAgICAgICAgIGF1 dG8gZGVjaXNpb25IYW5kbGVyID0gbWFrZUJsb2NrUHRyKFt0aGlzLCAmZnJhbWUsIHByb3RlY3Rl ZFJlcXVlc3QgPSBtYWtlUmVmKHByb3RlY3RlZFJlcXVlc3QuZ2V0KCkpLCB3ZWJWaWV3ID0gUmV0 YWluUHRyPFdLV2ViVmlldz4obV91aURlbGVnYXRlLm1fd2ViVmlldyksIHRvcExldmVsT3JpZ2lu ID0gV1RGTW92ZSh0b3BMZXZlbE9yaWdpbildKEJPT0wgYXV0aG9yaXplZCkgewotICAgICAgICAg ICAgICAgIGlmICghYXV0aG9yaXplZCkgeworICAgICAgICAgICAgYXV0byBjb21wbGV0aW9uSGFu ZGxlciA9IFt3ZWFrVGhpcyA9IFdURk1vdmUod2Vha1RoaXMpLCBmcmFtZSA9IFdURk1vdmUoZnJh bWUpLCBwcm90ZWN0ZWRSZXF1ZXN0ID0gV1RGTW92ZShwcm90ZWN0ZWRSZXF1ZXN0KSwgd2ViVmll dyA9IFdURk1vdmUod2ViVmlldyksIHRvcExldmVsT3JpZ2luID0gV1RGTW92ZSh0b3BMZXZlbE9y aWdpbildKEJPT0wgYXV0aG9yaXplZCkgeworICAgICAgICAgICAgICAgIGlmICghYXV0aG9yaXpl ZCB8fCAhd2Vha1RoaXMpIHsKICAgICAgICAgICAgICAgICAgICAgcHJvdGVjdGVkUmVxdWVzdC0+ ZGVueShVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdFByb3h5OjpVc2VyTWVkaWFBY2Nlc3NEZW5p YWxSZWFzb246OlBlcm1pc3Npb25EZW5pZWQpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHJlcXVlc3RVc2VyTWVkaWFBdXRo b3JpemF0aW9uRm9yRnJhbWUoZnJhbWUsIHRvcExldmVsT3JpZ2luLCBwcm90ZWN0ZWRSZXF1ZXN0 LCAoaWQgPFdLVUlEZWxlZ2F0ZVByaXZhdGU+KW1fdWlEZWxlZ2F0ZS5tX2RlbGVnYXRlLmdldCgp LCAqd2ViVmlldy5nZXQoKSk7Ci0gICAgICAgICAgICB9KTsKLQotICAgICAgICAgICAgW1BBTDo6 Z2V0QVZDYXB0dXJlRGV2aWNlQ2xhc3MoKSByZXF1ZXN0QWNjZXNzRm9yTWVkaWFUeXBlOkFWTWVk aWFUeXBlVmlkZW8gY29tcGxldGlvbkhhbmRsZXI6ZGVjaXNpb25IYW5kbGVyLmdldCgpXTsKKyAg ICAgICAgICAgICAgICByZXF1ZXN0VXNlck1lZGlhQXV0aG9yaXphdGlvbkZvckZyYW1lKGZyYW1l LCB0b3BMZXZlbE9yaWdpbiwgcHJvdGVjdGVkUmVxdWVzdCwgKGlkIDxXS1VJRGVsZWdhdGVQcml2 YXRlPil3ZWFrVGhpcy0+bV91aURlbGVnYXRlLm1fZGVsZWdhdGUuZ2V0KCksICp3ZWJWaWV3Lmdl dCgpKTsKKyAgICAgICAgICAgIH07CisgICAgICAgICAgICByZXF1ZXN0QWNjZXNzRm9yTWVkaWFU eXBlKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpLCBBVk1lZGlhVHlwZVZpZGVvKTsKICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0gICAgfSk7CisgICAgfTsKIAogICAgIGlmIChyZXF1 aXJlc0F1ZGlvQ2FwdHVyZSkgewogICAgICAgICBBVkF1dGhvcml6YXRpb25TdGF0dXMgbWljcm9w aG9uZUF1dGhvcml6YXRpb25TdGF0dXMgPSB1c2luZ01vY2tDYXB0dXJlRGV2aWNlcyA/IEFWQXV0 aG9yaXphdGlvblN0YXR1c0F1dGhvcml6ZWQgOiBbUEFMOjpnZXRBVkNhcHR1cmVEZXZpY2VDbGFz cygpIGF1dGhvcml6YXRpb25TdGF0dXNGb3JNZWRpYVR5cGU6QVZNZWRpYVR5cGVBdWRpb107CkBA IC05OTksMTkgKzEwMTUsMTkgQEAgdm9pZCBVSURlbGVnYXRlOjpVSUNsaWVudDo6ZGVjaWRlUG9s aWN5Rm9yVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3QoV2ViUGFnZVByb3gKICAgICAgICAgICAg IHJlcXVlc3QuZGVueShVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdFByb3h5OjpVc2VyTWVkaWFB Y2Nlc3NEZW5pYWxSZWFzb246OlBlcm1pc3Npb25EZW5pZWQpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICBjYXNlIEFWQXV0aG9yaXphdGlvblN0YXR1c05vdERldGVybWluZWQ6Ci0gICAg ICAgICAgICBhdXRvIGRlY2lzaW9uSGFuZGxlciA9IG1ha2VCbG9ja1B0cihbcHJvdGVjdGVkUmVx dWVzdCA9IG1ha2VSZWYocmVxdWVzdCksIHJlcXVlc3RDYW1lcmFBdXRob3JpemF0aW9uXShCT09M IGF1dGhvcml6ZWQpIHsKKyAgICAgICAgICAgIGF1dG8gY29tcGxldGlvbkhhbmRsZXIgPSBbcHJv dGVjdGVkUmVxdWVzdCA9IG1ha2VSZWYocmVxdWVzdCksIHJlcXVlc3RDYW1lcmFBdXRob3JpemF0 aW9uID0gV1RGTW92ZShyZXF1ZXN0Q2FtZXJhQXV0aG9yaXphdGlvbildKEJPT0wgYXV0aG9yaXpl ZCkgbXV0YWJsZSB7CiAgICAgICAgICAgICAgICAgaWYgKCFhdXRob3JpemVkKSB7CiAgICAgICAg ICAgICAgICAgICAgIHByb3RlY3RlZFJlcXVlc3QtPmRlbnkoVXNlck1lZGlhUGVybWlzc2lvblJl cXVlc3RQcm94eTo6VXNlck1lZGlhQWNjZXNzRGVuaWFsUmVhc29uOjpQZXJtaXNzaW9uRGVuaWVk KTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICByZXF1ZXN0Q2FtZXJhQXV0aG9yaXphdGlvbigpOwotICAgICAgICAgICAgfSk7 Ci0KLSAgICAgICAgICAgIFtQQUw6OmdldEFWQ2FwdHVyZURldmljZUNsYXNzKCkgcmVxdWVzdEFj Y2Vzc0Zvck1lZGlhVHlwZTpBVk1lZGlhVHlwZUF1ZGlvIGNvbXBsZXRpb25IYW5kbGVyOmRlY2lz aW9uSGFuZGxlci5nZXQoKV07CisgICAgICAgICAgICB9OworICAgICAgICAgICAgcmVxdWVzdEFj Y2Vzc0Zvck1lZGlhVHlwZShXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSwgQVZNZWRpYVR5cGVW aWRlbyk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQotICAgIH0gZWxzZQotICAgICAg ICByZXF1ZXN0Q2FtZXJhQXV0aG9yaXphdGlvbigpOworICAgICAgICByZXR1cm47CisgICAgfQor ICAgIHJlcXVlc3RDYW1lcmFBdXRob3JpemF0aW9uKCk7CiAjZW5kaWYKIH0KIAo=