193334 2019-01-10 13:32:45 -0800 DeviceID hash salt manager can be NULL 2019-01-10 16:49:33 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue webkit-bug-importer youennf oldest_to_newest 1493425 0 eric.carlson 2019-01-10 13:32:45 -0800 The websiteDataStore.deviceIdHashSaltStorage NULL check in UserMediaPermissionRequestManagerProxy::enumerateMediaDevicesForFrame is in the wrong place. 1493426 1 eric.carlson 2019-01-10 13:33:11 -0800 <rdar://problem/47179650> 1493430 2 358825 eric.carlson 2019-01-10 13:38:05 -0800 Created attachment 358825 Patch 1493440 3 358825 youennf 2019-01-10 13:51:00 -0800 Comment on attachment 358825 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358825&action=review > Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp:464 > + return; Can we make websiteDataStore return a reference? 1493500 4 358841 eric.carlson 2019-01-10 15:05:31 -0800 Created attachment 358841 Patch 1493502 5 358841 youennf 2019-01-10 15:09:17 -0800 Comment on attachment 358841 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358841&action=review > Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp:459 > + return; Do we need that check here? 1493506 6 358842 eric.carlson 2019-01-10 15:22:06 -0800 Created attachment 358842 Patch 1493507 7 358841 eric.carlson 2019-01-10 15:23:05 -0800 Comment on attachment 358841 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=358841&action=review >> Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp:459 >> + return; > > Do we need that check here? It is inside of an asynchronous completion handler, so I assume it is possible for the page to have been invalidated. 1493531 8 358842 commit-queue 2019-01-10 16:49:31 -0800 Comment on attachment 358842 Patch Clearing flags on attachment: 358842 Committed r239850: <https://trac.webkit.org/changeset/239850> 1493532 9 commit-queue 2019-01-10 16:49:33 -0800 All reviewed patches have been landed. Closing bug. 358825 2019-01-10 13:38:05 -0800 2019-01-10 13:55:34 -0800 Patch bug-193334-20190111103803.patch text/plain 2355 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5Njc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRjMTk5YWFhYWU1YWNiYjI0 ZDE0NGNkZTA4YjRiOGRkMTNiNDliMDcuLmYzZTE4NWJkNTBhZGFmYTkxZjlkZmU5NWNmZDA4YzI2 YmY5YjVlZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDEtMTAgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGV2aWNlSUQgaGFzaCBz YWx0IG1hbmFnZXIgY2FuIGJlIE5VTEwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MzMzNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcxNzk2NTA+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkuY3BwOgorICAgICAg ICAoV2ViS2l0OjpVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6ZW51bWVy YXRlTWVkaWFEZXZpY2VzRm9yRnJhbWUpOiBOVUxMIGNoZWNrCisgICAgICAgIHdlYnNpdGVEYXRh U3RvcmUuZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UgYmVmb3JlIHVzaW5nIGl0LgorCiAyMDE5LTAx LTA3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgTW9kZXJuaXplIENhY2hlTW9kZWwgYW5kIGRpc2sgY2FjaGUgZmV0Y2hpbmcgYW5kIGNsZWFy aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Vc2VyTWVkaWFQZXJtaXNz aW9uUmVxdWVzdE1hbmFnZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Vc2Vy TWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eS5jcHAKaW5kZXggNGVmNWRjYzM2NWFh MzlhZTYwNmQwYmJiZjM4ZWY0NDlmZTQ5MDVkMC4uZTczNmRmZWQ5NzJiMDIxNmI3NDI3ZGNhYmM0 YjNjMmUyMGE0ZmM0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVXNlck1l ZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5LmNwcApAQCAt NDU5LDYgKzQ1OSwxMCBAQCB2b2lkIFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclBy b3h5OjplbnVtZXJhdGVNZWRpYURldmljZXNGb3JGcmFtZSh1aW50NgogCiAgICAgYXV0byByZXF1 ZXN0SUQgPSBnZW5lcmF0ZVJlcXVlc3RJRCgpOwogICAgIGF1dG8gY29tcGxldGlvbkhhbmRsZXIg PSBbdGhpcywgcmVxdWVzdElELCB1c2VyTWVkaWFJRCwgcmVxdWVzdE9yaWdpbiA9IHVzZXJNZWRp YURvY3VtZW50T3JpZ2luLmNvcHlSZWYoKSwgdG9wT3JpZ2luID0gdG9wTGV2ZWxEb2N1bWVudE9y aWdpbi5jb3B5UmVmKCldKGJvb2wgb3JpZ2luSGFzUGVyc2lzdGVudEFjY2VzcykgeworCisgICAg ICAgIGlmICghbV9wYWdlLmlzVmFsaWQoKSB8fCAhbV9wYWdlLndlYnNpdGVEYXRhU3RvcmUoKS5k ZXZpY2VJZEhhc2hTYWx0U3RvcmFnZSgpKQorICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAg IG1fcGFnZS53ZWJzaXRlRGF0YVN0b3JlKCkuZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UoKS0+ZGV2 aWNlSWRIYXNoU2FsdEZvck9yaWdpbihyZXF1ZXN0T3JpZ2luLmdldCgpLCB0b3BPcmlnaW4uZ2V0 KCksIFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgcmVxdWVzdElELCB1c2Vy TWVkaWFJRCwgJm9yaWdpbkhhc1BlcnNpc3RlbnRBY2Nlc3NdIChTdHJpbmcmJiBkZXZpY2VJREhh c2hTYWx0KSB7CiAgICAgICAgICAgICBpZiAoIXdlYWtUaGlzKQogICAgICAgICAgICAgICAgIHJl dHVybjsKQEAgLTQ2Niw3ICs0NzAsNyBAQCB2b2lkIFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0 TWFuYWdlclByb3h5OjplbnVtZXJhdGVNZWRpYURldmljZXNGb3JGcmFtZSh1aW50NgogICAgICAg ICAgICAgaWYgKCFwZW5kaW5nUmVxdWVzdCkKICAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAg ICAgICAgICAgIGlmICghbV9wYWdlLmlzVmFsaWQoKSB8fCAhbV9wYWdlLndlYnNpdGVEYXRhU3Rv cmUoKS5kZXZpY2VJZEhhc2hTYWx0U3RvcmFnZSgpKQorICAgICAgICAgICAgaWYgKCFtX3BhZ2Uu aXNWYWxpZCgpKQogICAgICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAgICAgc3luY1dp dGhXZWJDb3JlUHJlZnMoKTsK 358841 2019-01-10 15:05:31 -0800 2019-01-10 15:22:02 -0800 Patch bug-193334-20190111120530.patch text/plain 10232 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5Njc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRjMTk5YWFhYWU1YWNiYjI0 ZDE0NGNkZTA4YjRiOGRkMTNiNDliMDcuLmU3OWQ4Y2I5NTFhY2ViOTQ1Njg5YzIyZGJkYjVhYmNl MDY5ZmRlNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTktMDEtMTAgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGV2aWNlSUQgaGFzaCBz YWx0IG1hbmFnZXIgY2FuIGJlIE5VTEwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MzMzNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcxNzk2NTA+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkuY3BwOgorICAgICAg ICAoV2ViS2l0OjpVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6dXNlck1l ZGlhQWNjZXNzV2FzR3JhbnRlZCk6IE5vIG5lZWQgdG8KKyAgICAgICAgTlVMTC1jaGVjayB3ZWJz aXRlRGF0YVN0b3JlLmRldmljZUlkSGFzaFNhbHRTdG9yYWdlLCBpdCBpcyBhIFJlZi4KKyAgICAg ICAgKFdlYktpdDo6VXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6OnJlcXVl c3RVc2VyTWVkaWFQZXJtaXNzaW9uRm9yRnJhbWUpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6 VXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6OmdldFVzZXJNZWRpYVBlcm1p c3Npb25JbmZvKTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OlVzZXJNZWRpYVBlcm1pc3Npb25S ZXF1ZXN0TWFuYWdlclByb3h5OjplbnVtZXJhdGVNZWRpYURldmljZXNGb3JGcmFtZSk6IERpdHRv LgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpXZWJzaXRlRGF0YVN0b3JlKTog bV9kZXZpY2VJZEhhc2hTYWx0U3RvcmFnZSBpcyBhIFJlZi4KKyAgICAgICAgKFdlYktpdDo6V2Vi c2l0ZURhdGFTdG9yZTo6ZmV0Y2hEYXRhQW5kQXBwbHkpOiBEaXR0by4KKyAgICAgICAgKFdlYktp dDo6V2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlRGF0YSk6IERpdHRvLgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmg6CisgICAgICAgIChXZWJLaXQ6Oldl YnNpdGVEYXRhU3RvcmU6OmRldmljZUlkSGFzaFNhbHRTdG9yYWdlKTogRGl0dG8uCisKIDIwMTkt MDEtMDcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBNb2Rlcm5pemUgQ2FjaGVNb2RlbCBhbmQgZGlzayBjYWNoZSBmZXRjaGluZyBhbmQgY2xl YXJpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1VzZXJNZWRpYVBlcm1p c3Npb25SZXF1ZXN0TWFuYWdlclByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Vz ZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5LmNwcAppbmRleCA0ZWY1ZGNjMzY1 YWEzOWFlNjA2ZDBiYmJmMzhlZjQ0OWZlNDkwNWQwLi5lZDVlN2UzOGRhMWU3Nzk0OTJhNTFlZjU5 YTkzNWZjODI0YjA3ODk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Vc2Vy TWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkuY3BwCkBA IC0xNzYsNyArMTc2LDcgQEAgdm9pZCBVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQ cm94eTo6dXNlck1lZGlhQWNjZXNzV2FzR3JhbnRlZCh1aW50NjRfdAogewogICAgIEFTU0VSVChh dWRpb0RldmljZSB8fCB2aWRlb0RldmljZSk7CiAKLSAgICBpZiAoIW1fcGFnZS5pc1ZhbGlkKCkg fHwgIW1fcGFnZS53ZWJzaXRlRGF0YVN0b3JlKCkuZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UoKSkK KyAgICBpZiAoIW1fcGFnZS5pc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKIAogI2lmIEVOQUJM RShNRURJQV9TVFJFQU0pCkBAIC0xODQsNyArMTg0LDcgQEAgdm9pZCBVc2VyTWVkaWFQZXJtaXNz aW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6dXNlck1lZGlhQWNjZXNzV2FzR3JhbnRlZCh1aW50NjRf dAogICAgIGlmICghcmVxdWVzdCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9wYWdlLndlYnNp dGVEYXRhU3RvcmUoKS5kZXZpY2VJZEhhc2hTYWx0U3RvcmFnZSgpLT5kZXZpY2VJZEhhc2hTYWx0 Rm9yT3JpZ2luKHJlcXVlc3QtPnVzZXJNZWRpYURvY3VtZW50U2VjdXJpdHlPcmlnaW4oKSwgcmVx dWVzdC0+dG9wTGV2ZWxEb2N1bWVudFNlY3VyaXR5T3JpZ2luKCksIFt0aGlzLCB3ZWFrVGhpcyA9 IG1ha2VXZWFrUHRyKCp0aGlzKSwgdXNlck1lZGlhSUQsIGF1ZGlvRGV2aWNlID0gV1RGTW92ZShh dWRpb0RldmljZSksIHZpZGVvRGV2aWNlID0gV1RGTW92ZSh2aWRlb0RldmljZSksIGxvY2FsUmVx dWVzdCA9IHJlcXVlc3QuY29weVJlZigpXSAoU3RyaW5nJiYgZGV2aWNlSURIYXNoU2FsdCkgbXV0 YWJsZSB7CisgICAgbV9wYWdlLndlYnNpdGVEYXRhU3RvcmUoKS5kZXZpY2VJZEhhc2hTYWx0U3Rv cmFnZSgpLmRldmljZUlkSGFzaFNhbHRGb3JPcmlnaW4ocmVxdWVzdC0+dXNlck1lZGlhRG9jdW1l bnRTZWN1cml0eU9yaWdpbigpLCByZXF1ZXN0LT50b3BMZXZlbERvY3VtZW50U2VjdXJpdHlPcmln aW4oKSwgW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpLCB1c2VyTWVkaWFJRCwg YXVkaW9EZXZpY2UgPSBXVEZNb3ZlKGF1ZGlvRGV2aWNlKSwgdmlkZW9EZXZpY2UgPSBXVEZNb3Zl KHZpZGVvRGV2aWNlKSwgbG9jYWxSZXF1ZXN0ID0gcmVxdWVzdC5jb3B5UmVmKCldIChTdHJpbmcm JiBkZXZpY2VJREhhc2hTYWx0KSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCF3ZWFrVGhpcykKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgaWYgKGdyYW50QWNjZXNzKHVzZXJNZWRpYUlELCBX VEZNb3ZlKGF1ZGlvRGV2aWNlKSwgV1RGTW92ZSh2aWRlb0RldmljZSksIFdURk1vdmUoZGV2aWNl SURIYXNoU2FsdCkpKSB7CkBAIC0zODcsMTIgKzM4NywxMiBAQCB2b2lkIFVzZXJNZWRpYVBlcm1p c3Npb25SZXF1ZXN0TWFuYWdlclByb3h5OjpyZXF1ZXN0VXNlck1lZGlhUGVybWlzc2lvbkZvckZy YW1lKAogICAgICAgICBpZiAoIXBlbmRpbmdSZXF1ZXN0KQogICAgICAgICAgICAgcmV0dXJuOwog Ci0gICAgICAgIGlmICghbV9wYWdlLmlzVmFsaWQoKSB8fCAhbV9wYWdlLndlYnNpdGVEYXRhU3Rv cmUoKS5kZXZpY2VJZEhhc2hTYWx0U3RvcmFnZSgpKQorICAgICAgICBpZiAoIW1fcGFnZS5pc1Zh bGlkKCkpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgc3luY1dpdGhXZWJDb3JlUHJl ZnMoKTsKIAotICAgICAgICBtX3BhZ2Uud2Vic2l0ZURhdGFTdG9yZSgpLmRldmljZUlkSGFzaFNh bHRTdG9yYWdlKCktPmRldmljZUlkSGFzaFNhbHRGb3JPcmlnaW4ocGVuZGluZ1JlcXVlc3QudmFs dWUoKS0+dXNlck1lZGlhRG9jdW1lbnRTZWN1cml0eU9yaWdpbigpLCBwZW5kaW5nUmVxdWVzdC52 YWx1ZSgpLT50b3BMZXZlbERvY3VtZW50U2VjdXJpdHlPcmlnaW4oKSwgW3ZhbGlkSGFuZGxlciA9 IFdURk1vdmUodmFsaWRIYW5kbGVyKSwgaW52YWxpZEhhbmRsZXIgPSBXVEZNb3ZlKGludmFsaWRI YW5kbGVyKSwgbG9jYWxVc2VyUmVxdWVzdCA9IGxvY2FsVXNlclJlcXVlc3RdIChTdHJpbmcmJiBk ZXZpY2VJREhhc2hTYWx0KSBtdXRhYmxlIHsKKyAgICAgICAgbV9wYWdlLndlYnNpdGVEYXRhU3Rv cmUoKS5kZXZpY2VJZEhhc2hTYWx0U3RvcmFnZSgpLmRldmljZUlkSGFzaFNhbHRGb3JPcmlnaW4o cGVuZGluZ1JlcXVlc3QudmFsdWUoKS0+dXNlck1lZGlhRG9jdW1lbnRTZWN1cml0eU9yaWdpbigp LCBwZW5kaW5nUmVxdWVzdC52YWx1ZSgpLT50b3BMZXZlbERvY3VtZW50U2VjdXJpdHlPcmlnaW4o KSwgW3ZhbGlkSGFuZGxlciA9IFdURk1vdmUodmFsaWRIYW5kbGVyKSwgaW52YWxpZEhhbmRsZXIg PSBXVEZNb3ZlKGludmFsaWRIYW5kbGVyKSwgbG9jYWxVc2VyUmVxdWVzdCA9IGxvY2FsVXNlclJl cXVlc3RdIChTdHJpbmcmJiBkZXZpY2VJREhhc2hTYWx0KSBtdXRhYmxlIHsKICAgICAgICAgICAg IFJlYWx0aW1lTWVkaWFTb3VyY2VDZW50ZXI6OnNpbmdsZXRvbigpLnZhbGlkYXRlUmVxdWVzdENv bnN0cmFpbnRzKFdURk1vdmUodmFsaWRIYW5kbGVyKSwgV1RGTW92ZShpbnZhbGlkSGFuZGxlciks IFdURk1vdmUobG9jYWxVc2VyUmVxdWVzdCksIFdURk1vdmUoZGV2aWNlSURIYXNoU2FsdCkpOwog ICAgICAgICB9KTsKICAgICB9OwpAQCAtNDEwLDExICs0MTAsNiBAQCB2b2lkIFVzZXJNZWRpYVBl cm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5OjpyZXF1ZXN0VXNlck1lZGlhUGVybWlzc2lvbkZv ckZyYW1lKAogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCiB2b2lkIFVzZXJNZWRpYVBlcm1pc3Np b25SZXF1ZXN0TWFuYWdlclByb3h5OjpnZXRVc2VyTWVkaWFQZXJtaXNzaW9uSW5mbyh1aW50NjRf dCByZXF1ZXN0SUQsIHVpbnQ2NF90IGZyYW1lSUQsIFVzZXJNZWRpYVBlcm1pc3Npb25DaGVja1By b3h5OjpDb21wbGV0aW9uSGFuZGxlciYmIGhhbmRsZXIsIFJlZjxTZWN1cml0eU9yaWdpbj4mJiB1 c2VyTWVkaWFEb2N1bWVudE9yaWdpbiwgUmVmPFNlY3VyaXR5T3JpZ2luPiYmIHRvcExldmVsRG9j dW1lbnRPcmlnaW4pCiB7Ci0gICAgaWYgKCFtX3BhZ2Uud2Vic2l0ZURhdGFTdG9yZSgpLmRldmlj ZUlkSGFzaFNhbHRTdG9yYWdlKCkpIHsKLSAgICAgICAgaGFuZGxlcihmYWxzZSk7Ci0gICAgICAg IHJldHVybjsKLSAgICB9Ci0KICAgICBhdXRvIHVzZXJNZWRpYU9yaWdpbiA9IEFQSTo6U2VjdXJp dHlPcmlnaW46OmNyZWF0ZSh1c2VyTWVkaWFEb2N1bWVudE9yaWdpbi5nZXQoKSk7CiAgICAgYXV0 byB0b3BMZXZlbE9yaWdpbiA9IEFQSTo6U2VjdXJpdHlPcmlnaW46OmNyZWF0ZSh0b3BMZXZlbERv Y3VtZW50T3JpZ2luLmdldCgpKTsKICAgICBhdXRvIHJlcXVlc3QgPSBVc2VyTWVkaWFQZXJtaXNz aW9uQ2hlY2tQcm94eTo6Y3JlYXRlKGZyYW1lSUQsIFdURk1vdmUoaGFuZGxlciksIFdURk1vdmUo dXNlck1lZGlhRG9jdW1lbnRPcmlnaW4pLCBXVEZNb3ZlKHRvcExldmVsRG9jdW1lbnRPcmlnaW4p KTsKQEAgLTQ1OSwxNCArNDU0LDE4IEBAIHZvaWQgVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RN YW5hZ2VyUHJveHk6OmVudW1lcmF0ZU1lZGlhRGV2aWNlc0ZvckZyYW1lKHVpbnQ2CiAKICAgICBh dXRvIHJlcXVlc3RJRCA9IGdlbmVyYXRlUmVxdWVzdElEKCk7CiAgICAgYXV0byBjb21wbGV0aW9u SGFuZGxlciA9IFt0aGlzLCByZXF1ZXN0SUQsIHVzZXJNZWRpYUlELCByZXF1ZXN0T3JpZ2luID0g dXNlck1lZGlhRG9jdW1lbnRPcmlnaW4uY29weVJlZigpLCB0b3BPcmlnaW4gPSB0b3BMZXZlbERv Y3VtZW50T3JpZ2luLmNvcHlSZWYoKV0oYm9vbCBvcmlnaW5IYXNQZXJzaXN0ZW50QWNjZXNzKSB7 Ci0gICAgICAgIG1fcGFnZS53ZWJzaXRlRGF0YVN0b3JlKCkuZGV2aWNlSWRIYXNoU2FsdFN0b3Jh Z2UoKS0+ZGV2aWNlSWRIYXNoU2FsdEZvck9yaWdpbihyZXF1ZXN0T3JpZ2luLmdldCgpLCB0b3BP cmlnaW4uZ2V0KCksIFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgcmVxdWVz dElELCB1c2VyTWVkaWFJRCwgJm9yaWdpbkhhc1BlcnNpc3RlbnRBY2Nlc3NdIChTdHJpbmcmJiBk ZXZpY2VJREhhc2hTYWx0KSB7CisKKyAgICAgICAgaWYgKCFtX3BhZ2UuaXNWYWxpZCgpKQorICAg ICAgICAgICAgcmV0dXJuOworCisgICAgICAgIG1fcGFnZS53ZWJzaXRlRGF0YVN0b3JlKCkuZGV2 aWNlSWRIYXNoU2FsdFN0b3JhZ2UoKS5kZXZpY2VJZEhhc2hTYWx0Rm9yT3JpZ2luKHJlcXVlc3RP cmlnaW4uZ2V0KCksIHRvcE9yaWdpbi5nZXQoKSwgW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQ dHIoKnRoaXMpLCByZXF1ZXN0SUQsIHVzZXJNZWRpYUlELCAmb3JpZ2luSGFzUGVyc2lzdGVudEFj Y2Vzc10gKFN0cmluZyYmIGRldmljZUlESGFzaFNhbHQpIHsKICAgICAgICAgICAgIGlmICghd2Vh a1RoaXMpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgYXV0byBwZW5kaW5n UmVxdWVzdCA9IG1fcGVuZGluZ0RldmljZVJlcXVlc3RzLnRha2UocmVxdWVzdElEKTsKICAgICAg ICAgICAgIGlmICghcGVuZGluZ1JlcXVlc3QpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCi0g ICAgICAgICAgICBpZiAoIW1fcGFnZS5pc1ZhbGlkKCkgfHwgIW1fcGFnZS53ZWJzaXRlRGF0YVN0 b3JlKCkuZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UoKSkKKyAgICAgICAgICAgIGlmICghbV9wYWdl LmlzVmFsaWQoKSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgICAgIHN5bmNX aXRoV2ViQ29yZVByZWZzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCmluZGV4IDRkN2Y1MTE0ZjgyOGNiZjNl NTBlMmU1MTM4NzA5YjI3NmJjYjUyNjIuLjBhYWJiZTQ4ZGIxMzVkODZiZjI4NGIwNTU0MjE0M2Ex N2JkOGU5YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRh L1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNp dGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCkBAIC0xMDksNiArMTA5LDcgQEAgV2Vic2l0ZURh dGFTdG9yZTo6V2Vic2l0ZURhdGFTdG9yZShQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQpCiAgICAg OiBtX3Nlc3Npb25JRChzZXNzaW9uSUQpCiAgICAgLCBtX3Jlc29sdmVkQ29uZmlndXJhdGlvbihX ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbjo6Y3JlYXRlKCkpCiAgICAgLCBtX2NvbmZpZ3Vy YXRpb24obV9yZXNvbHZlZENvbmZpZ3VyYXRpb24tPmNvcHkoKSkKKyAgICAsIG1fZGV2aWNlSWRI YXNoU2FsdFN0b3JhZ2UoRGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2U6OmNyZWF0ZShpc1BlcnNpc3Rl bnQoKSA/IG1fY29uZmlndXJhdGlvbi0+ZGV2aWNlSWRIYXNoU2FsdHNTdG9yYWdlRGlyZWN0b3J5 KCkgOiBTdHJpbmcoKSkpCiAgICAgLCBtX3F1ZXVlKFdvcmtRdWV1ZTo6Y3JlYXRlKCJjb20uYXBw bGUuV2ViS2l0LldlYnNpdGVEYXRhU3RvcmUiKSkKICNpZiBFTkFCTEUoV0VCX0FVVEhOKQogICAg ICwgbV9hdXRoZW50aWNhdG9yTWFuYWdlcihtYWtlVW5pcXVlUmVmPEF1dGhlbnRpY2F0b3JNYW5h Z2VyPigpKQpAQCAtNDg2LDcgKzQ4Nyw3IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6ZmV0Y2hE YXRhQW5kQXBwbHkoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBPCiAgICAg ICAgIH0pOwogICAgIH0KIAotICAgIGlmIChtX2RldmljZUlkSGFzaFNhbHRTdG9yYWdlICYmIGRh dGFUeXBlcy5jb250YWlucyhXZWJzaXRlRGF0YVR5cGU6OkRldmljZUlkSGFzaFNhbHQpKSB7Cisg ICAgaWYgKGRhdGFUeXBlcy5jb250YWlucyhXZWJzaXRlRGF0YVR5cGU6OkRldmljZUlkSGFzaFNh bHQpKSB7CiAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVuZGluZ0NhbGxiYWNrKCk7 CiAKICAgICAgICAgbV9kZXZpY2VJZEhhc2hTYWx0U3RvcmFnZS0+Z2V0RGV2aWNlSWRIYXNoU2Fs dE9yaWdpbnMoW2NhbGxiYWNrQWdncmVnYXRvcl0oYXV0byYmIG9yaWdpbnMpIHsKQEAgLTgxNCw3 ICs4MTUsNyBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoT3B0aW9uU2V0PFdl YnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBXYWxsVGltZQogICAgICAgICB9KTsKICAgICB9CiAK LSAgICBpZiAobV9kZXZpY2VJZEhhc2hTYWx0U3RvcmFnZSAmJiAoZGF0YVR5cGVzLmNvbnRhaW5z KFdlYnNpdGVEYXRhVHlwZTo6RGV2aWNlSWRIYXNoU2FsdCkgfHwgKGRhdGFUeXBlcy5jb250YWlu cyhXZWJzaXRlRGF0YVR5cGU6OkNvb2tpZXMpKSkpIHsKKyAgICBpZiAoZGF0YVR5cGVzLmNvbnRh aW5zKFdlYnNpdGVEYXRhVHlwZTo6RGV2aWNlSWRIYXNoU2FsdCkgfHwgKGRhdGFUeXBlcy5jb250 YWlucyhXZWJzaXRlRGF0YVR5cGU6OkNvb2tpZXMpKSkgewogICAgICAgICBjYWxsYmFja0FnZ3Jl Z2F0b3ItPmFkZFBlbmRpbmdDYWxsYmFjaygpOwogCiAgICAgICAgIG1fZGV2aWNlSWRIYXNoU2Fs dFN0b3JhZ2UtPmRlbGV0ZURldmljZUlkSGFzaFNhbHRPcmlnaW5zTW9kaWZpZWRTaW5jZShtb2Rp ZmllZFNpbmNlLCBbY2FsbGJhY2tBZ2dyZWdhdG9yXSB7CkBAIC0xMDk2LDcgKzEwOTcsNyBAQCB2 b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlw ZT4gZGF0YVR5cGVzLCBjb25zdCBWZQogICAgICAgICB9KTsKICAgICB9CiAKLSAgICBpZiAobV9k ZXZpY2VJZEhhc2hTYWx0U3RvcmFnZSAmJiAoZGF0YVR5cGVzLmNvbnRhaW5zKFdlYnNpdGVEYXRh VHlwZTo6RGV2aWNlSWRIYXNoU2FsdCkgfHwgKGRhdGFUeXBlcy5jb250YWlucyhXZWJzaXRlRGF0 YVR5cGU6OkNvb2tpZXMpKSkpIHsKKyAgICBpZiAoZGF0YVR5cGVzLmNvbnRhaW5zKFdlYnNpdGVE YXRhVHlwZTo6RGV2aWNlSWRIYXNoU2FsdCkgfHwgKGRhdGFUeXBlcy5jb250YWlucyhXZWJzaXRl RGF0YVR5cGU6OkNvb2tpZXMpKSkgewogICAgICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPmFkZFBl bmRpbmdDYWxsYmFjaygpOwogCiAgICAgICAgIG1fZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UtPmRl bGV0ZURldmljZUlkSGFzaFNhbHRGb3JPcmlnaW5zKG9yaWdpbnMsIFtjYWxsYmFja0FnZ3JlZ2F0 b3JdIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dl YnNpdGVEYXRhU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dl YnNpdGVEYXRhU3RvcmUuaAppbmRleCA3YzUzNDNlMjE1ODU5NDA3OWMyMDg2ODI5YzA5YmJmN2Jk MTNjYzJkLi45MTJkOGU0NzVjZDZhMjE3OTk5YTA5MDE3OGViNjU4ZmMyMTc5YzY5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3Jl LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFT dG9yZS5oCkBAIC0xNDIsNyArMTQyLDcgQEAgcHVibGljOgogCiAgICAgU3RvcmFnZU1hbmFnZXIq IHN0b3JhZ2VNYW5hZ2VyKCkgeyByZXR1cm4gbV9zdG9yYWdlTWFuYWdlci5nZXQoKTsgfQogCi0g ICAgRGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UqIGRldmljZUlkSGFzaFNhbHRTdG9yYWdlKCkgeyBy ZXR1cm4gbV9kZXZpY2VJZEhhc2hTYWx0U3RvcmFnZS5nZXQoKTsgfQorICAgIERldmljZUlkSGFz aFNhbHRTdG9yYWdlJiBkZXZpY2VJZEhhc2hTYWx0U3RvcmFnZSgpIHsgcmV0dXJuIG1fZGV2aWNl SWRIYXNoU2FsdFN0b3JhZ2UuZ2V0KCk7IH0KIAogICAgIFdlYlByb2Nlc3NQb29sKiBwcm9jZXNz UG9vbEZvckNvb2tpZVN0b3JhZ2VPcGVyYXRpb25zKCk7CiAgICAgYm9vbCBpc0Fzc29jaWF0ZWRQ cm9jZXNzUG9vbChXZWJQcm9jZXNzUG9vbCYpIGNvbnN0OwpAQCAtMjI4LDcgKzIyOCw3IEBAIHBy aXZhdGU6CiAgICAgYm9vbCBtX2hhc1Jlc29sdmVkRGlyZWN0b3JpZXMgeyBmYWxzZSB9OwogCiAg ICAgY29uc3QgUmVmUHRyPFN0b3JhZ2VNYW5hZ2VyPiBtX3N0b3JhZ2VNYW5hZ2VyOwotICAgIGNv bnN0IFJlZlB0cjxEZXZpY2VJZEhhc2hTYWx0U3RvcmFnZT4gbV9kZXZpY2VJZEhhc2hTYWx0U3Rv cmFnZTsKKyAgICBjb25zdCBSZWY8RGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2U+IG1fZGV2aWNlSWRI YXNoU2FsdFN0b3JhZ2U7CiAgICAgUmVmUHRyPFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZT4gbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzOwogICAgIGJvb2wgbV9yZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRGVidWdNb2RlIHsgZmFsc2UgfTsKIAo= 358842 2019-01-10 15:22:06 -0800 2019-01-10 16:49:31 -0800 Patch bug-193334-20190111122204.patch text/plain 11310 eric.carlson U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5Njc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRjMTk5YWFhYWU1YWNiYjI0 ZDE0NGNkZTA4YjRiOGRkMTNiNDliMDcuLjcyOGUxNTZmZjVmZTZhYjU2N2E2OWVkYjQ3NWEyYzU3 NWMyODUwZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTktMDEtMTAgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGV2aWNlSUQgaGFzaCBz YWx0IG1hbmFnZXIgY2FuIGJlIE5VTEwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MzMzNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDcxNzk2NTA+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9Vc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6OlVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5Ojp1c2VyTWVk aWFBY2Nlc3NXYXNHcmFudGVkKTogTm8gbmVlZCB0bworICAgICAgICBOVUxMLWNoZWNrIHdlYnNp dGVEYXRhU3RvcmUuZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UsIGl0IGlzIGEgUmVmLgorICAgICAg ICAoV2ViS2l0OjpVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6cmVxdWVz dFVzZXJNZWRpYVBlcm1pc3Npb25Gb3JGcmFtZSk6IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpV c2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6Z2V0VXNlck1lZGlhUGVybWlz c2lvbkluZm8pOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6VXNlck1lZGlhUGVybWlzc2lvblJl cXVlc3RNYW5hZ2VyUHJveHk6OmVudW1lcmF0ZU1lZGlhRGV2aWNlc0ZvckZyYW1lKTogRGl0dG8u CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OldlYnNpdGVEYXRhU3RvcmUpOiBt X2RldmljZUlkSGFzaFNhbHRTdG9yYWdlIGlzIGEgUmVmLgorICAgICAgICAoV2ViS2l0OjpXZWJz aXRlRGF0YVN0b3JlOjpmZXRjaERhdGFBbmRBcHBseSk6IERpdHRvLgorICAgICAgICAoV2ViS2l0 OjpXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKTogRGl0dG8uCisgICAgICAgICogVUlQcm9j ZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaDoKKyAgICAgICAgKFdlYktpdDo6V2Vi c2l0ZURhdGFTdG9yZTo6ZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UpOiBEaXR0by4KKwogMjAxOS0w MS0wNyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAg ICAgIE1vZGVybml6ZSBDYWNoZU1vZGVsIGFuZCBkaXNrIGNhY2hlIGZldGNoaW5nIGFuZCBjbGVh cmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0 VUlDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0VUlD bGllbnQuY3BwCmluZGV4IGIwOGNlMWQwYWZjOWI5NGYxMDI2NDVkMTljNjYwNjg4ZTI1MmM0M2Mu LmQ0YThkMWU5OWM3YWQ1ZjAzMjdiYjg3NGZjMGVhYzMwYzFhNGVkZjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFVJQ2xpZW50LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRVSUNsaWVudC5jcHAKQEAgLTE5 Myw3ICsxOTMsNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBjaGVja1VzZXJNZWRpYVBlcm1pc3Np b25Gb3JPcmlnaW4oV2ViUGFnZVByb3h5JiBwYWdlLCBXZWJGcmFtZVByb3h5JiwgQVBJOjpTZWN1 cml0eU9yaWdpbiYgdXNlck1lZGlhRG9jdW1lbnRPcmlnaW4sIEFQSTo6U2VjdXJpdHlPcmlnaW4m IHRvcExldmVsRG9jdW1lbnRPcmlnaW4sIFVzZXJNZWRpYVBlcm1pc3Npb25DaGVja1Byb3h5JiBw ZXJtaXNzaW9uUmVxdWVzdCkgb3ZlcnJpZGUKICAgICB7Ci0gICAgICAgIGF1dG8gZGV2aWNlSW5m b1Blcm1pc3Npb25SZXF1ZXN0ID0gYWRvcHRHUmVmKHdlYmtpdERldmljZUluZm9QZXJtaXNzaW9u UmVxdWVzdENyZWF0ZShwZXJtaXNzaW9uUmVxdWVzdCwgcGFnZS53ZWJzaXRlRGF0YVN0b3JlKCku ZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UoKSkpOworICAgICAgICBhdXRvIGRldmljZUluZm9QZXJt aXNzaW9uUmVxdWVzdCA9IGFkb3B0R1JlZih3ZWJraXREZXZpY2VJbmZvUGVybWlzc2lvblJlcXVl c3RDcmVhdGUocGVybWlzc2lvblJlcXVlc3QsICZwYWdlLndlYnNpdGVEYXRhU3RvcmUoKS5kZXZp Y2VJZEhhc2hTYWx0U3RvcmFnZSgpKSk7CiAgICAgICAgIHdlYmtpdFdlYlZpZXdNYWtlUGVybWlz c2lvblJlcXVlc3QobV93ZWJWaWV3LCBXRUJLSVRfUEVSTUlTU0lPTl9SRVFVRVNUKGRldmljZUlu Zm9QZXJtaXNzaW9uUmVxdWVzdC5nZXQoKSkpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Vc2VyTWVkaWFQZXJtaXNzaW9u UmVxdWVzdE1hbmFnZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Vc2VyTWVk aWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eS5jcHAKaW5kZXggNGVmNWRjYzM2NWFhMzlh ZTYwNmQwYmJiZjM4ZWY0NDlmZTQ5MDVkMC4uZWQ1ZTdlMzhkYTFlNzc5NDkyYTUxZWY1OWE5MzVm YzgyNGIwNzg5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVXNlck1lZGlh UGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5LmNwcApAQCAtMTc2 LDcgKzE3Niw3IEBAIHZvaWQgVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHk6 OnVzZXJNZWRpYUFjY2Vzc1dhc0dyYW50ZWQodWludDY0X3QKIHsKICAgICBBU1NFUlQoYXVkaW9E ZXZpY2UgfHwgdmlkZW9EZXZpY2UpOwogCi0gICAgaWYgKCFtX3BhZ2UuaXNWYWxpZCgpIHx8ICFt X3BhZ2Uud2Vic2l0ZURhdGFTdG9yZSgpLmRldmljZUlkSGFzaFNhbHRTdG9yYWdlKCkpCisgICAg aWYgKCFtX3BhZ2UuaXNWYWxpZCgpKQogICAgICAgICByZXR1cm47CiAKICNpZiBFTkFCTEUoTUVE SUFfU1RSRUFNKQpAQCAtMTg0LDcgKzE4NCw3IEBAIHZvaWQgVXNlck1lZGlhUGVybWlzc2lvblJl cXVlc3RNYW5hZ2VyUHJveHk6OnVzZXJNZWRpYUFjY2Vzc1dhc0dyYW50ZWQodWludDY0X3QKICAg ICBpZiAoIXJlcXVlc3QpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fcGFnZS53ZWJzaXRlRGF0 YVN0b3JlKCkuZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UoKS0+ZGV2aWNlSWRIYXNoU2FsdEZvck9y aWdpbihyZXF1ZXN0LT51c2VyTWVkaWFEb2N1bWVudFNlY3VyaXR5T3JpZ2luKCksIHJlcXVlc3Qt PnRvcExldmVsRG9jdW1lbnRTZWN1cml0eU9yaWdpbigpLCBbdGhpcywgd2Vha1RoaXMgPSBtYWtl V2Vha1B0cigqdGhpcyksIHVzZXJNZWRpYUlELCBhdWRpb0RldmljZSA9IFdURk1vdmUoYXVkaW9E ZXZpY2UpLCB2aWRlb0RldmljZSA9IFdURk1vdmUodmlkZW9EZXZpY2UpLCBsb2NhbFJlcXVlc3Qg PSByZXF1ZXN0LmNvcHlSZWYoKV0gKFN0cmluZyYmIGRldmljZUlESGFzaFNhbHQpIG11dGFibGUg eworICAgIG1fcGFnZS53ZWJzaXRlRGF0YVN0b3JlKCkuZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2Uo KS5kZXZpY2VJZEhhc2hTYWx0Rm9yT3JpZ2luKHJlcXVlc3QtPnVzZXJNZWRpYURvY3VtZW50U2Vj dXJpdHlPcmlnaW4oKSwgcmVxdWVzdC0+dG9wTGV2ZWxEb2N1bWVudFNlY3VyaXR5T3JpZ2luKCks IFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKSwgdXNlck1lZGlhSUQsIGF1ZGlv RGV2aWNlID0gV1RGTW92ZShhdWRpb0RldmljZSksIHZpZGVvRGV2aWNlID0gV1RGTW92ZSh2aWRl b0RldmljZSksIGxvY2FsUmVxdWVzdCA9IHJlcXVlc3QuY29weVJlZigpXSAoU3RyaW5nJiYgZGV2 aWNlSURIYXNoU2FsdCkgbXV0YWJsZSB7CiAgICAgICAgIGlmICghd2Vha1RoaXMpCiAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIGlmIChncmFudEFjY2Vzcyh1c2VyTWVkaWFJRCwgV1RGTW92 ZShhdWRpb0RldmljZSksIFdURk1vdmUodmlkZW9EZXZpY2UpLCBXVEZNb3ZlKGRldmljZUlESGFz aFNhbHQpKSkgewpAQCAtMzg3LDEyICszODcsMTIgQEAgdm9pZCBVc2VyTWVkaWFQZXJtaXNzaW9u UmVxdWVzdE1hbmFnZXJQcm94eTo6cmVxdWVzdFVzZXJNZWRpYVBlcm1pc3Npb25Gb3JGcmFtZSgK ICAgICAgICAgaWYgKCFwZW5kaW5nUmVxdWVzdCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAg ICAgICBpZiAoIW1fcGFnZS5pc1ZhbGlkKCkgfHwgIW1fcGFnZS53ZWJzaXRlRGF0YVN0b3JlKCku ZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UoKSkKKyAgICAgICAgaWYgKCFtX3BhZ2UuaXNWYWxpZCgp KQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHN5bmNXaXRoV2ViQ29yZVByZWZzKCk7 CiAKLSAgICAgICAgbV9wYWdlLndlYnNpdGVEYXRhU3RvcmUoKS5kZXZpY2VJZEhhc2hTYWx0U3Rv cmFnZSgpLT5kZXZpY2VJZEhhc2hTYWx0Rm9yT3JpZ2luKHBlbmRpbmdSZXF1ZXN0LnZhbHVlKCkt PnVzZXJNZWRpYURvY3VtZW50U2VjdXJpdHlPcmlnaW4oKSwgcGVuZGluZ1JlcXVlc3QudmFsdWUo KS0+dG9wTGV2ZWxEb2N1bWVudFNlY3VyaXR5T3JpZ2luKCksIFt2YWxpZEhhbmRsZXIgPSBXVEZN b3ZlKHZhbGlkSGFuZGxlciksIGludmFsaWRIYW5kbGVyID0gV1RGTW92ZShpbnZhbGlkSGFuZGxl ciksIGxvY2FsVXNlclJlcXVlc3QgPSBsb2NhbFVzZXJSZXF1ZXN0XSAoU3RyaW5nJiYgZGV2aWNl SURIYXNoU2FsdCkgbXV0YWJsZSB7CisgICAgICAgIG1fcGFnZS53ZWJzaXRlRGF0YVN0b3JlKCku ZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UoKS5kZXZpY2VJZEhhc2hTYWx0Rm9yT3JpZ2luKHBlbmRp bmdSZXF1ZXN0LnZhbHVlKCktPnVzZXJNZWRpYURvY3VtZW50U2VjdXJpdHlPcmlnaW4oKSwgcGVu ZGluZ1JlcXVlc3QudmFsdWUoKS0+dG9wTGV2ZWxEb2N1bWVudFNlY3VyaXR5T3JpZ2luKCksIFt2 YWxpZEhhbmRsZXIgPSBXVEZNb3ZlKHZhbGlkSGFuZGxlciksIGludmFsaWRIYW5kbGVyID0gV1RG TW92ZShpbnZhbGlkSGFuZGxlciksIGxvY2FsVXNlclJlcXVlc3QgPSBsb2NhbFVzZXJSZXF1ZXN0 XSAoU3RyaW5nJiYgZGV2aWNlSURIYXNoU2FsdCkgbXV0YWJsZSB7CiAgICAgICAgICAgICBSZWFs dGltZU1lZGlhU291cmNlQ2VudGVyOjpzaW5nbGV0b24oKS52YWxpZGF0ZVJlcXVlc3RDb25zdHJh aW50cyhXVEZNb3ZlKHZhbGlkSGFuZGxlciksIFdURk1vdmUoaW52YWxpZEhhbmRsZXIpLCBXVEZN b3ZlKGxvY2FsVXNlclJlcXVlc3QpLCBXVEZNb3ZlKGRldmljZUlESGFzaFNhbHQpKTsKICAgICAg ICAgfSk7CiAgICAgfTsKQEAgLTQxMCwxMSArNDEwLDYgQEAgdm9pZCBVc2VyTWVkaWFQZXJtaXNz aW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6cmVxdWVzdFVzZXJNZWRpYVBlcm1pc3Npb25Gb3JGcmFt ZSgKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQogdm9pZCBVc2VyTWVkaWFQZXJtaXNzaW9uUmVx dWVzdE1hbmFnZXJQcm94eTo6Z2V0VXNlck1lZGlhUGVybWlzc2lvbkluZm8odWludDY0X3QgcmVx dWVzdElELCB1aW50NjRfdCBmcmFtZUlELCBVc2VyTWVkaWFQZXJtaXNzaW9uQ2hlY2tQcm94eTo6 Q29tcGxldGlvbkhhbmRsZXImJiBoYW5kbGVyLCBSZWY8U2VjdXJpdHlPcmlnaW4+JiYgdXNlck1l ZGlhRG9jdW1lbnRPcmlnaW4sIFJlZjxTZWN1cml0eU9yaWdpbj4mJiB0b3BMZXZlbERvY3VtZW50 T3JpZ2luKQogewotICAgIGlmICghbV9wYWdlLndlYnNpdGVEYXRhU3RvcmUoKS5kZXZpY2VJZEhh c2hTYWx0U3RvcmFnZSgpKSB7Ci0gICAgICAgIGhhbmRsZXIoZmFsc2UpOwotICAgICAgICByZXR1 cm47Ci0gICAgfQotCiAgICAgYXV0byB1c2VyTWVkaWFPcmlnaW4gPSBBUEk6OlNlY3VyaXR5T3Jp Z2luOjpjcmVhdGUodXNlck1lZGlhRG9jdW1lbnRPcmlnaW4uZ2V0KCkpOwogICAgIGF1dG8gdG9w TGV2ZWxPcmlnaW4gPSBBUEk6OlNlY3VyaXR5T3JpZ2luOjpjcmVhdGUodG9wTGV2ZWxEb2N1bWVu dE9yaWdpbi5nZXQoKSk7CiAgICAgYXV0byByZXF1ZXN0ID0gVXNlck1lZGlhUGVybWlzc2lvbkNo ZWNrUHJveHk6OmNyZWF0ZShmcmFtZUlELCBXVEZNb3ZlKGhhbmRsZXIpLCBXVEZNb3ZlKHVzZXJN ZWRpYURvY3VtZW50T3JpZ2luKSwgV1RGTW92ZSh0b3BMZXZlbERvY3VtZW50T3JpZ2luKSk7CkBA IC00NTksMTQgKzQ1NCwxOCBAQCB2b2lkIFVzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdl clByb3h5OjplbnVtZXJhdGVNZWRpYURldmljZXNGb3JGcmFtZSh1aW50NgogCiAgICAgYXV0byBy ZXF1ZXN0SUQgPSBnZW5lcmF0ZVJlcXVlc3RJRCgpOwogICAgIGF1dG8gY29tcGxldGlvbkhhbmRs ZXIgPSBbdGhpcywgcmVxdWVzdElELCB1c2VyTWVkaWFJRCwgcmVxdWVzdE9yaWdpbiA9IHVzZXJN ZWRpYURvY3VtZW50T3JpZ2luLmNvcHlSZWYoKSwgdG9wT3JpZ2luID0gdG9wTGV2ZWxEb2N1bWVu dE9yaWdpbi5jb3B5UmVmKCldKGJvb2wgb3JpZ2luSGFzUGVyc2lzdGVudEFjY2VzcykgewotICAg ICAgICBtX3BhZ2Uud2Vic2l0ZURhdGFTdG9yZSgpLmRldmljZUlkSGFzaFNhbHRTdG9yYWdlKCkt PmRldmljZUlkSGFzaFNhbHRGb3JPcmlnaW4ocmVxdWVzdE9yaWdpbi5nZXQoKSwgdG9wT3JpZ2lu LmdldCgpLCBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyksIHJlcXVlc3RJRCwg dXNlck1lZGlhSUQsICZvcmlnaW5IYXNQZXJzaXN0ZW50QWNjZXNzXSAoU3RyaW5nJiYgZGV2aWNl SURIYXNoU2FsdCkgeworCisgICAgICAgIGlmICghbV9wYWdlLmlzVmFsaWQoKSkKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICBtX3BhZ2Uud2Vic2l0ZURhdGFTdG9yZSgpLmRldmljZUlk SGFzaFNhbHRTdG9yYWdlKCkuZGV2aWNlSWRIYXNoU2FsdEZvck9yaWdpbihyZXF1ZXN0T3JpZ2lu LmdldCgpLCB0b3BPcmlnaW4uZ2V0KCksIFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0 aGlzKSwgcmVxdWVzdElELCB1c2VyTWVkaWFJRCwgJm9yaWdpbkhhc1BlcnNpc3RlbnRBY2Nlc3Nd IChTdHJpbmcmJiBkZXZpY2VJREhhc2hTYWx0KSB7CiAgICAgICAgICAgICBpZiAoIXdlYWtUaGlz KQogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIGF1dG8gcGVuZGluZ1JlcXVl c3QgPSBtX3BlbmRpbmdEZXZpY2VSZXF1ZXN0cy50YWtlKHJlcXVlc3RJRCk7CiAgICAgICAgICAg ICBpZiAoIXBlbmRpbmdSZXF1ZXN0KQogICAgICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAg ICAgICAgaWYgKCFtX3BhZ2UuaXNWYWxpZCgpIHx8ICFtX3BhZ2Uud2Vic2l0ZURhdGFTdG9yZSgp LmRldmljZUlkSGFzaFNhbHRTdG9yYWdlKCkpCisgICAgICAgICAgICBpZiAoIW1fcGFnZS5pc1Zh bGlkKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgICAgICBzeW5jV2l0aFdl YkNvcmVQcmVmcygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0 ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJz aXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRleCA0ZDdmNTExNGY4MjhjYmYzZTUwZTJl NTEzODcwOWIyNzZiY2I1MjYyLi4wYWFiYmU0OGRiMTM1ZDg2YmYyODRiMDU1NDIxNDNhMTdiZDhl OWEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJz aXRlRGF0YVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApAQCAtMTA5LDYgKzEwOSw3IEBAIFdlYnNpdGVEYXRhU3Rv cmU6OldlYnNpdGVEYXRhU3RvcmUoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklEKQogICAgIDogbV9z ZXNzaW9uSUQoc2Vzc2lvbklEKQogICAgICwgbV9yZXNvbHZlZENvbmZpZ3VyYXRpb24oV2Vic2l0 ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb246OmNyZWF0ZSgpKQogICAgICwgbV9jb25maWd1cmF0aW9u KG1fcmVzb2x2ZWRDb25maWd1cmF0aW9uLT5jb3B5KCkpCisgICAgLCBtX2RldmljZUlkSGFzaFNh bHRTdG9yYWdlKERldmljZUlkSGFzaFNhbHRTdG9yYWdlOjpjcmVhdGUoaXNQZXJzaXN0ZW50KCkg PyBtX2NvbmZpZ3VyYXRpb24tPmRldmljZUlkSGFzaFNhbHRzU3RvcmFnZURpcmVjdG9yeSgpIDog U3RyaW5nKCkpKQogICAgICwgbV9xdWV1ZShXb3JrUXVldWU6OmNyZWF0ZSgiY29tLmFwcGxlLldl YktpdC5XZWJzaXRlRGF0YVN0b3JlIikpCiAjaWYgRU5BQkxFKFdFQl9BVVRITikKICAgICAsIG1f YXV0aGVudGljYXRvck1hbmFnZXIobWFrZVVuaXF1ZVJlZjxBdXRoZW50aWNhdG9yTWFuYWdlcj4o KSkKQEAgLTQ4Niw3ICs0ODcsNyBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmZldGNoRGF0YUFu ZEFwcGx5KE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+IGRhdGFUeXBlcywgTwogICAgICAgICB9 KTsKICAgICB9CiAKLSAgICBpZiAobV9kZXZpY2VJZEhhc2hTYWx0U3RvcmFnZSAmJiBkYXRhVHlw ZXMuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpEZXZpY2VJZEhhc2hTYWx0KSkgeworICAgIGlm IChkYXRhVHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpEZXZpY2VJZEhhc2hTYWx0KSkg ewogICAgICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPmFkZFBlbmRpbmdDYWxsYmFjaygpOwogCiAg ICAgICAgIG1fZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UtPmdldERldmljZUlkSGFzaFNhbHRPcmln aW5zKFtjYWxsYmFja0FnZ3JlZ2F0b3JdKGF1dG8mJiBvcmlnaW5zKSB7CkBAIC04MTQsNyArODE1 LDcgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKE9wdGlvblNldDxXZWJzaXRl RGF0YVR5cGU+IGRhdGFUeXBlcywgV2FsbFRpbWUKICAgICAgICAgfSk7CiAgICAgfQogCi0gICAg aWYgKG1fZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UgJiYgKGRhdGFUeXBlcy5jb250YWlucyhXZWJz aXRlRGF0YVR5cGU6OkRldmljZUlkSGFzaFNhbHQpIHx8IChkYXRhVHlwZXMuY29udGFpbnMoV2Vi c2l0ZURhdGFUeXBlOjpDb29raWVzKSkpKSB7CisgICAgaWYgKGRhdGFUeXBlcy5jb250YWlucyhX ZWJzaXRlRGF0YVR5cGU6OkRldmljZUlkSGFzaFNhbHQpIHx8IChkYXRhVHlwZXMuY29udGFpbnMo V2Vic2l0ZURhdGFUeXBlOjpDb29raWVzKSkpIHsKICAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9y LT5hZGRQZW5kaW5nQ2FsbGJhY2soKTsKIAogICAgICAgICBtX2RldmljZUlkSGFzaFNhbHRTdG9y YWdlLT5kZWxldGVEZXZpY2VJZEhhc2hTYWx0T3JpZ2luc01vZGlmaWVkU2luY2UobW9kaWZpZWRT aW5jZSwgW2NhbGxiYWNrQWdncmVnYXRvcl0gewpAQCAtMTA5Niw3ICsxMDk3LDcgQEAgdm9pZCBX ZWJzaXRlRGF0YVN0b3JlOjpyZW1vdmVEYXRhKE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+IGRh dGFUeXBlcywgY29uc3QgVmUKICAgICAgICAgfSk7CiAgICAgfQogCi0gICAgaWYgKG1fZGV2aWNl SWRIYXNoU2FsdFN0b3JhZ2UgJiYgKGRhdGFUeXBlcy5jb250YWlucyhXZWJzaXRlRGF0YVR5cGU6 OkRldmljZUlkSGFzaFNhbHQpIHx8IChkYXRhVHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBl OjpDb29raWVzKSkpKSB7CisgICAgaWYgKGRhdGFUeXBlcy5jb250YWlucyhXZWJzaXRlRGF0YVR5 cGU6OkRldmljZUlkSGFzaFNhbHQpIHx8IChkYXRhVHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFU eXBlOjpDb29raWVzKSkpIHsKICAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5hZGRQZW5kaW5n Q2FsbGJhY2soKTsKIAogICAgICAgICBtX2RldmljZUlkSGFzaFNhbHRTdG9yYWdlLT5kZWxldGVE ZXZpY2VJZEhhc2hTYWx0Rm9yT3JpZ2lucyhvcmlnaW5zLCBbY2FsbGJhY2tBZ2dyZWdhdG9yXSB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRl RGF0YVN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRl RGF0YVN0b3JlLmgKaW5kZXggN2M1MzQzZTIxNTg1OTQwNzljMjA4NjgyOWMwOWJiZjdiZDEzY2My ZC4uOTEyZDhlNDc1Y2Q2YTIxNzk5OWEwOTAxNzhlYjY1OGZjMjE3OWM2OSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUu aApAQCAtMTQyLDcgKzE0Miw3IEBAIHB1YmxpYzoKIAogICAgIFN0b3JhZ2VNYW5hZ2VyKiBzdG9y YWdlTWFuYWdlcigpIHsgcmV0dXJuIG1fc3RvcmFnZU1hbmFnZXIuZ2V0KCk7IH0KIAotICAgIERl dmljZUlkSGFzaFNhbHRTdG9yYWdlKiBkZXZpY2VJZEhhc2hTYWx0U3RvcmFnZSgpIHsgcmV0dXJu IG1fZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UuZ2V0KCk7IH0KKyAgICBEZXZpY2VJZEhhc2hTYWx0 U3RvcmFnZSYgZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2UoKSB7IHJldHVybiBtX2RldmljZUlkSGFz aFNhbHRTdG9yYWdlLmdldCgpOyB9CiAKICAgICBXZWJQcm9jZXNzUG9vbCogcHJvY2Vzc1Bvb2xG b3JDb29raWVTdG9yYWdlT3BlcmF0aW9ucygpOwogICAgIGJvb2wgaXNBc3NvY2lhdGVkUHJvY2Vz c1Bvb2woV2ViUHJvY2Vzc1Bvb2wmKSBjb25zdDsKQEAgLTIyOCw3ICsyMjgsNyBAQCBwcml2YXRl OgogICAgIGJvb2wgbV9oYXNSZXNvbHZlZERpcmVjdG9yaWVzIHsgZmFsc2UgfTsKIAogICAgIGNv bnN0IFJlZlB0cjxTdG9yYWdlTWFuYWdlcj4gbV9zdG9yYWdlTWFuYWdlcjsKLSAgICBjb25zdCBS ZWZQdHI8RGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2U+IG1fZGV2aWNlSWRIYXNoU2FsdFN0b3JhZ2U7 CisgICAgY29uc3QgUmVmPERldmljZUlkSGFzaFNhbHRTdG9yYWdlPiBtX2RldmljZUlkSGFzaFNh bHRTdG9yYWdlOwogICAgIFJlZlB0cjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU+IG1f cmVzb3VyY2VMb2FkU3RhdGlzdGljczsKICAgICBib29sIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGlj c0RlYnVnTW9kZSB7IGZhbHNlIH07CiAK