131857 2014-04-18 14:12:04 -0700 [Media] Clean up localized strings in controls 2014-04-21 11:07:00 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino calvaris commit-queue eric.carlson esprehn+autocc glenn jer.noble kondapallykalyan philipj sergio webkit-bug-importer oldest_to_newest 1002024 0 dino 2014-04-18 14:12:04 -0700 There are a few things we can clean up in string localization. - We don't really need a function to return a static table - We don't need different tables for OS X and iOS - We should have the ability to do template replacement while getting the string 1002025 1 webkit-bug-importer 2014-04-18 14:15:45 -0700 <rdar://problem/16663005> 1002027 2 229675 dino 2014-04-18 14:21:25 -0700 Created attachment 229675 Patch 1002564 3 dino 2014-04-21 11:07:00 -0700 Committed r167596: <http://trac.webkit.org/changeset/167596> 229675 2014-04-18 14:21:25 -0700 2014-04-18 14:32:02 -0700 Patch bug-131857-20140418142104.patch text/plain 15736 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY3NDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmQzNGNlMTdlZjNiZTgw MzkzZjQ2ZjI0YjY0NDAwYzcwNWIyMDJmZS4uNmRkNTE0YmMxNTAwZGVhZGFkNTg3YzdhOTExNjE0 MjA2NDAzNjVhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE0LTA0LTE4ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBbTWVkaWFdIENsZWFuIHVwIGxv Y2FsaXplZCBzdHJpbmdzIGluIGNvbnRyb2xzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE4NTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2NjYz MDA1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo ZXJlIGlzIG5vIG5lZWQgZm9yIHNlcGFyYXRlIGxvY2FsaXphdGlvbiBmaWxlcworICAgICAgICBv biBPUyBYIGFuZCBpT1MuIE1vdmUgdGhlIHNtYWxsIG51bWJlciBvZiBpT1Mtc3BlY2lmaWMKKyAg ICAgICAgbG9jYWxpemF0aW9ucyBpbnRvIGEgc2hhcmVkIGZpbGUuCisKKyAgICAgICAgV2UgYWxz byBkb24ndCBuZWVkIGEgZnVuY3Rpb24gdG8gcmV0dXJuIGEgc3RhdGljIHRhYmxlLgorICAgICAg ICBVbHRpbWF0ZWx5IEkgdGhpbmsgd2Ugd2FudCBhIHRvcC1sZXZlbCBXZWJLaXQgb2JqZWN0IHRo YXQKKyAgICAgICAgaG9sZCB0aGUgdGFibGUsIGJ1dCBmb3Igbm93IHVzZSBhIGdsb2JhbCB2YXJp YWJsZQorICAgICAgICBjYWxsZWQgVUlTdHJpbmdUYWJsZS4gU2luY2Ugd2UncmUgaW4gYW4gaXNv bGF0ZWQgd29ybGQsIHdlCisgICAgICAgIHdvbid0IGNsYXNoIHdpdGggYW55dGhpbmcuCisKKyAg ICAgICAgSSBub3RpY2VkIGEgZmV3IGNhc2VzIHdlcmUgd2UgZ3JhYiBhIGxvY2FsaXplZCBzdHJp bmcgYW5kCisgICAgICAgIHRoZW4gaW5zdGFudGx5IHJ1biBhIHJlcGxhY2VtZW50IG9uIGl0LiBU aGlzIHNob3VsZCBiZQorICAgICAgICBzdXBwb3J0ZWQgZGlyZWN0bHkgaW4gdGhlIFVJU3RyaW5n KCkgYWNjZXNzb3IuCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL21lZGlhQ29udHJvbHNMb2Nh bGl6ZWRTdHJpbmdzLmpzOiBBZGQgaU9TIHN0cmluZ3MuIEp1c3QKKyAgICAgICAgdXNlIGEgc3Rh dGljIHRhYmxlLgorICAgICAgICAobWVkaWFDb250cm9sc0xvY2FsaXplZFN0cmluZ3MpOiBEZWxl dGVkLgorICAgICAgICAqIEVuZ2xpc2gubHByb2ovbWVkaWFDb250cm9sc0xvY2FsaXplZFN0cmlu Z3NpT1MuanM6IFJlbW92ZWQuCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlh Q29udHJvbHNBcHBsZS5qczoKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLmV4dGVuZCk6 IEZpeCBicmFjZXMuCisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS5VSVN0cmluZyk6IFVz ZSB0aGUgc3RyaW5nIHRhYmxlLCBhbmQgYWxsb3cgcmVwbGFjZW1lbnQuCisgICAgICAgIChDb250 cm9sbGVyLnByb3RvdHlwZS5jcmVhdGVDb250cm9scyk6IFVzZSBuZXcgVUlTdHJpbmcgcmVwbGFj ZW1lbnQuCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1Mu anM6CisgICAgICAgIChDb250cm9sbGVySU9TLnByb3RvdHlwZS51cGRhdGVXaXJlbGVzc1BsYXli YWNrU3RhdHVzKTogVXNlIG5ldyBVSVN0cmluZy4KKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJv dG90eXBlLlVJU3RyaW5nKTogRGVsZXRlZC4gVXNlIHRoZSBwYXJlbnQgY2xhc3MgdmVyc2lvbi4K KyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6IFJlbW92ZSBmaWxl IGZyb20gUmVzb3VyY2VzLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lSU9TOjptZWRpYUNvbnRyb2xzU2NyaXB0KTog Tm8gbmVlZCB0byBpbmNsdWRlIHRoZSBpT1MKKyAgICAgICAgc3BlY2lmaWMgbG9jYWxpemF0aW9u IGZpbGUuCisKIDIwMTQtMDQtMTggIEdhYm9yIFJhcGNzYW55aSAgPHJnYWJvckB3ZWJraXQub3Jn PgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEFSTTY0IGJ1aWxkZml4IGFmdGVyIHIxNjc0NzMuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL21lZGlhQ29udHJvbHNMb2Nh bGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJvai9tZWRpYUNvbnRy b2xzTG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBiMzQyYjJhZmY0ZjMzYjVjZWIzNzlhNThhMmQ0 NDRlMmQ5YmI1NGY0Li42YTNmOTdiYmJjNDcyNTg1YWJjMGNmZmUxMDdmMmQxNWYwYzAwNDYyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL21lZGlhQ29udHJvbHNMb2Nh bGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbWVkaWFD b250cm9sc0xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTEsMjkgKzEsMzMgQEAKLWZ1bmN0aW9uIG1l ZGlhQ29udHJvbHNMb2NhbGl6ZWRTdHJpbmdzKCkgewotICAgIHJldHVybiB7Ci0gICAgICAgICdB Ym9ydGVkJzogJ0Fib3J0ZWQnLAotICAgICAgICAnQXVkaW8gUGxheWJhY2snOiAnQXVkaW8gUGxh eWJhY2snLAotICAgICAgICAnQ2FwdGlvbnMnOiAnQ2FwdGlvbnMnLAotICAgICAgICAnRGlzcGxh eSBGdWxsIFNjcmVlbic6ICdEaXNwbGF5IEZ1bGwgU2NyZWVuJywKLSAgICAgICAgJ0R1cmF0aW9u JzogJ0R1cmF0aW9uJywKLSAgICAgICAgJ0VsYXBzZWQnOiAnRWxhcHNlZCcsCi0gICAgICAgICdF cnJvcic6ICdFcnJvcicsCi0gICAgICAgICdFeGl0IEZ1bGwgU2NyZWVuJzogJ0V4aXQgRnVsbCBT Y3JlZW4nLAotICAgICAgICAnRmFzdCBGb3J3YXJkJzogJ0Zhc3QgRm9yd2FyZCcsCi0gICAgICAg ICdMb2FkaW5nJzogJ0xvYWRpbmcnLAotICAgICAgICAnTWF4aW11bSBWb2x1bWUnOiAnTWF4aW11 bSBWb2x1bWUnLAotICAgICAgICAnTWluaW11bSBWb2x1bWUnOiAnTWluaW11bSBWb2x1bWUnLAot ICAgICAgICAnTXV0ZSc6ICdNdXRlJywKLSAgICAgICAgJ1BhdXNlJzogJ1BhdXNlJywKLSAgICAg ICAgJ1BsYXknOiAnUGxheScsCi0gICAgICAgICdSZW1haW5pbmcnOiAnUmVtYWluaW5nJywKLSAg ICAgICAgJ1Jld2luZCc6ICdSZXdpbmQnLAotICAgICAgICAnUmV3aW5kICUlc2VjJSUgU2Vjb25k cyc6ICdSZXdpbmQgJSVzZWMlJSBTZWNvbmRzJywKLSAgICAgICAgJ1N0YWxsZWQnOiAnU3RhbGxl ZCcsCi0gICAgICAgICdTdWJ0aXRsZXMnOiAnU3VidGl0bGVzJywKLSAgICAgICAgJ1N1c3BlbmRl ZCc6ICdTdXNwZW5kZWQnLAotICAgICAgICAnVW5tdXRlJzogJ1VubXV0ZScsCi0gICAgICAgICdW aWRlbyBQbGF5YmFjayc6ICdWaWRlbyBQbGF5YmFjaycsCi0gICAgICAgICdWb2x1bWUnOiAnVm9s dW1lJywKLSAgICAgICAgJ1dhaXRpbmcnOiAnV2FpdGluZycKLSAgICB9Cit2YXIgVUlTdHJpbmdU YWJsZSA9IHsKKyAgICAnIyNXSVJFTEVTU19QTEFZQkFDS19ERVZJQ0VfVFlQRSMjJzogJ0FpclBs YXknLAorICAgICcjI1dJUkVMRVNTX1BMQVlCQUNLX0RFVklDRV9OQU1FIyMnOiAnVGhpcyB2aWRl byBpcyBwbGF5aW5nIG9uIOKAnCMjREVWSUNFX05BTUUjI+KAnS4nLAorCisgICAgJyMjVFZPVVRf REVWSUNFX1RZUEUjIyc6ICdUViBDb25uZWN0ZWQnLAorICAgICcjI1RWT1VUX0RFVklDRV9OQU1F IyMnOiAnVGhpcyB2aWRlbyBpcyBwbGF5aW5nIG9uIHRoZSBUVi4nLAorCisgICAgJ0Fib3J0ZWQn OiAnQWJvcnRlZCcsCisgICAgJ0F1ZGlvIFBsYXliYWNrJzogJ0F1ZGlvIFBsYXliYWNrJywKKyAg ICAnQ2FwdGlvbnMnOiAnQ2FwdGlvbnMnLAorICAgICdEaXNwbGF5IEZ1bGwgU2NyZWVuJzogJ0Rp c3BsYXkgRnVsbCBTY3JlZW4nLAorICAgICdEdXJhdGlvbic6ICdEdXJhdGlvbicsCisgICAgJ0Vs YXBzZWQnOiAnRWxhcHNlZCcsCisgICAgJ0Vycm9yJzogJ0Vycm9yJywKKyAgICAnRXhpdCBGdWxs IFNjcmVlbic6ICdFeGl0IEZ1bGwgU2NyZWVuJywKKyAgICAnRmFzdCBGb3J3YXJkJzogJ0Zhc3Qg Rm9yd2FyZCcsCisgICAgJ0xvYWRpbmcnOiAnTG9hZGluZycsCisgICAgJ01heGltdW0gVm9sdW1l JzogJ01heGltdW0gVm9sdW1lJywKKyAgICAnTWluaW11bSBWb2x1bWUnOiAnTWluaW11bSBWb2x1 bWUnLAorICAgICdNdXRlJzogJ011dGUnLAorICAgICdQYXVzZSc6ICdQYXVzZScsCisgICAgJ1Bs YXknOiAnUGxheScsCisgICAgJ1JlbWFpbmluZyc6ICdSZW1haW5pbmcnLAorICAgICdSZXdpbmQn OiAnUmV3aW5kJywKKyAgICAnUmV3aW5kICMjc2VjIyMgU2Vjb25kcyc6ICdSZXdpbmQgIyNzZWMj IyBTZWNvbmRzJywKKyAgICAnU3RhbGxlZCc6ICdTdGFsbGVkJywKKyAgICAnU3VidGl0bGVzJzog J1N1YnRpdGxlcycsCisgICAgJ1N1c3BlbmRlZCc6ICdTdXNwZW5kZWQnLAorICAgICdVbm11dGUn OiAnVW5tdXRlJywKKyAgICAnVmlkZW8gUGxheWJhY2snOiAnVmlkZW8gUGxheWJhY2snLAorICAg ICdWb2x1bWUnOiAnVm9sdW1lJywKKyAgICAnV2FpdGluZyc6ICdXYWl0aW5nJwogfTsKXCBObyBu ZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNo Lmxwcm9qL21lZGlhQ29udHJvbHNMb2NhbGl6ZWRTdHJpbmdzaU9TLmpzIGIvU291cmNlL1dlYkNv cmUvRW5nbGlzaC5scHJvai9tZWRpYUNvbnRyb2xzTG9jYWxpemVkU3RyaW5nc2lPUy5qcwpkZWxl dGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMzk0MGIyMmM3YjNmZWM0YzdlODQxZmEyYjhkZGUx NWI1Zjc1OWY2ZC4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxwcm9qL21lZGlhQ29udHJvbHNMb2NhbGl6ZWRTdHJp bmdzaU9TLmpzCisrKyAvZGV2L251bGwKQEAgLTEsOSArMCwwIEBACi1mdW5jdGlvbiBtZWRpYUNv bnRyb2xzTG9jYWxpemVkU3RyaW5nc2lPUygpIHsKLSAgICByZXR1cm4gewotICAgICAgICAnIyNB SVJQTEFZX0RFVklDRV9UWVBFIyMnOiAnQWlyUGxheScsCi0gICAgICAgICcjI0FJUlBMQVlfREVW SUNFX05BTUUjIyc6ICdUaGlzIHZpZGVvIGlzIHBsYXlpbmcgb24g4oCcIyNERVZJQ0VfTkFNRSMj 4oCdLicsCi0KLSAgICAgICAgJyMjVFZPVVRfREVWSUNFX1RZUEUjIyc6ICdUViBDb25uZWN0ZWQn LAotICAgICAgICAnIyNUVk9VVF9ERVZJQ0VfTkFNRSMjJzogJ1RoaXMgdmlkZW8gaXMgcGxheWlu ZyBvbiB0aGUgVFYuJywKLSAgICB9Ci19OwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRy b2xzQXBwbGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFD b250cm9sc0FwcGxlLmpzCmluZGV4IDQ3N2RlNzc4MjY5NjFlZWM4MGM2ZGU5ZTg1OTQzYjVmYmQw OTVhMzUuLmU1YzY3ZjA2ZGFjY2VmZmE1YTIzMjVjNzBhMzdiMmRjNWM3NDVhOWUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBw bGUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29u dHJvbHNBcHBsZS5qcwpAQCAtOTksMjIgKzk5LDI0IEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0g ewogICAgICAgICBkb3duOiA0MAogICAgIH0sCiAKLSAgICBleHRlbmQ6IGZ1bmN0aW9uKGNoaWxk KSB7CisgICAgZXh0ZW5kOiBmdW5jdGlvbihjaGlsZCkKKyAgICB7CiAgICAgICAgIGZvciAodmFy IHByb3BlcnR5IGluIHRoaXMpIHsKICAgICAgICAgICAgIGlmICghY2hpbGQuaGFzT3duUHJvcGVy dHkocHJvcGVydHkpKQogICAgICAgICAgICAgICAgIGNoaWxkW3Byb3BlcnR5XSA9IHRoaXNbcHJv cGVydHldOwogICAgICAgICB9CiAgICAgfSwKIAotICAgIC8vIExvY2FsaXplZCBzdHJpbmcgYWNj ZXNzb3IKLSAgICBVSVN0cmluZzogZnVuY3Rpb24ocyl7Ci0gICAgICAgIGlmICghdGhpcy5sb2Nh bGl6ZWRTdHJpbmdzKQotICAgICAgICAgICAgdGhpcy5sb2NhbGl6ZWRTdHJpbmdzID0gbWVkaWFD b250cm9sc0xvY2FsaXplZFN0cmluZ3MoKTsKKyAgICBVSVN0cmluZzogZnVuY3Rpb24oZGV2ZWxv cG1lbnRTdHJpbmcsIHJlcGxhY2VTdHJpbmcsIHJlcGxhY2VtZW50U3RyaW5nKQorICAgIHsKKyAg ICAgICAgdmFyIGxvY2FsaXplZCA9IFVJU3RyaW5nVGFibGVbZGV2ZWxvcG1lbnRTdHJpbmddOwor ICAgICAgICBpZiAocmVwbGFjZVN0cmluZyAmJiByZXBsYWNlbWVudFN0cmluZykKKyAgICAgICAg ICAgIHJldHVybiBsb2NhbGl6ZWQucmVwbGFjZShyZXBsYWNlU3RyaW5nLCByZXBsYWNlbWVudFN0 cmluZyk7CiAKLSAgICAgICAgaWYgKHRoaXMubG9jYWxpemVkU3RyaW5nc1tzXSkKLSAgICAgICAg ICAgIHJldHVybiB0aGlzLmxvY2FsaXplZFN0cmluZ3Nbc107CisgICAgICAgIGlmIChsb2NhbGl6 ZWQpCisgICAgICAgICAgICByZXR1cm4gbG9jYWxpemVkOwogCi0gICAgICAgIGNvbnNvbGUuZXJy b3IoIkxvY2FsaXplZCBzdHJpbmcgXCIiICsgcyArICJcIiBub3QgZm91bmQuIik7CisgICAgICAg IGNvbnNvbGUuZXJyb3IoIkxvY2FsaXphdGlvbiBmb3Igc3RyaW5nIFwiIiArIGRldmVsb3BtZW50 U3RyaW5nICsgIlwiIG5vdCBmb3VuZC4iKTsKICAgICAgICAgcmV0dXJuICJMT0NBTElaRUQgU1RS SU5HIE5PVCBGT1VORCI7CiAgICAgfSwKIApAQCAtMjY0LDcgKzI2Niw3IEBAIENvbnRyb2xsZXIu cHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciByZXdpbmRCdXR0b24gPSB0aGlzLmNvbnRyb2xz LnJld2luZEJ1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2J1dHRvbicpOwogICAgICAg ICByZXdpbmRCdXR0b24uc2V0QXR0cmlidXRlKCdwc2V1ZG8nLCAnLXdlYmtpdC1tZWRpYS1jb250 cm9scy1yZXdpbmQtYnV0dG9uJyk7Ci0gICAgICAgIHJld2luZEJ1dHRvbi5zZXRBdHRyaWJ1dGUo J2FyaWEtbGFiZWwnLCB0aGlzLlVJU3RyaW5nKCdSZXdpbmQgJSVzZWMlJSBTZWNvbmRzJykucmVw bGFjZSgnJSVzZWMlJScsIHRoaXMuUmV3aW5kQW1vdW50KSk7CisgICAgICAgIHJld2luZEJ1dHRv bi5zZXRBdHRyaWJ1dGUoJ2FyaWEtbGFiZWwnLCB0aGlzLlVJU3RyaW5nKCdSZXdpbmQgIyNzZWMj IyBTZWNvbmRzJywgJyMjc2VjIyMnLCB0aGlzLlJld2luZEFtb3VudCkpOwogICAgICAgICB0aGlz Lmxpc3RlbkZvcihyZXdpbmRCdXR0b24sICdjbGljaycsIHRoaXMuaGFuZGxlUmV3aW5kQnV0dG9u Q2xpY2tlZCk7CiAKICAgICAgICAgdmFyIHNlZWtCYWNrQnV0dG9uID0gdGhpcy5jb250cm9scy5z ZWVrQmFja0J1dHRvbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2J1dHRvbicpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNp T1MuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9s c2lPUy5qcwppbmRleCAyOTQ2OTc5ZGFkZDFhMTQ0Y2NkNzI3YjU1ZmQ5MmI2YTUwODYwZjJiLi5m ZTkwNDkxZDZlN2VlZGIwYTY2OGUxZTE4MmIwZDk1MzdkNWE4OTIyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5q cwpAQCAtNjIsMjEgKzYyLDYgQEAgQ29udHJvbGxlcklPUy5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMuc3RvcExpc3RlbmluZ0Zvcih0aGlzLmJhc2UsICdtb3VzZW91dCcsIHRoaXMuaGFuZGxl V3JhcHBlck1vdXNlT3V0KTsKICAgICB9LAogCi0gICAgVUlTdHJpbmc6IGZ1bmN0aW9uKHMpewot ICAgICAgICB2YXIgc3RyaW5nID0gQ29udHJvbGxlci5wcm90b3R5cGUuVUlTdHJpbmcuY2FsbCh0 aGlzLCBzKTsKLSAgICAgICAgaWYgKHN0cmluZykKLSAgICAgICAgICAgIHJldHVybiBzdHJpbmc7 Ci0KLSAgICAgICAgaWYgKCF0aGlzLmxvY2FsaXplZFN0cmluZ3MpCi0gICAgICAgICAgICB0aGlz LmxvY2FsaXplZFN0cmluZ3MgPSBtZWRpYUNvbnRyb2xzTG9jYWxpemVkU3RyaW5nc2lPUygpOwot Ci0gICAgICAgIGlmICh0aGlzLmxvY2FsaXplZFN0cmluZ3Nbc10pCi0gICAgICAgICAgICByZXR1 cm4gdGhpcy5sb2NhbGl6ZWRTdHJpbmdzW3NdOwotCi0gICAgICAgIGNvbnNvbGUuZXJyb3IoIkxv Y2FsaXplZCBzdHJpbmcgXCIiICsgcyArICJcIiBub3QgZm91bmQuIik7Ci0gICAgICAgIHJldHVy biAiTE9DQUxJWkVEIFNUUklORyBOT1QgRk9VTkQiOwotICAgIH0sCi0KICAgICBzaG91bGRIYXZl U3RhcnRQbGF5YmFja0J1dHRvbjogZnVuY3Rpb24oKSB7CiAgICAgICAgIHZhciBhbGxvd3NJbmxp bmUgPSB0aGlzLmhvc3QubWVkaWFQbGF5YmFja0FsbG93c0lubGluZTsKIApAQCAtMTIxLDggKzEw Niw4IEBAIENvbnRyb2xsZXJJT1MucHJvdG90eXBlID0gewogICAgICAgICAgICAgdmFyIGRldmlj ZVR5cGUgPSAiIjsKICAgICAgICAgICAgIHZhciB0eXBlID0gdGhpcy5ob3N0LmV4dGVybmFsRGV2 aWNlVHlwZTsKICAgICAgICAgICAgIGlmICh0eXBlID09ICJhaXJwbGF5IikgewotICAgICAgICAg ICAgICAgIGRldmljZVR5cGUgPSB0aGlzLlVJU3RyaW5nKCcjI0FJUlBMQVlfREVWSUNFX1RZUEUj IycpOwotICAgICAgICAgICAgICAgIGRldmljZU5hbWUgPSB0aGlzLlVJU3RyaW5nKCcjI0FJUlBM QVlfREVWSUNFX05BTUUjIycpLnJlcGxhY2UoJyMjREVWSUNFX05BTUUjIycsIHRoaXMuaG9zdC5l eHRlcm5hbERldmljZURpc3BsYXlOYW1lKTsKKyAgICAgICAgICAgICAgICBkZXZpY2VUeXBlID0g dGhpcy5VSVN0cmluZygnIyNXSVJFTEVTU19QTEFZQkFDS19ERVZJQ0VfVFlQRSMjJyk7CisgICAg ICAgICAgICAgICAgZGV2aWNlTmFtZSA9IHRoaXMuVUlTdHJpbmcoJyMjV0lSRUxFU1NfUExBWUJB Q0tfREVWSUNFX05BTUUjIycsICcjI0RFVklDRV9OQU1FIyMnLCB0aGlzLmhvc3QuZXh0ZXJuYWxE ZXZpY2VEaXNwbGF5TmFtZSk7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKHR5cGUgPT0gInR2b3V0 IikgewogICAgICAgICAgICAgICAgIGRldmljZVR5cGUgPSB0aGlzLlVJU3RyaW5nKCcjI1RWT1VU X0RFVklDRV9UWVBFIyMnKTsKICAgICAgICAgICAgICAgICBkZXZpY2VOYW1lID0gdGhpcy5VSVN0 cmluZygnIyNUVk9VVF9ERVZJQ0VfTkFNRSMjJyk7CkBAIC00MjQsNCArNDA5LDQgQEAgQ29udHJv bGxlcklPUy5wcm90b3R5cGUgPSB7CiB9OwogCiBPYmplY3QuY3JlYXRlKENvbnRyb2xsZXIucHJv dG90eXBlKS5leHRlbmQoQ29udHJvbGxlcklPUy5wcm90b3R5cGUpOwotT2JqZWN0LmRlZmluZVBy b3BlcnR5KENvbnRyb2xsZXJJT1MucHJvdG90eXBlLCAnY29uc3RydWN0b3InLCB7IGVudW1lcmFi bGU6ZmFsc2UsIHZhbHVlOkNvbnRyb2xsZXJJT1MgfSk7CitPYmplY3QuZGVmaW5lUHJvcGVydHko Q29udHJvbGxlcklPUy5wcm90b3R5cGUsICdjb25zdHJ1Y3RvcicsIHsgZW51bWVyYWJsZTogZmFs c2UsIHZhbHVlOiBDb250cm9sbGVySU9TIH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDhhNTFkN2M0MGUyMmZkM2M5NmYzYWUw NTQ1YWVlMmI1ZDc0ZjMwOTQuLmZhM2RkZDhiNTBjMjNlYWJhY2I3NDBjMzczZGRhZmMyN2NjMGYx YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKQEAgLTIyODQsNyArMjI4NCw2IEBACiAJCTdBMEU3NzFFMTBDMDBEQjEwMEEwMjc2RSAv KiBKU0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSA3QTBFNzcxQzEwQzAwREIxMDBBMDI3NkUgLyogSlNJbnNwZWN0 b3JGcm9udGVuZEhvc3QuY3BwICovOyB9OwogCQk3QTBFNzcxRjEwQzAwREIxMDBBMDI3NkUgLyog SlNJbnNwZWN0b3JGcm9udGVuZEhvc3QuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDdBMEU3NzFEMTBDMDBEQjEwMEEwMjc2RSAvKiBKU0luc3BlY3RvckZy b250ZW5kSG9zdC5oICovOyB9OwogCQk3QTFEN0ZDQjE4Rjg1RjBGMDBDMzg1QUQgLyogbWVkaWFD b250cm9sc0xvY2FsaXplZFN0cmluZ3MuanMgaW4gUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDdBMUQ3RkM5MThGODVGMEYwMEMzODVBRCAvKiBtZWRpYUNvbnRy b2xzTG9jYWxpemVkU3RyaW5ncy5qcyAqLzsgfTsKLQkJN0ExRDdGQ0UxOEY4NkU1NjAwQzM4NUFE IC8qIG1lZGlhQ29udHJvbHNMb2NhbGl6ZWRTdHJpbmdzaU9TLmpzIGluIFJlc291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3QTFEN0ZDQzE4Rjg2RTU2MDBDMzg1QUQg LyogbWVkaWFDb250cm9sc0xvY2FsaXplZFN0cmluZ3NpT1MuanMgKi87IH07CiAJCTdBMUYyQjUy MTI2QzYxQjIwMDA2QTdFNiAvKiBJbnNwZWN0b3JDbGllbnQuY3BwIGluIFNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gN0ExRjJCNTExMjZDNjFCMjAwMDZBN0U2IC8q IEluc3BlY3RvckNsaWVudC5jcHAgKi87IH07CiAJCTdBMjQ1ODdCMTAyMUVBRjQwMDBBMDBBQSAv KiBJbnNwZWN0b3JET01BZ2VudC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSA3QTI0NTg3OTEwMjFFQUY0MDAwQTAwQUEgLyogSW5zcGVjdG9yRE9NQWdl bnQuY3BwICovOyB9OwogCQk3QTI0NTg3QzEwMjFFQUY0MDAwQTAwQUEgLyogSW5zcGVjdG9yRE9N QWdlbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdB MjQ1ODdBMTAyMUVBRjQwMDBBMDBBQSAvKiBJbnNwZWN0b3JET01BZ2VudC5oICovOyBzZXR0aW5n cyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CkBAIC05MzIwLDcgKzkzMTksNiBA QAogCQk3QTBFNzcxQzEwQzAwREIxMDBBMDI3NkUgLyogSlNJbnNwZWN0b3JGcm9udGVuZEhvc3Qu Y3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNJbnNwZWN0b3JGcm9u dGVuZEhvc3QuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3QTBFNzcxRDEwQzAw REIxMDBBMDI3NkUgLyogSlNJbnNwZWN0b3JGcm9udGVuZEhvc3QuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gSlNJbnNwZWN0b3JGcm9udGVuZEhvc3QuaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJN0ExRDdGQ0ExOEY4NUYwRjAwQzM4NUFEIC8qIEVuZ2xpc2ggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmphdmFzY3JpcHQ7IG5hbWUgPSBFbmdsaXNoOyBwYXRoID0gRW5nbGlzaC5scHJvai9tZWRpYUNv bnRyb2xzTG9jYWxpemVkU3RyaW5ncy5qczsgc291cmNlVHJlZSA9IFNPVVJDRV9ST09UOyB9Owot CQk3QTFEN0ZDRDE4Rjg2RTU2MDBDMzg1QUQgLyogRW5nbGlzaCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuamF2YXNjcmlwdDsgbmFt ZSA9IEVuZ2xpc2g7IHBhdGggPSBFbmdsaXNoLmxwcm9qL21lZGlhQ29udHJvbHNMb2NhbGl6ZWRT dHJpbmdzaU9TLmpzOyBzb3VyY2VUcmVlID0gU09VUkNFX1JPT1Q7IH07CiAJCTdBMUYyQjUxMTI2 QzYxQjIwMDA2QTdFNiAvKiBJbnNwZWN0b3JDbGllbnQuY3BwICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gSW5zcGVjdG9yQ2xpZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3Jv dXA+IjsgfTsKIAkJN0EyNDU4NzkxMDIxRUFGNDAwMEEwMEFBIC8qIEluc3BlY3RvckRPTUFnZW50 LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEluc3BlY3RvckRPTUFn ZW50LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0EyNDU4N0ExMDIxRUFGNDAw MEEwMEFBIC8qIEluc3BlY3RvckRPTUFnZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IEluc3BlY3RvckRPTUFnZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBA IC0xNDYwMiw4ICsxNDYwMCw2IEBACiAJCTA4OUMxNjY1RkU4NDExNThDMDJBQUMwNyAvKiBSZXNv dXJjZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAotCQkJCTdB MUQ3RkNDMThGODZFNTYwMEMzODVBRCAvKiBtZWRpYUNvbnRyb2xzTG9jYWxpemVkU3RyaW5nc2lP Uy5qcyAqLywKLQkJCQk3QTFEN0ZDOTE4Rjg1RjBGMDBDMzg1QUQgLyogbWVkaWFDb250cm9sc0xv Y2FsaXplZFN0cmluZ3MuanMgKi8sCiAJCQkJQ0QwREJCM0UxNDIyNzRFNjAwMjgwMjYzIC8qIGF1 ZGlvICovLAogCQkJCTY1OTk4QTY1MEU1RjVGRDMwMDRFMDk3QSAvKiBpbWFnZXMgKi8sCiAJCQkJ NDZGOUQ1REEwQjBENjAxNzAwMjhFRTM2IC8qIGFsaWFzQ3Vyc29yLnBuZyAqLywKQEAgLTE0NjIw LDYgKzE0NjE2LDcgQEAKIAkJCQkyRDlGMEUxMjE0RkYxQ0JGMDBCQTBGRjcgLyogbGluZWFyU1JH Qi5pY2MgKi8sCiAJCQkJODUxMzZDOEMwQUVENjY1ODAwRjkwQTNEIC8qIGxpbmtDdXJzb3IucG5n ICovLAogCQkJCUJDQUQxODA4MTMxQzdBMEQwMDk5MDQwNiAvKiBMb2NhbGl6YWJsZS5zdHJpbmdz ICovLAorCQkJCTdBMUQ3RkM5MThGODVGMEYwMEMzODVBRCAvKiBtZWRpYUNvbnRyb2xzTG9jYWxp emVkU3RyaW5ncy5qcyAqLywKIAkJCQk5MzE1M0JFMTE0MTk1QTU3MDBGQ0Y1QkUgLyogbWlzc2lu Z0ltYWdlLnBuZyAqLywKIAkJCQk5MzE1M0JEOTE0MTgxRjdBMDBGQ0Y1QkUgLyogbWlzc2luZ0lt YWdlQDJ4LnBuZyAqLywKIAkJCQk4NTEzNkM4RDBBRUQ2NjU4MDBGOTBBM0QgLyogbW92ZUN1cnNv ci5wbmcgKi8sCkBAIC0yNjQ0Myw3ICsyNjQ0MCw2IEBACiAJCQlpc2EgPSBQQlhSZXNvdXJjZXNC dWlsZFBoYXNlOwogCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsKIAkJCWZpbGVzID0g KAotCQkJCTdBMUQ3RkNFMThGODZFNTYwMEMzODVBRCAvKiBtZWRpYUNvbnRyb2xzTG9jYWxpemVk U3RyaW5nc2lPUy5qcyBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJNDZGOUQ1REQwQjBENjAxNzAwMjhF RTM2IC8qIGFsaWFzQ3Vyc29yLnBuZyBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJNDZENEYyNDkwQUY5 N0U4MTAwMzUzODVBIC8qIGNlbGxDdXJzb3IucG5nIGluIFJlc291cmNlcyAqLywKIAkJCQk5MzE1 M0JERTE0MTk1OUY0MDBGQ0Y1QkUgLyogZGVsZXRlQnV0dG9uLnBuZyBpbiBSZXNvdXJjZXMgKi8s CkBAIC0yOTU4NiwxNCArMjk1ODIsNiBAQAogCQkJbmFtZSA9IG1lZGlhQ29udHJvbHNMb2NhbGl6 ZWRTdHJpbmdzLmpzOwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKIAkJfTsKLQkJN0ExRDdG Q0MxOEY4NkU1NjAwQzM4NUFEIC8qIG1lZGlhQ29udHJvbHNMb2NhbGl6ZWRTdHJpbmdzaU9TLmpz ICovID0gewotCQkJaXNhID0gUEJYVmFyaWFudEdyb3VwOwotCQkJY2hpbGRyZW4gPSAoCi0JCQkJ N0ExRDdGQ0QxOEY4NkU1NjAwQzM4NUFEIC8qIEVuZ2xpc2ggKi8sCi0JCQkpOwotCQkJbmFtZSA9 IG1lZGlhQ29udHJvbHNMb2NhbGl6ZWRTdHJpbmdzaU9TLmpzOwotCQkJc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsKLQkJfTsKIAkJQkNBRDE4MDgxMzFDN0EwRDAwOTkwNDA2IC8qIExvY2FsaXphYmxl LnN0cmluZ3MgKi8gPSB7CiAJCQlpc2EgPSBQQlhWYXJpYW50R3JvdXA7CiAJCQljaGlsZHJlbiA9 ICgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5t bSBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQppbmRleCA4Yzdh Njk2MDVkZjcwNzhmNmYyODE2NDUyYjc3N2I4NWI4ZDI0ZWJmLi4yNmYyZjU0MDY3N2U4MGM3NTMz MGJmZTljMzRkY2VlZjM0YjU3OTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGhlbWVJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lSU9TLm1tCkBAIC0xMjI2LDcgKzEyMjYsNiBAQCBTdHJpbmcgUmVuZGVyVGhlbWVJT1M6 Om1lZGlhQ29udHJvbHNTY3JpcHQoKQogICAgICAgICBTdHJpbmdCdWlsZGVyIHNjcmlwdEJ1aWxk ZXI7CiAgICAgICAgIHNjcmlwdEJ1aWxkZXIuYXBwZW5kKFtOU1N0cmluZyBzdHJpbmdXaXRoQ29u dGVudHNPZkZpbGU6W1tOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpbV2ViQ29yZVJlbmRlclRoZW1l QnVuZGxlIGNsYXNzXV0gcGF0aEZvclJlc291cmNlOkAibWVkaWFDb250cm9sc0xvY2FsaXplZFN0 cmluZ3MiIG9mVHlwZTpAImpzIl0gZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6 bmlsXSk7CiAgICAgICAgIHNjcmlwdEJ1aWxkZXIuYXBwZW5kKFtOU1N0cmluZyBzdHJpbmdXaXRo Q29udGVudHNPZkZpbGU6W1tOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpbV2ViQ29yZVJlbmRlclRo ZW1lQnVuZGxlIGNsYXNzXV0gcGF0aEZvclJlc291cmNlOkAibWVkaWFDb250cm9sc0FwcGxlIiBv ZlR5cGU6QCJqcyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOm5pbF0pOwot ICAgICAgICBzY3JpcHRCdWlsZGVyLmFwcGVuZChbTlNTdHJpbmcgc3RyaW5nV2l0aENvbnRlbnRz T2ZGaWxlOltbTlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6W1dlYkNvcmVSZW5kZXJUaGVtZUJ1bmRs ZSBjbGFzc11dIHBhdGhGb3JSZXNvdXJjZTpAIm1lZGlhQ29udHJvbHNMb2NhbGl6ZWRTdHJpbmdz aU9TIiBvZlR5cGU6QCJqcyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOm5p bF0pOwogICAgICAgICBzY3JpcHRCdWlsZGVyLmFwcGVuZChbTlNTdHJpbmcgc3RyaW5nV2l0aENv bnRlbnRzT2ZGaWxlOltbTlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6W1dlYkNvcmVSZW5kZXJUaGVt ZUJ1bmRsZSBjbGFzc11dIHBhdGhGb3JSZXNvdXJjZTpAIm1lZGlhQ29udHJvbHNpT1MiIG9mVHlw ZTpAImpzIl0gZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6bmlsXSk7CiAgICAg ICAgIG1fbWVkaWFDb250cm9sc1NjcmlwdCA9IHNjcmlwdEJ1aWxkZXIudG9TdHJpbmcoKTsKICAg ICB9Cg==