170121 2017-03-27 10:49:49 -0700 webkitpy: Use host pattern for devices 2017-03-28 07:06:57 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard buildbot commit-queue dbates ddkilzer glenn lforschler webkit-bug-importer oldest_to_newest 1291521 0 jbedard 2017-03-27 10:49:49 -0700 To maximize code re-use, devices should have all of the same qualities as a host object, allowing devices to be passed to functions expecting a host. 1291524 1 305484 jbedard 2017-03-27 10:51:16 -0700 Created attachment 305484 Patch 1291525 2 webkit-bug-importer 2017-03-27 10:51:29 -0700 <rdar://problem/31277095> 1291619 3 305484 dbates 2017-03-27 14:20:29 -0700 Comment on attachment 305484 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=305484&action=review > Tools/ChangeLog:9 > + throughout webkitpy. Add the needed properties and This sentence does not read well. > Tools/Scripts/webkitpy/port/device.py:36 > + try: Is it necessary to use a try-catch? I do not see the harm in having a Python exception thrown if this property does not exist in the platform device. Such an exception would tell us either that we need to implement this functionality or that the caller must conditionalize the call to this property. > Tools/Scripts/webkitpy/port/device.py:43 > + try: Ditto. > Tools/Scripts/webkitpy/port/device.py:50 > + try: Ditto > Tools/Scripts/webkitpy/port/device.py:57 > + try: Ditto. > Tools/Scripts/webkitpy/port/device.py:64 > + try: Ditto. 1291639 4 305516 jbedard 2017-03-27 15:03:42 -0700 Created attachment 305516 Patch 1291888 5 305516 commit-queue 2017-03-28 07:06:53 -0700 Comment on attachment 305516 Patch Clearing flags on attachment: 305516 Committed r214473: <http://trac.webkit.org/changeset/214473> 1291889 6 commit-queue 2017-03-28 07:06:57 -0700 All reviewed patches have been landed. Closing bug. 305484 2017-03-27 10:51:16 -0700 2017-03-27 15:03:40 -0700 Patch bug-170121-20170327105114.patch text/plain 6253 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNDQxNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDE3LTAzLTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogVXNlIGhvc3QgcGF0dGVybiBmb3IgZGV2aWNlcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMTIxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRGV2aWNlcyBzaG91 bGQgYmUgYWJsZSB0byBiZSB0cmVhdGVkIGxpa2UgaG9zdHMKKyAgICAgICAgdGhyb3VnaG91dCB3 ZWJraXRweS4gIEFkZCB0aGUgbmVlZGVkIHByb3BlcnRpZXMgYW5kCisgICAgICAgIHVzZSBleGVj dXRpdmUgb3ZlciBjdXN0b20gaW1wbGVtZW50ZWQgcG9sbGluZy9raWxsaW5nCisgICAgICAgIGZ1 bmN0aW9ucy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9kZXZpY2UucHk6Cisg ICAgICAgIChEZXZpY2UpOgorICAgICAgICAoRGV2aWNlLmV4ZWN1dGl2ZSk6IEFkZCBvcHRpb25h bCBleGVjdXRpdmUgcHJvcGVydHkuCisgICAgICAgIChEZXZpY2UuZmlsZXN5c3RlbSk6IEFkZCBv cHRpb25hbCBmaWxlc3lzdGVtIHByb3BlcnR5LgorICAgICAgICAoRGV2aWNlLnVzZXIpOiBBZGQg b3B0aW9uYWwgdXNlciBwcm9wZXJ0eS4KKyAgICAgICAgKERldmljZS5wbGF0Zm9ybSk6IEFkZCBv cHRpb25hbCBwbGF0Zm9ybSBwcm9wZXJ0eS4KKyAgICAgICAgKERldmljZS53b3Jrc3BhY2UpOiBB ZGQgb3B0aW9uYWwgd29ya3NwYWNlIHByb3BlcnR5LgorICAgICAgICAoRGV2aWNlLnBvbGwpOiBE ZWxldGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9zaW11bGF0b3JfcHJvY2Vz cy5weToKKyAgICAgICAgKFNpbXVsYXRvclByb2Nlc3MuUG9wZW4ucG9sbCk6IFVzZSB0aGUgZGV2 aWNlcyBleGVjdXRpdmUuCisgICAgICAgIChTaW11bGF0b3JQcm9jZXNzLnN0b3ApOiBEaXR0by4K KyAgICAgICAgKFNpbXVsYXRvclByb2Nlc3MuX2tpbGwpOiBEaXR0by4KKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2UucHk6CisgICAgICAgIChTaW11bGF0 ZWREZXZpY2UuX19pbml0X18pOiBBZGQgZXhlY3V0aXZlLCBmaWxlc3lzdGVtLCB1c2VyLCBwbGF0 Zm9ybQorICAgICAgICBhbmQgd29ya3NwYWNlIHRvIHRoZSBwbGF0Zm9ybSBkZXZpY2UuCisgICAg ICAgIChTaW11bGF0ZWREZXZpY2UucG9sbCk6IERlbGV0ZWQuCisKIDIwMTctMDMtMjcgIEpvbmF0 aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IEZh aWxpbmcgdG8gaXRlcmF0ZSBvdmVyIFNpbXVsYXRvci5tYW5hZ2VkX2RldmljZXMgbWFwCkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGV2aWNlLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kZXZpY2UucHkJKHJldmlzaW9uIDIxNDQxMikKKysr IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kZXZpY2UucHkJKHdvcmtpbmcgY29weSkKQEAg LTMxLDkgKzMxLDQwIEBAIGNsYXNzIERldmljZShvYmplY3QpOgogICAgIGRlZiBsYXVuY2hfYXBw KHNlbGYsIGJ1bmRsZV9pZCwgYXJncywgZW52PU5vbmUpOgogICAgICAgICByZXR1cm4gc2VsZi5w bGF0Zm9ybV9kZXZpY2UubGF1bmNoX2FwcChidW5kbGVfaWQsIGFyZ3MsIGVudikKIAotICAgICMg RklYTUU6IFRoaXMgc2hvdWxkIGJlIGltcGxlbWVudGVkIHRocm91Z2ggYW4gZXhlY3V0aXZlCi0g ICAgZGVmIHBvbGwoc2VsZiwgcGlkKToKLSAgICAgICAgcmV0dXJuIHNlbGYucGxhdGZvcm1fZGV2 aWNlLnBvbGwocGlkKQorICAgIEBwcm9wZXJ0eQorICAgIGRlZiBleGVjdXRpdmUoc2VsZik6Cisg ICAgICAgIHRyeToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLnBsYXRmb3JtX2RldmljZS5leGVj dXRpdmUKKyAgICAgICAgZXhjZXB0OgorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKworICAgIEBw cm9wZXJ0eQorICAgIGRlZiBmaWxlc3lzdGVtKHNlbGYpOgorICAgICAgICB0cnk6CisgICAgICAg ICAgICByZXR1cm4gc2VsZi5wbGF0Zm9ybV9kZXZpY2UuZmlsZXN5c3RlbQorICAgICAgICBleGNl cHQ6CisgICAgICAgICAgICByZXR1cm4gTm9uZQorCisgICAgQHByb3BlcnR5CisgICAgZGVmIHVz ZXIoc2VsZik6CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLnBsYXRmb3Jt X2RldmljZS51c2VyCisgICAgICAgIGV4Y2VwdDoKKyAgICAgICAgICAgIHJldHVybiBOb25lCisK KyAgICBAcHJvcGVydHkKKyAgICBkZWYgcGxhdGZvcm0oc2VsZik6CisgICAgICAgIHRyeToKKyAg ICAgICAgICAgIHJldHVybiBzZWxmLnBsYXRmb3JtX2RldmljZS5wbGF0Zm9ybQorICAgICAgICBl eGNlcHQ6CisgICAgICAgICAgICByZXR1cm4gTm9uZQorCisgICAgQHByb3BlcnR5CisgICAgZGVm IHdvcmtzcGFjZShzZWxmKToKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgcmV0dXJuIHNlbGYu cGxhdGZvcm1fZGV2aWNlLndvcmtzcGFjZQorICAgICAgICBleGNlcHQ6CisgICAgICAgICAgICBy ZXR1cm4gTm9uZQogCiAgICAgQHByb3BlcnR5CiAgICAgZGVmIHVkaWQoc2VsZik6CkluZGV4OiBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvc2ltdWxhdG9yX3Byb2Nlc3MucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NpbXVsYXRvcl9wcm9jZXNzLnB5CShy ZXZpc2lvbiAyMTQ0MTIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvc2ltdWxhdG9y X3Byb2Nlc3MucHkJKHdvcmtpbmcgY29weSkKQEAgLTIxLDEzICsyMSwxMSBAQAogIyBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgogCiAKLWltcG9ydCBlcnJubwogaW1wb3J0IG9zCiBpbXBvcnQgc2lnbmFsCiBpbXBvcnQg dGltZQogCiBmcm9tIHdlYmtpdHB5LnBvcnQuc2VydmVyX3Byb2Nlc3MgaW1wb3J0IFNlcnZlclBy b2Nlc3MKLWZyb20gd2Via2l0cHkueGNvZGUuc2ltdWxhdG9yIGltcG9ydCBTaW11bGF0b3IKIAog CiBjbGFzcyBTaW11bGF0b3JQcm9jZXNzKFNlcnZlclByb2Nlc3MpOgpAQCAtNDUsNyArNDMsMTAg QEAgY2xhc3MgU2ltdWxhdG9yUHJvY2VzcyhTZXJ2ZXJQcm9jZXNzKToKICAgICAgICAgZGVmIHBv bGwoc2VsZik6CiAgICAgICAgICAgICBpZiBzZWxmLnJldHVybmNvZGU6CiAgICAgICAgICAgICAg ICAgcmV0dXJuIHNlbGYucmV0dXJuY29kZQotICAgICAgICAgICAgc2VsZi5yZXR1cm5jb2RlID0g c2VsZi5fZGV2aWNlLnBvbGwoc2VsZi5waWQpCisgICAgICAgICAgICBpZiBzZWxmLl9kZXZpY2Uu ZXhlY3V0aXZlLmNoZWNrX3J1bm5pbmdfcGlkKHNlbGYucGlkKToKKyAgICAgICAgICAgICAgICBz ZWxmLnJldHVybmNvZGUgPSBOb25lCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAg IHNlbGYucmV0dXJuY29kZSA9IDEKICAgICAgICAgICAgIHJldHVybiBzZWxmLnJldHVybmNvZGUK IAogICAgICAgICBkZWYgd2FpdChzZWxmKToKQEAgLTEyNSw5ICsxMjYsMTEgQEAgY2xhc3MgU2lt dWxhdG9yUHJvY2VzcyhTZXJ2ZXJQcm9jZXNzKToKICAgICAgICAgc2VsZi5fcHJvYyA9IFNpbXVs YXRvclByb2Nlc3MuUG9wZW4oc2VsZi5fcGlkLCBzdGRpbiwgc3Rkb3V0LCBzdGRlcnIsIHNlbGYu X2RldmljZSkKIAogICAgIGRlZiBzdG9wKHNlbGYsIHRpbWVvdXRfc2Vjcz0zLjApOgotICAgICAg ICB0cnk6Ci0gICAgICAgICAgICBvcy5raWxsKHNlbGYuX3BpZCwgc2lnbmFsLlNJR1RFUk0pCi0g ICAgICAgIGV4Y2VwdCBPU0Vycm9yIGFzIGVycjoKLSAgICAgICAgICAgIGFzc2VydCBlcnIuZXJy bm8gPT0gZXJybm8uRVNSQ0gKLSAgICAgICAgICAgIHBhc3MKKyAgICAgICAgaWYgc2VsZi5fcHJv YzoKKyAgICAgICAgICAgIHNlbGYuX2RldmljZS5leGVjdXRpdmUua2lsbF9wcm9jZXNzKHNlbGYu X3Byb2MucGlkKQogICAgICAgICByZXR1cm4gc3VwZXIoU2ltdWxhdG9yUHJvY2Vzcywgc2VsZiku c3RvcCh0aW1lb3V0X3NlY3MpCisKKyAgICBkZWYgX2tpbGwoc2VsZik6CisgICAgICAgIHNlbGYu X2RldmljZS5leGVjdXRpdmUua2lsbF9wcm9jZXNzKHNlbGYuX3Byb2MucGlkKQorICAgICAgICBp ZiBzZWxmLl9wcm9jLnBvbGwoKSBpcyBub3QgTm9uZToKKyAgICAgICAgICAgIHNlbGYuX3Byb2Mu d2FpdCgpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRlZF9kZXZp Y2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0 ZWRfZGV2aWNlLnB5CShyZXZpc2lvbiAyMTQ0MTIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2UucHkJKHdvcmtpbmcgY29weSkKQEAgLTIwLDggKzIwLDYg QEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMKICMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBP RiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKLWltcG9ydCBlcnJubwotaW1wb3J0 IG9zCiBpbXBvcnQgbG9nZ2luZwogaW1wb3J0IHJlCiBpbXBvcnQgc2lnbmFsCkBAIC01Nyw2ICs1 NSwxMiBAQCBjbGFzcyBTaW11bGF0ZWREZXZpY2Uob2JqZWN0KToKICAgICAgICAgc2VsZi5uYW1l ID0gbmFtZQogICAgICAgICBzZWxmLnVkaWQgPSB1ZGlkCiAKKyAgICAgICAgc2VsZi5leGVjdXRp dmUgPSBob3N0LmV4ZWN1dGl2ZQorICAgICAgICBzZWxmLmZpbGVzeXN0ZW0gPSBob3N0LmZpbGVz eXN0ZW0KKyAgICAgICAgc2VsZi51c2VyID0gTm9uZQorICAgICAgICBzZWxmLnBsYXRmb3JtID0g aG9zdC5wbGF0Zm9ybQorICAgICAgICBzZWxmLndvcmtzcGFjZSA9IGhvc3Qud29ya3NwYWNlCisK ICAgICBAcHJvcGVydHkKICAgICBkZWYgc3RhdGUoc2VsZik6CiAgICAgICAgICIiIgpAQCAtMTgw LDcgKzE4NCw3IEBAIGNsYXNzIFNpbXVsYXRlZERldmljZShvYmplY3QpOgogICAgICAgICAgICAg KQogICAgICAgICAgICAgbWF0Y2ggPSByZS5tYXRjaChyJyg/UDxidW5kbGU+W146XSspOiAoP1A8 cGlkPlxkKylcbicsIG91dHB1dCkKICAgICAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZG4ndCBu ZWVkIHRvIGNoZWNrIHRoZSBQSUQgPHJkYXI6Ly9wcm9ibGVtLzMxMTU0MDc1Pi4KLSAgICAgICAg ICAgIGlmIG1hdGNoIGFuZCBzZWxmLnBvbGwoaW50KG1hdGNoLmdyb3VwKCdwaWQnKSkpIGlzIE5v bmU6CisgICAgICAgICAgICBpZiBtYXRjaCBhbmQgc2VsZi5leGVjdXRpdmUuY2hlY2tfcnVubmlu Z19waWQoaW50KG1hdGNoLmdyb3VwKCdwaWQnKSkpOgogICAgICAgICAgICAgICAgIGJyZWFrCiAK ICAgICAgICAgc2lnbmFsLmFsYXJtKDApICAjIENhbmNlbCBhbGFybQpAQCAtMTg5LDE0ICsxOTMs NiBAQCBjbGFzcyBTaW11bGF0ZWREZXZpY2Uob2JqZWN0KToKICAgICAgICAgICAgIHJhaXNlIFJ1 bnRpbWVFcnJvcignRmFpbGVkIHRvIGZpbmQgcHJvY2VzcyBpZCBmb3Ige306IHt9Jy5mb3JtYXQo YnVuZGxlX2lkLCBvdXRwdXQpKQogICAgICAgICByZXR1cm4gaW50KG1hdGNoLmdyb3VwKCdwaWQn KSkKIAotICAgIGRlZiBwb2xsKHNlbGYsIHBpZCk6Ci0gICAgICAgIHRyeToKLSAgICAgICAgICAg IG9zLmtpbGwocGlkLCAwKQotICAgICAgICBleGNlcHQgT1NFcnJvciBhcyBlcnI6Ci0gICAgICAg ICAgICBhc3NlcnQgZXJyLmVycm5vID09IGVycm5vLkVTUkNICi0gICAgICAgICAgICByZXR1cm4g MQotICAgICAgICByZXR1cm4gTm9uZQotCiAgICAgZGVmIF9fZXFfXyhzZWxmLCBvdGhlcik6CiAg ICAgICAgIHJldHVybiBzZWxmLnVkaWQgPT0gb3RoZXIudWRpZAogCg== 305516 2017-03-27 15:03:42 -0700 2017-03-28 07:06:53 -0700 Patch bug-170121-20170327150342.patch text/plain 5963 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNDQzMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDE3LTAzLTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogVXNlIGhvc3QgcGF0dGVybiBmb3IgZGV2aWNlcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMTIxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRGFuaWVsIEJhdGVzLgorCisgICAgICAgIERldmljZXMgc2hvdWxk IGJlIHRyZWF0ZWQgbGlrZSBob3N0cyB0aHJvdWdob3V0IHdlYmtpdHB5CisgICAgICAgIHNvIHRo YXQgbW9yZSBjb2RlIGNhbiBiZSByZS11c2VkLiAgQWRkIHRoZSBuZWVkZWQgcHJvcGVydGllcwor ICAgICAgICBhbmQgdXNlIGV4ZWN1dGl2ZSBvdmVyIGN1c3RvbSBpbXBsZW1lbnRlZCBwb2xsaW5n L2tpbGxpbmcKKyAgICAgICAgZnVuY3Rpb25zLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9wb3J0L2RldmljZS5weToKKyAgICAgICAgKERldmljZSk6CisgICAgICAgIChEZXZpY2UuZXhl Y3V0aXZlKTogQWRkIG9wdGlvbmFsIGV4ZWN1dGl2ZSBwcm9wZXJ0eS4KKyAgICAgICAgKERldmlj ZS5maWxlc3lzdGVtKTogQWRkIG9wdGlvbmFsIGZpbGVzeXN0ZW0gcHJvcGVydHkuCisgICAgICAg IChEZXZpY2UudXNlcik6IEFkZCBvcHRpb25hbCB1c2VyIHByb3BlcnR5LgorICAgICAgICAoRGV2 aWNlLnBsYXRmb3JtKTogQWRkIG9wdGlvbmFsIHBsYXRmb3JtIHByb3BlcnR5LgorICAgICAgICAo RGV2aWNlLndvcmtzcGFjZSk6IEFkZCBvcHRpb25hbCB3b3Jrc3BhY2UgcHJvcGVydHkuCisgICAg ICAgIChEZXZpY2UucG9sbCk6IERlbGV0ZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9w b3J0L3NpbXVsYXRvcl9wcm9jZXNzLnB5OgorICAgICAgICAoU2ltdWxhdG9yUHJvY2Vzcy5Qb3Bl bi5wb2xsKTogVXNlIHRoZSBkZXZpY2VzIGV4ZWN1dGl2ZS4KKyAgICAgICAgKFNpbXVsYXRvclBy b2Nlc3Muc3RvcCk6IERpdHRvLgorICAgICAgICAoU2ltdWxhdG9yUHJvY2Vzcy5fa2lsbCk6IERp dHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2RldmljZS5w eToKKyAgICAgICAgKFNpbXVsYXRlZERldmljZS5fX2luaXRfXyk6IEFkZCBleGVjdXRpdmUsIGZp bGVzeXN0ZW0sIHVzZXIsIHBsYXRmb3JtCisgICAgICAgIGFuZCB3b3Jrc3BhY2UgdG8gdGhlIHBs YXRmb3JtIGRldmljZS4KKyAgICAgICAgKFNpbXVsYXRlZERldmljZS5wb2xsKTogRGVsZXRlZC4K KwogMjAxNy0wMy0yNyAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAg ICAgICAgd2Via2l0cHk6IExvb2sgZm9yICdpb3MnIHRlc3QgZXhwZWN0YXRpb25zIGZvciBJT1NQ b3J0cwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RldmljZS5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGV2aWNlLnB5CShyZXZpc2lvbiAy MTQ0MzIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGV2aWNlLnB5CSh3b3JraW5n IGNvcHkpCkBAIC0zMSw5ICszMSwyNSBAQCBjbGFzcyBEZXZpY2Uob2JqZWN0KToKICAgICBkZWYg bGF1bmNoX2FwcChzZWxmLCBidW5kbGVfaWQsIGFyZ3MsIGVudj1Ob25lKToKICAgICAgICAgcmV0 dXJuIHNlbGYucGxhdGZvcm1fZGV2aWNlLmxhdW5jaF9hcHAoYnVuZGxlX2lkLCBhcmdzLCBlbnYp CiAKLSAgICAjIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBpbXBsZW1lbnRlZCB0aHJvdWdoIGFuIGV4 ZWN1dGl2ZQotICAgIGRlZiBwb2xsKHNlbGYsIHBpZCk6Ci0gICAgICAgIHJldHVybiBzZWxmLnBs YXRmb3JtX2RldmljZS5wb2xsKHBpZCkKKyAgICBAcHJvcGVydHkKKyAgICBkZWYgZXhlY3V0aXZl KHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5wbGF0Zm9ybV9kZXZpY2UuZXhlY3V0aXZlCisK KyAgICBAcHJvcGVydHkKKyAgICBkZWYgZmlsZXN5c3RlbShzZWxmKToKKyAgICAgICAgcmV0dXJu IHNlbGYucGxhdGZvcm1fZGV2aWNlLmZpbGVzeXN0ZW0KKworICAgIEBwcm9wZXJ0eQorICAgIGRl ZiB1c2VyKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5wbGF0Zm9ybV9kZXZpY2UudXNlcgor CisgICAgQHByb3BlcnR5CisgICAgZGVmIHBsYXRmb3JtKHNlbGYpOgorICAgICAgICByZXR1cm4g c2VsZi5wbGF0Zm9ybV9kZXZpY2UucGxhdGZvcm0KKworICAgIEBwcm9wZXJ0eQorICAgIGRlZiB3 b3Jrc3BhY2Uoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLnBsYXRmb3JtX2RldmljZS53b3Jr c3BhY2UKIAogICAgIEBwcm9wZXJ0eQogICAgIGRlZiB1ZGlkKHNlbGYpOgpJbmRleDogVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L3NpbXVsYXRvcl9wcm9jZXNzLnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9zaW11bGF0b3JfcHJvY2Vzcy5weQkocmV2aXNp b24gMjE0NDMyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3NpbXVsYXRvcl9wcm9j ZXNzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMSwxMyArMjEsMTEgQEAKICMgT0YgVEhJUyBTT0ZU V0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K IAogCi1pbXBvcnQgZXJybm8KIGltcG9ydCBvcwogaW1wb3J0IHNpZ25hbAogaW1wb3J0IHRpbWUK IAogZnJvbSB3ZWJraXRweS5wb3J0LnNlcnZlcl9wcm9jZXNzIGltcG9ydCBTZXJ2ZXJQcm9jZXNz Ci1mcm9tIHdlYmtpdHB5Lnhjb2RlLnNpbXVsYXRvciBpbXBvcnQgU2ltdWxhdG9yCiAKIAogY2xh c3MgU2ltdWxhdG9yUHJvY2VzcyhTZXJ2ZXJQcm9jZXNzKToKQEAgLTQ1LDcgKzQzLDEwIEBAIGNs YXNzIFNpbXVsYXRvclByb2Nlc3MoU2VydmVyUHJvY2Vzcyk6CiAgICAgICAgIGRlZiBwb2xsKHNl bGYpOgogICAgICAgICAgICAgaWYgc2VsZi5yZXR1cm5jb2RlOgogICAgICAgICAgICAgICAgIHJl dHVybiBzZWxmLnJldHVybmNvZGUKLSAgICAgICAgICAgIHNlbGYucmV0dXJuY29kZSA9IHNlbGYu X2RldmljZS5wb2xsKHNlbGYucGlkKQorICAgICAgICAgICAgaWYgc2VsZi5fZGV2aWNlLmV4ZWN1 dGl2ZS5jaGVja19ydW5uaW5nX3BpZChzZWxmLnBpZCk6CisgICAgICAgICAgICAgICAgc2VsZi5y ZXR1cm5jb2RlID0gTm9uZQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBzZWxm LnJldHVybmNvZGUgPSAxCiAgICAgICAgICAgICByZXR1cm4gc2VsZi5yZXR1cm5jb2RlCiAKICAg ICAgICAgZGVmIHdhaXQoc2VsZik6CkBAIC0xMjUsOSArMTI2LDExIEBAIGNsYXNzIFNpbXVsYXRv clByb2Nlc3MoU2VydmVyUHJvY2Vzcyk6CiAgICAgICAgIHNlbGYuX3Byb2MgPSBTaW11bGF0b3JQ cm9jZXNzLlBvcGVuKHNlbGYuX3BpZCwgc3RkaW4sIHN0ZG91dCwgc3RkZXJyLCBzZWxmLl9kZXZp Y2UpCiAKICAgICBkZWYgc3RvcChzZWxmLCB0aW1lb3V0X3NlY3M9My4wKToKLSAgICAgICAgdHJ5 OgotICAgICAgICAgICAgb3Mua2lsbChzZWxmLl9waWQsIHNpZ25hbC5TSUdURVJNKQotICAgICAg ICBleGNlcHQgT1NFcnJvciBhcyBlcnI6Ci0gICAgICAgICAgICBhc3NlcnQgZXJyLmVycm5vID09 IGVycm5vLkVTUkNICi0gICAgICAgICAgICBwYXNzCisgICAgICAgIGlmIHNlbGYuX3Byb2M6Cisg ICAgICAgICAgICBzZWxmLl9kZXZpY2UuZXhlY3V0aXZlLmtpbGxfcHJvY2VzcyhzZWxmLl9wcm9j LnBpZCkKICAgICAgICAgcmV0dXJuIHN1cGVyKFNpbXVsYXRvclByb2Nlc3MsIHNlbGYpLnN0b3Ao dGltZW91dF9zZWNzKQorCisgICAgZGVmIF9raWxsKHNlbGYpOgorICAgICAgICBzZWxmLl9kZXZp Y2UuZXhlY3V0aXZlLmtpbGxfcHJvY2VzcyhzZWxmLl9wcm9jLnBpZCkKKyAgICAgICAgaWYgc2Vs Zi5fcHJvYy5wb2xsKCkgaXMgbm90IE5vbmU6CisgICAgICAgICAgICBzZWxmLl9wcm9jLndhaXQo KQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0ZWRfZGV2aWNlLnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2Rl dmljZS5weQkocmV2aXNpb24gMjE0NDMyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29k ZS9zaW11bGF0ZWRfZGV2aWNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMCw4ICsyMCw2IEBACiAj IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRSBPRiBUSElTCiAjIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCi1pbXBvcnQgZXJybm8KLWltcG9ydCBvcwog aW1wb3J0IGxvZ2dpbmcKIGltcG9ydCByZQogaW1wb3J0IHNpZ25hbApAQCAtNTcsNiArNTUsMTIg QEAgY2xhc3MgU2ltdWxhdGVkRGV2aWNlKG9iamVjdCk6CiAgICAgICAgIHNlbGYubmFtZSA9IG5h bWUKICAgICAgICAgc2VsZi51ZGlkID0gdWRpZAogCisgICAgICAgIHNlbGYuZXhlY3V0aXZlID0g aG9zdC5leGVjdXRpdmUKKyAgICAgICAgc2VsZi5maWxlc3lzdGVtID0gaG9zdC5maWxlc3lzdGVt CisgICAgICAgIHNlbGYudXNlciA9IE5vbmUKKyAgICAgICAgc2VsZi5wbGF0Zm9ybSA9IGhvc3Qu cGxhdGZvcm0KKyAgICAgICAgc2VsZi53b3Jrc3BhY2UgPSBob3N0LndvcmtzcGFjZQorCiAgICAg QHByb3BlcnR5CiAgICAgZGVmIHN0YXRlKHNlbGYpOgogICAgICAgICAiIiIKQEAgLTE4MCw3ICsx ODQsNyBAQCBjbGFzcyBTaW11bGF0ZWREZXZpY2Uob2JqZWN0KToKICAgICAgICAgICAgICkKICAg ICAgICAgICAgIG1hdGNoID0gcmUubWF0Y2gocicoP1A8YnVuZGxlPlteOl0rKTogKD9QPHBpZD5c ZCspXG4nLCBvdXRwdXQpCiAgICAgICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGRuJ3QgbmVlZCB0 byBjaGVjayB0aGUgUElEIDxyZGFyOi8vcHJvYmxlbS8zMTE1NDA3NT4uCi0gICAgICAgICAgICBp ZiBtYXRjaCBhbmQgc2VsZi5wb2xsKGludChtYXRjaC5ncm91cCgncGlkJykpKSBpcyBOb25lOgor ICAgICAgICAgICAgaWYgbWF0Y2ggYW5kIHNlbGYuZXhlY3V0aXZlLmNoZWNrX3J1bm5pbmdfcGlk KGludChtYXRjaC5ncm91cCgncGlkJykpKToKICAgICAgICAgICAgICAgICBicmVhawogCiAgICAg ICAgIHNpZ25hbC5hbGFybSgwKSAgIyBDYW5jZWwgYWxhcm0KQEAgLTE4OSwxNCArMTkzLDYgQEAg Y2xhc3MgU2ltdWxhdGVkRGV2aWNlKG9iamVjdCk6CiAgICAgICAgICAgICByYWlzZSBSdW50aW1l RXJyb3IoJ0ZhaWxlZCB0byBmaW5kIHByb2Nlc3MgaWQgZm9yIHt9OiB7fScuZm9ybWF0KGJ1bmRs ZV9pZCwgb3V0cHV0KSkKICAgICAgICAgcmV0dXJuIGludChtYXRjaC5ncm91cCgncGlkJykpCiAK LSAgICBkZWYgcG9sbChzZWxmLCBwaWQpOgotICAgICAgICB0cnk6Ci0gICAgICAgICAgICBvcy5r aWxsKHBpZCwgMCkKLSAgICAgICAgZXhjZXB0IE9TRXJyb3IgYXMgZXJyOgotICAgICAgICAgICAg YXNzZXJ0IGVyci5lcnJubyA9PSBlcnJuby5FU1JDSAotICAgICAgICAgICAgcmV0dXJuIDEKLSAg ICAgICAgcmV0dXJuIE5vbmUKLQogICAgIGRlZiBfX2VxX18oc2VsZiwgb3RoZXIpOgogICAgICAg ICByZXR1cm4gc2VsZi51ZGlkID09IG90aGVyLnVkaWQKIAo=