ZGlmZiAtLWdpdCBhL2JhY2twb3J0ZWRfZml4ZXMvQW5kcm9pZC5icCBiL2JhY2twb3J0ZWRfZml4ZXMvQW5kcm9pZC5icApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hMjBmM2ZjCi0tLSAvZGV2L251bGwKKysrIGIvYmFja3BvcnRlZF9maXhlcy9BbmRyb2lkLmJwCkBAIC0wLDAgKzEsMTE1IEBACisvLyBDb3B5cmlnaHQgMjAyNCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorLy8KKy8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisvLworLy8gICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorLy8KKy8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKy8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisvLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKy8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKy8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorCitwYWNrYWdlIHsKKyAgICBkZWZhdWx0X2FwcGxpY2FibGVfbGljZW5zZXM6IFsiQW5kcm9pZC1BcGFjaGUtMi4wIl0sCisgICAgZGVmYXVsdF90ZWFtOiAidHJlbmR5X3RlYW1fYW5kcm9pZF9tZWRpYV9yZWxpYWJpbGl0eSIsCit9CisKK2dlbnJ1bGUgeworICAgIG5hbWU6ICJhcHBsaWVkX2JhY2twb3J0ZWRfZml4ZXMiLAorICAgIHRvb2xzOiBbImFwcGxpZWRfYmFja3BvcnRlZF9maXhlc19tYWluIl0sCisgICAgc3JjczogWyI6YXBwbGllZF9iYWNrcG9ydGVkX2ZpeF9iaW5wYnMiXSwKKyAgICBvdXQ6IFsiYXBwbGllZF9iYWNrcG9ydGVkX2ZpeGVzLnByb3AiXSwKKyAgICBjbWQ6ICIkKGxvY2F0aW9uIGFwcGxpZWRfYmFja3BvcnRlZF9maXhlc19tYWluKSIgKworICAgICAgICAiIC1wICQobG9jYXRpb24gYXBwbGllZF9iYWNrcG9ydGVkX2ZpeGVzLnByb3ApIiArCisgICAgICAgICIgJChpbikiLAorfQorCitqYXZhX2xpYnJhcnkgeworICAgIG5hbWU6ICJiYWNrcG9ydGVkX2ZpeGVzX3Byb3RvIiwKKyAgICBzcmNzOiBbCisgICAgICAgICJiYWNrcG9ydGVkX2ZpeGVzLnByb3RvIiwKKyAgICBdLAorICAgIGhvc3Rfc3VwcG9ydGVkOiB0cnVlLAorfQorCitqYXZhX2xpYnJhcnkgeworICAgIG5hbWU6ICJiYWNrcG9ydGVkX2ZpeGVzX2NvbW1vbiIsCisgICAgc3JjczogWyJzcmMvamF2YS9jb20vYW5kcm9pZC9idWlsZC9iYWNrcG9ydGVkZml4ZXMvY29tbW9uLyouamF2YSJdLAorICAgIHN0YXRpY19saWJzOiBbCisgICAgICAgICJiYWNrcG9ydGVkX2ZpeGVzX3Byb3RvIiwKKyAgICAgICAgImd1YXZhIiwKKyAgICBdLAorICAgIGhvc3Rfc3VwcG9ydGVkOiB0cnVlLAorfQorCitqYXZhX3Rlc3RfaG9zdCB7CisgICAgbmFtZTogImJhY2twb3J0ZWRfZml4ZXNfY29tbW9uX3Rlc3QiLAorICAgIHNyY3M6IFsidGVzdHMvamF2YS9jb20vYW5kcm9pZC9idWlsZC9iYWNrcG9ydGVkZml4ZXMvY29tbW9uLyouamF2YSJdLAorICAgIHN0YXRpY19saWJzOiBbCisgICAgICAgICJiYWNrcG9ydGVkX2ZpeGVzX2NvbW1vbiIsCisgICAgICAgICJiYWNrcG9ydGVkX2ZpeGVzX3Byb3RvIiwKKyAgICAgICAgImp1bml0IiwKKyAgICAgICAgInRydXRoIiwKKyAgICAgICAgInRydXRoLWxpdGVwcm90by1leHRlbnNpb24iLAorICAgICAgICAidHJ1dGgtcHJvdG8tZXh0ZW5zaW9uIiwKKyAgICBdLAorICAgIHRlc3Rfb3B0aW9uczogeworICAgICAgICB1bml0X3Rlc3Q6IHRydWUsCisgICAgfSwKKyAgICB0ZXN0X3N1aXRlczogWyJnZW5lcmFsLXRlc3RzIl0sCit9CisKK2phdmFfbGlicmFyeSB7CisgICAgbmFtZTogImFwcGxpZWRfYmFja3BvcnRlZF9maXhlc19saWIiLAorICAgIHNyY3M6IFsic3JjL2phdmEvY29tL2FuZHJvaWQvYnVpbGQvYmFja3BvcnRlZGZpeGVzLyouamF2YSJdLAorICAgIHN0YXRpY19saWJzOiBbCisgICAgICAgICJiYWNrcG9ydGVkX2ZpeGVzX2NvbW1vbiIsCisgICAgICAgICJiYWNrcG9ydGVkX2ZpeGVzX3Byb3RvIiwKKyAgICAgICAgImpjb21tYW5kZXIiLAorICAgICAgICAiZ3VhdmEiLAorICAgIF0sCisgICAgaG9zdF9zdXBwb3J0ZWQ6IHRydWUsCit9CisKK2phdmFfYmluYXJ5X2hvc3QgeworICAgIG5hbWU6ICJhcHBsaWVkX2JhY2twb3J0ZWRfZml4ZXNfbWFpbiIsCisgICAgbWFpbl9jbGFzczogImNvbS5hbmRyb2lkLmJ1aWxkLmJhY2twb3J0ZWRmaXhlcy5NYWluIiwKKyAgICBzdGF0aWNfbGliczogWworICAgICAgICAiYXBwbGllZF9iYWNrcG9ydGVkX2ZpeGVzX2xpYiIsCisgICAgXSwKK30KKworamF2YV90ZXN0X2hvc3QgeworICAgIG5hbWU6ICJhcHBsaWVkX2JhY2twb3J0ZWRfZml4ZXNfdGVzdCIsCisgICAgc3JjczogWyJ0ZXN0cy9qYXZhL2NvbS9hbmRyb2lkL2J1aWxkL2JhY2twb3J0ZWRmaXhlcy8qLmphdmEiXSwKKyAgICBzdGF0aWNfbGliczogWworICAgICAgICAiYXBwbGllZF9iYWNrcG9ydGVkX2ZpeGVzX2xpYiIsCisgICAgICAgICJiYWNrcG9ydGVkX2ZpeGVzX3Byb3RvIiwKKyAgICAgICAgImp1bml0IiwKKyAgICAgICAgInRydXRoIiwKKyAgICBdLAorICAgIHRlc3Rfb3B0aW9uczogeworICAgICAgICB1bml0X3Rlc3Q6IHRydWUsCisgICAgfSwKKyAgICB0ZXN0X3N1aXRlczogWyJnZW5lcmFsLXRlc3RzIl0sCit9CisKK2dlbnNyY3MgeworICAgIG5hbWU6ICJhcHBsaWVkX2JhY2twb3J0ZWRfZml4X2JpbnBicyIsCisgICAgdG9vbHM6IFsiYXByb3RvYyJdLAorICAgIHNyY3M6IFsKKyAgICAgICAgImFwcGxpZWRfZml4ZXMvKi50eHRwYiIsCisgICAgXSwKKyAgICB0b29sX2ZpbGVzOiBbCisgICAgICAgICJiYWNrcG9ydGVkX2ZpeGVzLnByb3RvIiwKKyAgICBdLAorICAgIG91dHB1dF9leHRlbnNpb246ICJiaW5wYiIsCisgICAgY21kOiAiJChsb2NhdGlvbiBhcHJvdG9jKSAgIiArCisgICAgICAgICIgLS1lbmNvZGU9Y29tLmFuZHJvaWQuYnVpbGQuYmFja3BvcnRlZGZpeGVzLkJhY2twb3J0ZWRGaXgiICsKKyAgICAgICAgIiAgJChsb2NhdGlvbiBiYWNrcG9ydGVkX2ZpeGVzLnByb3RvKSIgKworICAgICAgICAiIDwgJChpbikiICsKKyAgICAgICAgIiA+ICQob3V0KTsgZWNobyAkKG91dCkiLAorfQpkaWZmIC0tZ2l0IGEvYmFja3BvcnRlZF9maXhlcy9PV05FUlMgYi9iYWNrcG9ydGVkX2ZpeGVzL09XTkVSUwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hYzE3NmJmCi0tLSAvZGV2L251bGwKKysrIGIvYmFja3BvcnRlZF9maXhlcy9PV05FUlMKQEAgLTAsMCArMSwzIEBACitlc3NpY2tAZ29vZ2xlLmNvbQorbmNoYWxrb0Bnb29nbGUuY29tCitwb3J0bWFubmNAZ29vZ2xlLmNvbQpkaWZmIC0tZ2l0IGEvYmFja3BvcnRlZF9maXhlcy9hcHBsaWVkX2ZpeGVzL2tpMzUwMDM3MDIzLnR4dHBiIGIvYmFja3BvcnRlZF9maXhlcy9hcHBsaWVkX2ZpeGVzL2tpMzUwMDM3MDIzLnR4dHBiCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjQ1NmE3YWUKLS0tIC9kZXYvbnVsbAorKysgYi9iYWNrcG9ydGVkX2ZpeGVzL2FwcGxpZWRfZml4ZXMva2kzNTAwMzcwMjMudHh0cGIKQEAgLTAsMCArMSwxOSBAQAorIyBDb3B5cmlnaHQgKEMpIDIwMjQgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorIworIyBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKyMgeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorIyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKyMKKyMgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorIworIyBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisjIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisjIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorIyBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisjIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorIworIyBwcm90by1maWxlOiAuLi9iYWNrcG9ydGVkX2ZpeGVzLnByb3RvCisjIHByb3RvLW1lc3NhZ2U6IEJhY2twb3J0ZWRGaXgKKwora25vd25faXNzdWU6IDM1MDAzNzAyMworYWxpYXM6IDEKZGlmZiAtLWdpdCBhL2JhY2twb3J0ZWRfZml4ZXMvYmFja3BvcnRlZF9maXhlcy5wcm90byBiL2JhY2twb3J0ZWRfZml4ZXMvYmFja3BvcnRlZF9maXhlcy5wcm90bwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45MTYxOGVlCi0tLSAvZGV2L251bGwKKysrIGIvYmFja3BvcnRlZF9maXhlcy9iYWNrcG9ydGVkX2ZpeGVzLnByb3RvCkBAIC0wLDAgKzEsMzcgQEAKKy8vIENvcHlyaWdodCAoQykgMjAyNCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisvLworLy8gTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisvLyB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisvLyBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKy8vCisvLyAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisvLworLy8gVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorLy8gZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKy8vIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorLy8gU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorLy8gbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisKK3N5bnRheCA9ICJwcm90bzIiOworCitwYWNrYWdlIGNvbS5hbmRyb2lkLmJ1aWxkLmJhY2twb3J0ZWRmaXhlczsKKworb3B0aW9uIGphdmFfbXVsdGlwbGVfZmlsZXMgPSB0cnVlOworCisvLyBBIGxpc3Qgb2YgYmFja3BvcnRlZCBmaXhlcy4KK21lc3NhZ2UgQmFja3BvcnRlZEZpeGVzIHsKKyAgcmVwZWF0ZWQgQmFja3BvcnRlZEZpeCBmaXhlcyA9IDE7Cit9CisKKy8vIEEga25vd24gaXNzdWUgYXBwcm92ZWQgZm9yIHJlcG9ydGluZyBCdWlsZC5nZXRCYWNrcG9ydGVkRml4U3RhdHVzCittZXNzYWdlIEJhY2twb3J0ZWRGaXggeworCisgIC8vIFRoZSBpc3N1ZSBpZCBmcm9tIHRoZSBwdWJsaWMgYnVnIHRyYWNrZXIKKyAgLy8gaHR0cHM6Ly9pc3N1ZXRyYWNrZXIuZ29vZ2xlLmNvbS9pc3N1ZXMve2tub3duX2lzc3VlfQorICBvcHRpb25hbCBpbnQ2NCBrbm93bl9pc3N1ZSA9IDE7CisgIC8vIFRoZSBhbGlhcyBmb3IgdGhlIGtub3duIGlzc3VlLgorICAvLyAxIC0gMTAyMyBhcmUgdmFsaWQgYWxpYXNlcworICAvLyBNdXN0IGJlIHVuaXF1ZSBhY3Jvc3MgYWxsIGJhY2twb3J0ZWQgZml4ZXMuCisgIG9wdGlvbmFsIGludDMyIGFsaWFzID0gMjsKK30KKwpkaWZmIC0tZ2l0IGEvYmFja3BvcnRlZF9maXhlcy9zcmMvamF2YS9jb20vYW5kcm9pZC9idWlsZC9iYWNrcG9ydGVkZml4ZXMvTWFpbi5qYXZhIGIvYmFja3BvcnRlZF9maXhlcy9zcmMvamF2YS9jb20vYW5kcm9pZC9idWlsZC9iYWNrcG9ydGVkZml4ZXMvTWFpbi5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjc5MTQ4Y2MKLS0tIC9kZXYvbnVsbAorKysgYi9iYWNrcG9ydGVkX2ZpeGVzL3NyYy9qYXZhL2NvbS9hbmRyb2lkL2J1aWxkL2JhY2twb3J0ZWRmaXhlcy9NYWluLmphdmEKQEAgLTAsMCArMSw3OSBAQAorCisvKgorICogQ29weXJpZ2h0IChDKSAyMDI0IFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKyAqCisgKiBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKyAqIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKyAqIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorICoKKyAqICAgICAgaHR0cDovL3d3dy5hcGFjaGUub3JnL2xpY2Vuc2VzL0xJQ0VOU0UtMi4wCisgKgorICogVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorICogZGlzdHJpYnV0ZWQgdW5kZXIgdGhlIExpY2Vuc2UgaXMgZGlzdHJpYnV0ZWQgb24gYW4gIkFTIElTIiBCQVNJUywKKyAqIFdJVEhPVVQgV0FSUkFOVElFUyBPUiBDT05ESVRJT05TIE9GIEFOWSBLSU5ELCBlaXRoZXIgZXhwcmVzcyBvciBpbXBsaWVkLgorICogU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorICogbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuCisgKi8KK3BhY2thZ2UgY29tLmFuZHJvaWQuYnVpbGQuYmFja3BvcnRlZGZpeGVzOworCitpbXBvcnQgc3RhdGljIGphdmEubmlvLmNoYXJzZXQuU3RhbmRhcmRDaGFyc2V0cy5VVEZfODsKKworaW1wb3J0IGNvbS5hbmRyb2lkLmJ1aWxkLmJhY2twb3J0ZWRmaXhlcy5jb21tb24uQ2xvc2FibGVDb2xsZWN0aW9uOworaW1wb3J0IGNvbS5hbmRyb2lkLmJ1aWxkLmJhY2twb3J0ZWRmaXhlcy5jb21tb24uUGFyc2VyOworCitpbXBvcnQgY29tLmJldXN0Lmpjb21tYW5kZXIuSkNvbW1hbmRlcjsKK2ltcG9ydCBjb20uYmV1c3QuamNvbW1hbmRlci5QYXJhbWV0ZXI7CitpbXBvcnQgY29tLmJldXN0Lmpjb21tYW5kZXIuY29udmVydGVycy5GaWxlQ29udmVydGVyOworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmlvLkZpbGVzOworCitpbXBvcnQgamF2YS5pby5GaWxlOworaW1wb3J0IGphdmEuaW8uUHJpbnRXcml0ZXI7CitpbXBvcnQgamF2YS5pby5Xcml0ZXI7CitpbXBvcnQgamF2YS51dGlsLkFycmF5czsKK2ltcG9ydCBqYXZhLnV0aWwuTGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuc3RyZWFtLkNvbGxlY3RvcnM7CisKK3B1YmxpYyBmaW5hbCBjbGFzcyBNYWluIHsKKyAgICBAUGFyYW1ldGVyKGRlc2NyaXB0aW9uID0gIkJhY2twb3J0ZWRGaXggcHJvdG8gYmluYXJ5IGZpbGVzIiwgY29udmVydGVyID0gRmlsZUNvbnZlcnRlci5jbGFzcywKKyAgICAgICAgICAgIHJlcXVpcmVkID0gdHJ1ZSkKKyAgICBMaXN0PEZpbGU+IGZpeEZpbGVzOworICAgIEBQYXJhbWV0ZXIoZGVzY3JpcHRpb24gPSAiVGhlIGZpbGUgdG8gd3JpdGUgdGhlIHByb3BlcnR5IHZhbHVlIHRvLiIsCisgICAgICAgICAgICBuYW1lcyA9IHsiLS1wcm9wZXJ0eV9maWxlIiwgIi1wIn0sIGNvbnZlcnRlciA9IEZpbGVDb252ZXJ0ZXIuY2xhc3MsIHJlcXVpcmVkID0gdHJ1ZSkKKyAgICBGaWxlIHByb3BlcnR5RmlsZTsKKworICAgIHB1YmxpYyBzdGF0aWMgdm9pZCBtYWluKFN0cmluZy4uLiBhcmd2KSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICAgICAgTWFpbiBtYWluID0gbmV3IE1haW4oKTsKKyAgICAgICAgSkNvbW1hbmRlci5uZXdCdWlsZGVyKCkuYWRkT2JqZWN0KG1haW4pLmJ1aWxkKCkucGFyc2UoYXJndik7CisgICAgICAgIG1haW4ucnVuKCk7CisgICAgfQorCisgICAgTWFpbigpIHsKKyAgICB9CisKKyAgICBwcml2YXRlIHZvaWQgcnVuKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgICAgIHRyeSAodmFyIGZpeFN0cmVhbXMgPSBDbG9zYWJsZUNvbGxlY3Rpb24ud3JhcChQYXJzZXIuZ2V0RmlsZUlucHV0U3RyZWFtcyhmaXhGaWxlcykpOworICAgICAgICAgICAgIHZhciBvdXQgPSBGaWxlcy5uZXdXcml0ZXIocHJvcGVydHlGaWxlLCBVVEZfOCkpIHsKKyAgICAgICAgICAgIHZhciBmaXhlcyA9IFBhcnNlci5wYXJzZUJhY2twb3J0ZWRGaXhlcyhmaXhTdHJlYW1zLmdldENvbGxlY3Rpb24oKSk7CisgICAgICAgICAgICB3cml0ZUZpeGVzQXNBbGlhc0JpdFNldChmaXhlcywgb3V0KTsKKyAgICAgICAgfQorICAgIH0KKworICAgIHN0YXRpYyB2b2lkIHdyaXRlRml4ZXNBc0FsaWFzQml0U2V0KEJhY2twb3J0ZWRGaXhlcyBmaXhlcywgV3JpdGVyIG91dCkgeworICAgICAgICBQcmludFdyaXRlciBwcmludFdyaXRlciA9IG5ldyBQcmludFdyaXRlcihvdXQpOworICAgICAgICBwcmludFdyaXRlci5wcmludGxuKCIjIFRoZSBmb2xsb3dpbmcgYmFja3BvcnRlZCBmaXhlcyBoYXZlIGJlZW4gYXBwbGllZCIpOworICAgICAgICBmb3IgKHZhciBmIDogZml4ZXMuZ2V0Rml4ZXNMaXN0KCkpIHsKKyAgICAgICAgICAgIHByaW50V3JpdGVyLnByaW50ZigiIyBodHRwczovL2lzc3VldHJhY2tlci5nb29nbGUuY29tL2lzc3Vlcy8lZCB3aXRoIGFsaWFzICVkIiwKKyAgICAgICAgICAgICAgICAgICAgZi5nZXRLbm93bklzc3VlKCksIGYuZ2V0QWxpYXMoKSk7CisgICAgICAgICAgICBwcmludFdyaXRlci5wcmludGxuKCk7CisgICAgICAgIH0KKyAgICAgICAgdmFyIGJzQXJyYXkgPSBQYXJzZXIuZ2V0Qml0U2V0QXJyYXkoCisgICAgICAgICAgICAgICAgZml4ZXMuZ2V0Rml4ZXNMaXN0KCkuc3RyZWFtKCkubWFwVG9JbnQoQmFja3BvcnRlZEZpeDo6Z2V0QWxpYXMpLnRvQXJyYXkoKSk7CisgICAgICAgIFN0cmluZyBic1N0cmluZyA9IEFycmF5cy5zdHJlYW0oYnNBcnJheSkubWFwVG9PYmooTG9uZzo6dG9TdHJpbmcpLmNvbGxlY3QoCisgICAgICAgICAgICAgICAgQ29sbGVjdG9ycy5qb2luaW5nKCIsIikpOworICAgICAgICBwcmludFdyaXRlci5wcmludGYoInJvLmJ1aWxkLmJhY2twb3J0ZWRfZml4ZXMuYWxpYXNfYml0c2V0LmxvbmdfbGlzdD0lcyIsIGJzU3RyaW5nKTsKKyAgICAgICAgcHJpbnRXcml0ZXIucHJpbnRsbigpOworICAgICAgICBpZiAocHJpbnRXcml0ZXIuY2hlY2tFcnJvcigpKSB7CisgICAgICAgICAgICB0aHJvdyBuZXcgUnVudGltZUV4Y2VwdGlvbigiVGhlcmUgd2FzIGFuIGVycm9yIHdyaXRpbmcgdG8gIiArIG91dC50b1N0cmluZygpKTsKKyAgICAgICAgfQorICAgIH0KK30KZGlmZiAtLWdpdCBhL2JhY2twb3J0ZWRfZml4ZXMvc3JjL2phdmEvY29tL2FuZHJvaWQvYnVpbGQvYmFja3BvcnRlZGZpeGVzL2NvbW1vbi9DbG9zYWJsZUNvbGxlY3Rpb24uamF2YSBiL2JhY2twb3J0ZWRfZml4ZXMvc3JjL2phdmEvY29tL2FuZHJvaWQvYnVpbGQvYmFja3BvcnRlZGZpeGVzL2NvbW1vbi9DbG9zYWJsZUNvbGxlY3Rpb24uamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43NWI2NzMwCi0tLSAvZGV2L251bGwKKysrIGIvYmFja3BvcnRlZF9maXhlcy9zcmMvamF2YS9jb20vYW5kcm9pZC9idWlsZC9iYWNrcG9ydGVkZml4ZXMvY29tbW9uL0Nsb3NhYmxlQ29sbGVjdGlvbi5qYXZhCkBAIC0wLDAgKzEsNjcgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMjQgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorICoKKyAqIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworICogeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorICogWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisgKgorICogICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKyAqCisgKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisgKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorICogV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisgKiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisgKiBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKyAqLworcGFja2FnZSBjb20uYW5kcm9pZC5idWlsZC5iYWNrcG9ydGVkZml4ZXMuY29tbW9uOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVMaXN0OworCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsKK2ltcG9ydCBqYXZhLnV0aWwuQ29sbGVjdGlvbjsKKworLyoqIEFuIEF1dG9DbG9zZWFibGUgaG9sZGVyIGZvciBhIGNvbGxlY3Rpb24gb2YgQXV0b0Nsb3NlYWJsZXMuICovCitwdWJsaWMgZmluYWwgY2xhc3MgQ2xvc2FibGVDb2xsZWN0aW9uPFQgZXh0ZW5kcyBBdXRvQ2xvc2VhYmxlLCBDIGV4dGVuZHMgQ29sbGVjdGlvbjxUPj4gaW1wbGVtZW50cworICAgICAgICBBdXRvQ2xvc2VhYmxlIHsKKyAgICBDIHNvdXJjZTsKKworICAgIC8qKiBNYWtlcyB0aGUgY29sbGVjdGlvbiBBdXRvQ2xvc2VhYmxlLiAqLworICAgIHB1YmxpYyBzdGF0aWMgPFQgZXh0ZW5kcyBBdXRvQ2xvc2VhYmxlLCBDIGV4dGVuZHMgQ29sbGVjdGlvbjxUPj4gQ2xvc2FibGVDb2xsZWN0aW9uPFQsIEM+IHdyYXAoCisgICAgICAgICAgICBDIHNvdXJjZSkgeworICAgICAgICByZXR1cm4gbmV3IENsb3NhYmxlQ29sbGVjdGlvbjw+KHNvdXJjZSk7CisgICAgfQorCisgICAgcHJpdmF0ZSBDbG9zYWJsZUNvbGxlY3Rpb24oQyBzb3VyY2UpIHsKKyAgICAgICAgdGhpcy5zb3VyY2UgPSBzb3VyY2U7CisgICAgfQorCisgICAgLyoqIEdldCB0aGUgc291cmNlIGNvbGxlY3Rpb24uICovCisgICAgcHVibGljIEMgZ2V0Q29sbGVjdGlvbigpIHsKKyAgICAgICAgcmV0dXJuIHNvdXJjZTsKKyAgICB9CisKKyAgICAvKioKKyAgICAgKiBDbG9zZXMgZWFjaCBpdGVtIGluIHRoZSBjb2xsZWN0aW9uLgorICAgICAqCisgICAgICogQHRocm93cyBFeGNlcHRpb24gaWYgYW55IGNsb3NlIHRocm93cyBhbiBhbiBleGNlcHRpb24sIGEgbmV3IGV4Y2VwdGlvbiBpcyB0aHJvd24gd2l0aAorICAgICAqICAgICAgICAgICAgICAgICAgIGFsbCB0aGUgZXhjZXB0aW9ucyB0aHJvd24gY2xvc2luZyB0aGUgc3RyZWFtcyBhZGRlZCBhcyBhIHN1cHByZXNzZWQKKyAgICAgKiAgICAgICAgICAgICAgICAgICBleGNlcHRpb25zLgorICAgICAqLworICAgIEBPdmVycmlkZQorICAgIHB1YmxpYyB2b2lkIGNsb3NlKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgICAgIHZhciBmYWlsdXJlcyA9IG5ldyBBcnJheUxpc3Q8RXhjZXB0aW9uPigpOworICAgICAgICBmb3IgKFQgdCA6IHNvdXJjZSkgeworICAgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICB0LmNsb3NlKCk7CisgICAgICAgICAgICB9IGNhdGNoIChFeGNlcHRpb24gZSkgeworICAgICAgICAgICAgICAgIGZhaWx1cmVzLmFkZChlKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgICAgICBpZiAoIWZhaWx1cmVzLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgRXhjZXB0aW9uIGUgPSBuZXcgRXhjZXB0aW9uKAorICAgICAgICAgICAgICAgICAgICAiJWQgb2YgJWQgZmFpbGVkIHdoaWxlIGNsb3NpbmciLmZvcm1hdHRlZChmYWlsdXJlcy5zaXplKCksIHNvdXJjZS5zaXplKCkpKTsKKyAgICAgICAgICAgIGZhaWx1cmVzLmZvckVhY2goZTo6YWRkU3VwcHJlc3NlZCk7CisgICAgICAgICAgICB0aHJvdyBlOworICAgICAgICB9CisgICAgfQorfQpkaWZmIC0tZ2l0IGEvYmFja3BvcnRlZF9maXhlcy9zcmMvamF2YS9jb20vYW5kcm9pZC9idWlsZC9iYWNrcG9ydGVkZml4ZXMvY29tbW9uL1BhcnNlci5qYXZhIGIvYmFja3BvcnRlZF9maXhlcy9zcmMvamF2YS9jb20vYW5kcm9pZC9idWlsZC9iYWNrcG9ydGVkZml4ZXMvY29tbW9uL1BhcnNlci5qYXZhCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjZiMDhiOGYKLS0tIC9kZXYvbnVsbAorKysgYi9iYWNrcG9ydGVkX2ZpeGVzL3NyYy9qYXZhL2NvbS9hbmRyb2lkL2J1aWxkL2JhY2twb3J0ZWRmaXhlcy9jb21tb24vUGFyc2VyLmphdmEKQEAgLTAsMCArMSw3MSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyNCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisgKgorICogTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisgKiB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisgKiBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKyAqCisgKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorICoKKyAqIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKyAqIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisgKiBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKyAqIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKyAqIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorICovCitwYWNrYWdlIGNvbS5hbmRyb2lkLmJ1aWxkLmJhY2twb3J0ZWRmaXhlcy5jb21tb247CisKK2ltcG9ydCBjb20uYW5kcm9pZC5idWlsZC5iYWNrcG9ydGVkZml4ZXMuQmFja3BvcnRlZEZpeDsKK2ltcG9ydCBjb20uYW5kcm9pZC5idWlsZC5iYWNrcG9ydGVkZml4ZXMuQmFja3BvcnRlZEZpeGVzOworCitpbXBvcnQgY29tLmdvb2dsZS5jb21tb24uY29sbGVjdC5JbW11dGFibGVMaXN0OworCitpbXBvcnQgamF2YS5pby5GaWxlOworaW1wb3J0IGphdmEuaW8uRmlsZUlucHV0U3RyZWFtOworaW1wb3J0IGphdmEuaW8uRmlsZU5vdEZvdW5kRXhjZXB0aW9uOworaW1wb3J0IGphdmEuaW8uSU9FeGNlcHRpb247CitpbXBvcnQgamF2YS5pby5JbnB1dFN0cmVhbTsKK2ltcG9ydCBqYXZhLnV0aWwuQml0U2V0OworaW1wb3J0IGphdmEudXRpbC5MaXN0OworCisKKy8qKiBTdGF0aWMgdXRpbGl0aWVzIGZvciB3b3JraW5nIHdpdGgge0BsaW5rIEJhY2twb3J0ZWRGaXhlc30uICovCitwdWJsaWMgZmluYWwgY2xhc3MgUGFyc2VyIHsKKworICAgIC8qKiBDcmVhdGVzIGxpc3Qgb2YgRmlsZUlucHV0U3RyZWFtcyBmb3IgYSBsaXN0IG9mIGZpbGVzLiAqLworICAgIHB1YmxpYyBzdGF0aWMgSW1tdXRhYmxlTGlzdDxGaWxlSW5wdXRTdHJlYW0+IGdldEZpbGVJbnB1dFN0cmVhbXMoTGlzdDxGaWxlPiBmaXhGaWxlcykgdGhyb3dzCisgICAgICAgICAgICBGaWxlTm90Rm91bmRFeGNlcHRpb24geworICAgICAgICB2YXIgc3RyZWFtcyA9IEltbXV0YWJsZUxpc3QuPEZpbGVJbnB1dFN0cmVhbT5idWlsZGVyKCk7CisgICAgICAgIGZvciAodmFyIGYgOiBmaXhGaWxlcykgeworICAgICAgICAgICAgc3RyZWFtcy5hZGQobmV3IEZpbGVJbnB1dFN0cmVhbShmKSk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIHN0cmVhbXMuYnVpbGQoKTsKKyAgICB9CisKKyAgICAvKiogQ29udmVydHMgYSBsaXN0IG9mIGJhY2twb3J0ZWQgZml4IGFsaWFzZXMgaW50byBhIGxvbmcgYXJyYXkgcmVwcmVzZW50aW5nIGEge0BsaW5rIEJpdFNldH0gKi8KKyAgICBwdWJsaWMgc3RhdGljIGxvbmdbXSBnZXRCaXRTZXRBcnJheShpbnRbXSBhbGlhc2VzKSB7CisgICAgICAgIEJpdFNldCBicyA9IG5ldyBCaXRTZXQoKTsKKyAgICAgICAgZm9yIChpbnQgYSA6IGFsaWFzZXMpIHsKKyAgICAgICAgICAgIGJzLnNldChhKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gYnMudG9Mb25nQXJyYXkoKTsKKyAgICB9CisKKyAgICAvKioKKyAgICAgKiBDcmVhdGVzIGEge0BsaW5rIEJhY2twb3J0ZWRGaXhlc30gZnJvbSBhIGxpc3Qgb2Yge0BsaW5rIEJhY2twb3J0ZWRGaXh9IGJpbmFyeSBwcm90byBzdHJlYW1zLgorICAgICAqLworICAgIHB1YmxpYyBzdGF0aWMgQmFja3BvcnRlZEZpeGVzIHBhcnNlQmFja3BvcnRlZEZpeGVzKExpc3Q8PyBleHRlbmRzIElucHV0U3RyZWFtPiBmaXhTdHJlYW1zKQorICAgICAgICAgICAgdGhyb3dzCisgICAgICAgICAgICBJT0V4Y2VwdGlvbiB7CisgICAgICAgIHZhciBmaXhlcyA9IEJhY2twb3J0ZWRGaXhlcy5uZXdCdWlsZGVyKCk7CisgICAgICAgIGZvciAodmFyIHMgOiBmaXhTdHJlYW1zKSB7CisgICAgICAgICAgICBCYWNrcG9ydGVkRml4IGZpeCA9IEJhY2twb3J0ZWRGaXgucGFyc2VGcm9tKHMpOworICAgICAgICAgICAgZml4ZXMuYWRkRml4ZXMoZml4KTsKKyAgICAgICAgICAgIHMuY2xvc2UoKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gZml4ZXMuYnVpbGQoKTsKKyAgICB9CisKKyAgICBwcml2YXRlIFBhcnNlcigpIHsKKyAgICB9Cit9CmRpZmYgLS1naXQgYS9iYWNrcG9ydGVkX2ZpeGVzL3Rlc3RzL2phdmEvY29tL2FuZHJvaWQvYnVpbGQvYmFja3BvcnRlZGZpeGVzL01haW5UZXN0LmphdmEgYi9iYWNrcG9ydGVkX2ZpeGVzL3Rlc3RzL2phdmEvY29tL2FuZHJvaWQvYnVpbGQvYmFja3BvcnRlZGZpeGVzL01haW5UZXN0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODQwNjFlMQotLS0gL2Rldi9udWxsCisrKyBiL2JhY2twb3J0ZWRfZml4ZXMvdGVzdHMvamF2YS9jb20vYW5kcm9pZC9idWlsZC9iYWNrcG9ydGVkZml4ZXMvTWFpblRlc3QuamF2YQpAQCAtMCwwICsxLDY0IEBACisKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMjQgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorICoKKyAqIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworICogeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorICogWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisgKgorICogICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKyAqCisgKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisgKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorICogV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisgKiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisgKiBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKyAqLworcGFja2FnZSBjb20uYW5kcm9pZC5idWlsZC5iYWNrcG9ydGVkZml4ZXM7CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi50cnV0aC5UcnV0aDsKKworaW1wb3J0IG9yZy5qdW5pdC5UZXN0OworCitpbXBvcnQgamF2YS5pby5QcmludFdyaXRlcjsKK2ltcG9ydCBqYXZhLmlvLlN0cmluZ1dyaXRlcjsKKworLyoqIFRlc3RzIGZvciB7QGxpbmsgTWFpbn0uICovCitwdWJsaWMgY2xhc3MgTWFpblRlc3QgeworCisKKyAgICBAVGVzdAorICAgIHB1YmxpYyB2b2lkIHdyaXRlRml4ZXNBc0FsaWFzQml0U2V0X2RlZmF1bHQoKSB7CisgICAgICAgIEJhY2twb3J0ZWRGaXhlcyBmaXhlcyA9IEJhY2twb3J0ZWRGaXhlcy5uZXdCdWlsZGVyKCkuYnVpbGQoKTsKKyAgICAgICAgdmFyIHJlc3VsdCA9IG5ldyBTdHJpbmdXcml0ZXIoKTsKKworICAgICAgICBNYWluLndyaXRlRml4ZXNBc0FsaWFzQml0U2V0KGZpeGVzLCBuZXcgUHJpbnRXcml0ZXIocmVzdWx0KSk7CisKKyAgICAgICAgVHJ1dGguYXNzZXJ0VGhhdChyZXN1bHQudG9TdHJpbmcoKSkKKyAgICAgICAgICAgICAgICAuaXNFcXVhbFRvKCIiIgorICAgICAgICAgICAgICAgICAgICAgICAgIyBUaGUgZm9sbG93aW5nIGJhY2twb3J0ZWQgZml4ZXMgaGF2ZSBiZWVuIGFwcGxpZWQKKyAgICAgICAgICAgICAgICAgICAgICAgIHJvLmJ1aWxkLmJhY2twb3J0ZWRfZml4ZXMuYWxpYXNfYml0c2V0LmxvbmdfbGlzdD0KKyAgICAgICAgICAgICAgICAgICAgICAgICIiIik7CisgICAgfQorCisgICAgQFRlc3QKKyAgICBwdWJsaWMgdm9pZCB3cml0ZUZpeGVzQXNBbGlhc0JpdFNldF9zb21lKCkgeworICAgICAgICBCYWNrcG9ydGVkRml4ZXMgZml4ZXMgPSBCYWNrcG9ydGVkRml4ZXMubmV3QnVpbGRlcigpCisgICAgICAgICAgICAgICAgLmFkZEZpeGVzKEJhY2twb3J0ZWRGaXgubmV3QnVpbGRlcigpLnNldEtub3duSXNzdWUoMTIzNEwpLnNldEFsaWFzKDEpKQorICAgICAgICAgICAgICAgIC5hZGRGaXhlcyhCYWNrcG9ydGVkRml4Lm5ld0J1aWxkZXIoKS5zZXRLbm93bklzc3VlKDNMKS5zZXRBbGlhcyg2NSkpCisgICAgICAgICAgICAgICAgLmFkZEZpeGVzKEJhY2twb3J0ZWRGaXgubmV3QnVpbGRlcigpLnNldEtub3duSXNzdWUoNEwpLnNldEFsaWFzKDY3KSkKKyAgICAgICAgICAgICAgICAuYnVpbGQoKTsKKyAgICAgICAgdmFyIHJlc3VsdCA9IG5ldyBTdHJpbmdXcml0ZXIoKTsKKworICAgICAgICBNYWluLndyaXRlRml4ZXNBc0FsaWFzQml0U2V0KGZpeGVzLCBuZXcgUHJpbnRXcml0ZXIocmVzdWx0KSk7CisKKyAgICAgICAgVHJ1dGguYXNzZXJ0VGhhdChyZXN1bHQudG9TdHJpbmcoKSkKKyAgICAgICAgICAgICAgICAuaXNFcXVhbFRvKCIiIgorICAgICAgICAgICAgICAgICAgICAgICAgIyBUaGUgZm9sbG93aW5nIGJhY2twb3J0ZWQgZml4ZXMgaGF2ZSBiZWVuIGFwcGxpZWQKKyAgICAgICAgICAgICAgICAgICAgICAgICMgaHR0cHM6Ly9pc3N1ZXRyYWNrZXIuZ29vZ2xlLmNvbS9pc3N1ZXMvMTIzNCB3aXRoIGFsaWFzIDEKKyAgICAgICAgICAgICAgICAgICAgICAgICMgaHR0cHM6Ly9pc3N1ZXRyYWNrZXIuZ29vZ2xlLmNvbS9pc3N1ZXMvMyB3aXRoIGFsaWFzIDY1CisgICAgICAgICAgICAgICAgICAgICAgICAjIGh0dHBzOi8vaXNzdWV0cmFja2VyLmdvb2dsZS5jb20vaXNzdWVzLzQgd2l0aCBhbGlhcyA2NworICAgICAgICAgICAgICAgICAgICAgICAgcm8uYnVpbGQuYmFja3BvcnRlZF9maXhlcy5hbGlhc19iaXRzZXQubG9uZ19saXN0PTIsMTAKKyAgICAgICAgICAgICAgICAgICAgICAgICIiIik7CisgICAgfQorfQpkaWZmIC0tZ2l0IGEvYmFja3BvcnRlZF9maXhlcy90ZXN0cy9qYXZhL2NvbS9hbmRyb2lkL2J1aWxkL2JhY2twb3J0ZWRmaXhlcy9jb21tb24vQ2xvc2VhYmxlQ29sbGVjdGlvblRlc3QuamF2YSBiL2JhY2twb3J0ZWRfZml4ZXMvdGVzdHMvamF2YS9jb20vYW5kcm9pZC9idWlsZC9iYWNrcG9ydGVkZml4ZXMvY29tbW9uL0Nsb3NlYWJsZUNvbGxlY3Rpb25UZXN0LmphdmEKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZDNkODRhOAotLS0gL2Rldi9udWxsCisrKyBiL2JhY2twb3J0ZWRfZml4ZXMvdGVzdHMvamF2YS9jb20vYW5kcm9pZC9idWlsZC9iYWNrcG9ydGVkZml4ZXMvY29tbW9uL0Nsb3NlYWJsZUNvbGxlY3Rpb25UZXN0LmphdmEKQEAgLTAsMCArMSw5MSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyNCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisgKgorICogTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisgKiB5b3UgbWF5IG5vdCB1c2UgdGhpcyBmaWxlIGV4Y2VwdCBpbiBjb21wbGlhbmNlIHdpdGggdGhlIExpY2Vuc2UuCisgKiBZb3UgbWF5IG9idGFpbiBhIGNvcHkgb2YgdGhlIExpY2Vuc2UgYXQKKyAqCisgKiAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMAorICoKKyAqIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUKKyAqIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsCisgKiBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKyAqIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQKKyAqIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLgorICovCitwYWNrYWdlIGNvbS5hbmRyb2lkLmJ1aWxkLmJhY2twb3J0ZWRmaXhlcy5jb21tb247CisKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi5jb2xsZWN0LkltbXV0YWJsZVNldDsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi50cnV0aC5Db3JyZXNwb25kZW5jZTsKK2ltcG9ydCBjb20uZ29vZ2xlLmNvbW1vbi50cnV0aC5UcnV0aDsKKworaW1wb3J0IG9yZy5qdW5pdC5UZXN0OworCisvKiogVGVzdHMgZm9yIHtAbGluayBDbG9zYWJsZUNvbGxlY3Rpb259LiAqLworcHVibGljIGNsYXNzIENsb3NlYWJsZUNvbGxlY3Rpb25UZXN0IHsKKworICAgIHByaXZhdGUgc3RhdGljIGNsYXNzIEZha2VDbG9zZWFibGUgaW1wbGVtZW50cyBBdXRvQ2xvc2VhYmxlIHsKKyAgICAgICAgcHJpdmF0ZSBmaW5hbCBib29sZWFuIHRocm93T25DbG9zZTsKKyAgICAgICAgcHJpdmF0ZSBmaW5hbCBTdHJpbmcgbmFtZTsKKworCisgICAgICAgIHByaXZhdGUgYm9vbGVhbiBpc0Nsb3NlZCA9IGZhbHNlOworCisgICAgICAgIHByaXZhdGUgRmFrZUNsb3NlYWJsZShTdHJpbmcgbmFtZSwgYm9vbGVhbiB0aHJvd09uQ2xvc2UpIHsKKyAgICAgICAgICAgIHRoaXMubmFtZSA9IG5hbWU7CisgICAgICAgICAgICB0aGlzLnRocm93T25DbG9zZSA9IHRocm93T25DbG9zZTsKKworICAgICAgICB9CisKKyAgICAgICAgcHJpdmF0ZSBzdGF0aWMgRmFrZUNsb3NlYWJsZSBuYW1lZChTdHJpbmcgbmFtZSkgeworICAgICAgICAgICAgcmV0dXJuIG5ldyBGYWtlQ2xvc2VhYmxlKG5hbWUsIGZhbHNlKTsKKyAgICAgICAgfQorCisgICAgICAgIHByaXZhdGUgc3RhdGljIEZha2VDbG9zZWFibGUgZmFpbGluZyhTdHJpbmcgbmFtZSkgeworICAgICAgICAgICAgcmV0dXJuIG5ldyBGYWtlQ2xvc2VhYmxlKG5hbWUsIHRydWUpOworICAgICAgICB9CisKKyAgICAgICAgcHVibGljIGJvb2xlYW4gaXNDbG9zZWQoKSB7CisgICAgICAgICAgICByZXR1cm4gaXNDbG9zZWQ7CisgICAgICAgIH0KKworICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgcHVibGljIHZvaWQgY2xvc2UoKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICAgICAgICAgIGlmICh0aHJvd09uQ2xvc2UpIHsKKyAgICAgICAgICAgICAgICB0aHJvdyBuZXcgRXhjZXB0aW9uKG5hbWUgKyAiIGNsb3NlIGZhaWxlZCIpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaXNDbG9zZWQgPSB0cnVlOworICAgICAgICB9CisgICAgfQorCisKKyAgICBAVGVzdAorICAgIHB1YmxpYyB2b2lkIGJvdGhDbG9zZWQoKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICAgICAgdmFyIGMgPSBJbW11dGFibGVTZXQub2YoRmFrZUNsb3NlYWJsZS5uYW1lZCgiZm9vIiksIEZha2VDbG9zZWFibGUubmFtZWQoImJhciIpKTsKKyAgICAgICAgdHJ5ICh2YXIgY2MgPSBDbG9zYWJsZUNvbGxlY3Rpb24ud3JhcChjKTspIHsKKyAgICAgICAgICAgIFRydXRoLmFzc2VydFRoYXQoY2MuZ2V0Q29sbGVjdGlvbigpKS5pc1NhbWVJbnN0YW5jZUFzKGMpOworICAgICAgICB9CisgICAgICAgIFRydXRoLmFzc2VydFRoYXQoYykKKyAgICAgICAgICAgICAgICAuY29tcGFyaW5nRWxlbWVudHNVc2luZygKKyAgICAgICAgICAgICAgICAgICAgICAgIENvcnJlc3BvbmRlbmNlLnRyYW5zZm9ybWluZyhGYWtlQ2xvc2VhYmxlOjppc0Nsb3NlZCwgImlzIGNsb3NlZCIpKQorICAgICAgICAgICAgICAgIC5jb250YWluc0V4YWN0bHkodHJ1ZSwgdHJ1ZSk7CisgICAgfQorCisgICAgQFRlc3QKKyAgICBwdWJsaWMgdm9pZCBib3RoRmFpbGVkKCkgeworICAgICAgICB2YXIgYyA9IEltbXV0YWJsZVNldC5vZihGYWtlQ2xvc2VhYmxlLmZhaWxpbmcoImZvbyIpLCBGYWtlQ2xvc2VhYmxlLmZhaWxpbmcoImJhciIpKTsKKworICAgICAgICB0cnkgeworICAgICAgICAgICAgdHJ5ICh2YXIgY2MgPSBDbG9zYWJsZUNvbGxlY3Rpb24ud3JhcChjKTspIHsKKyAgICAgICAgICAgICAgICBUcnV0aC5hc3NlcnRUaGF0KGNjLmdldENvbGxlY3Rpb24oKSkuaXNTYW1lSW5zdGFuY2VBcyhjKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICAgIFRydXRoLmFzc2VydFRoYXQoZSkuaGFzTWVzc2FnZVRoYXQoKS5pc0VxdWFsVG8oIjIgb2YgMiBmYWlsZWQgd2hpbGUgY2xvc2luZyIpOworICAgICAgICAgICAgVHJ1dGguYXNzZXJ0VGhhdChlLmdldFN1cHByZXNzZWQoKSkKKyAgICAgICAgICAgICAgICAgICAgLmFzTGlzdCgpCisgICAgICAgICAgICAgICAgICAgIC5jb21wYXJpbmdFbGVtZW50c1VzaW5nKAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIENvcnJlc3BvbmRlbmNlLnRyYW5zZm9ybWluZyhFeGNlcHRpb246OmdldE1lc3NhZ2UsICJoYXMgYSBtZXNzYWdlIG9mICIpKQorICAgICAgICAgICAgICAgICAgICAuY29udGFpbnNFeGFjdGx5KCJmb28gY2xvc2UgZmFpbGVkIiwgImJhciBjbG9zZSBmYWlsZWQiKTsKKyAgICAgICAgfQorICAgIH0KK30KZGlmZiAtLWdpdCBhL2JhY2twb3J0ZWRfZml4ZXMvdGVzdHMvamF2YS9jb20vYW5kcm9pZC9idWlsZC9iYWNrcG9ydGVkZml4ZXMvY29tbW9uL1BhcnNlclRlc3QuamF2YSBiL2JhY2twb3J0ZWRfZml4ZXMvdGVzdHMvamF2YS9jb20vYW5kcm9pZC9idWlsZC9iYWNrcG9ydGVkZml4ZXMvY29tbW9uL1BhcnNlclRlc3QuamF2YQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40NDRlNjk0Ci0tLSAvZGV2L251bGwKKysrIGIvYmFja3BvcnRlZF9maXhlcy90ZXN0cy9qYXZhL2NvbS9hbmRyb2lkL2J1aWxkL2JhY2twb3J0ZWRmaXhlcy9jb21tb24vUGFyc2VyVGVzdC5qYXZhCkBAIC0wLDAgKzEsOTQgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMjQgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorICoKKyAqIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOworICogeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLgorICogWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisgKgorICogICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKyAqCisgKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisgKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorICogV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisgKiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisgKiBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKyAqLworcGFja2FnZSBjb20uYW5kcm9pZC5idWlsZC5iYWNrcG9ydGVkZml4ZXMuY29tbW9uOworCitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuY29tbW9uLnRydXRoLlRydXRoLmFzc2VydFRoYXQ7CitpbXBvcnQgc3RhdGljIGNvbS5nb29nbGUuY29tbW9uLnRydXRoLmV4dGVuc2lvbnMucHJvdG8uUHJvdG9UcnV0aC5hc3NlcnRUaGF0OworCitpbXBvcnQgY29tLmFuZHJvaWQuYnVpbGQuYmFja3BvcnRlZGZpeGVzLkJhY2twb3J0ZWRGaXg7CitpbXBvcnQgY29tLmFuZHJvaWQuYnVpbGQuYmFja3BvcnRlZGZpeGVzLkJhY2twb3J0ZWRGaXhlczsKKworaW1wb3J0IGNvbS5nb29nbGUuY29tbW9uLmNvbGxlY3QuSW1tdXRhYmxlTGlzdDsKKworaW1wb3J0IG9yZy5qdW5pdC5UZXN0OworCitpbXBvcnQgamF2YS5pby5CeXRlQXJyYXlJbnB1dFN0cmVhbTsKK2ltcG9ydCBqYXZhLmlvLklPRXhjZXB0aW9uOworaW1wb3J0IGphdmEubmlvLmZpbGUuRmlsZXM7CisKKy8qKiBUZXN0cyBmb3Ige0BsaW5rIFBhcnNlcn0uKi8KK3B1YmxpYyBjbGFzcyBQYXJzZXJUZXN0IHsKKworICAgIEBUZXN0CisgICAgcHVibGljIHZvaWQgZ2V0RmlsZUlucHV0U3RyZWFtcygpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgICAgIHZhciByZXN1bHRzID0gUGFyc2VyLmdldEZpbGVJbnB1dFN0cmVhbXMoCisgICAgICAgICAgICAgICAgSW1tdXRhYmxlTGlzdC5vZihGaWxlcy5jcmVhdGVUZW1wRmlsZSgidGVzdCIsIG51bGwpLnRvRmlsZSgpKSk7CisgICAgICAgIGFzc2VydFRoYXQocmVzdWx0cykuaXNOb3RFbXB0eSgpOworICAgIH0KKworCisgICAgQFRlc3QKKyAgICBwdWJsaWMgdm9pZCBnZXRCaXRTZXRBcnJheV9lbXB0eSgpIHsKKyAgICAgICAgdmFyIHJlc3VsdHMgPSBQYXJzZXIuZ2V0Qml0U2V0QXJyYXkobmV3IGludFtde30pOworICAgICAgICBhc3NlcnRUaGF0KHJlc3VsdHMpLmlzRW1wdHkoKTsKKyAgICB9CisKKyAgICBAVGVzdAorICAgIHB1YmxpYyB2b2lkIGdldEJpdFNldEFycmF5XzJfM182NCgpIHsKKyAgICAgICAgdmFyIHJlc3VsdHMgPSBQYXJzZXIuZ2V0Qml0U2V0QXJyYXkobmV3IGludFtdezIsMyw2NH0pOworICAgICAgICBhc3NlcnRUaGF0KHJlc3VsdHMpLmFzTGlzdCgpLmNvbnRhaW5zRXhhY3RseSgxMkwsMUwpLmluT3JkZXIoKTsKKyAgICB9CisKKyAgICBAVGVzdAorICAgIHB1YmxpYyB2b2lkIHBhcnNlQmFja3BvcnRlZEZpeGVzX2VtcHR5KCkgdGhyb3dzIElPRXhjZXB0aW9uIHsKKyAgICAgICAgdmFyIHJlc3VsdCA9IFBhcnNlci5wYXJzZUJhY2twb3J0ZWRGaXhlcyhJbW11dGFibGVMaXN0Lm9mKCkpOworICAgICAgICBhc3NlcnRUaGF0KHJlc3VsdCkuaXNFcXVhbFRvKEJhY2twb3J0ZWRGaXhlcy5nZXREZWZhdWx0SW5zdGFuY2UoKSk7CisgICAgfQorCisgICAgQFRlc3QKKyAgICBwdWJsaWMgdm9pZCBwYXJzZUJhY2twb3J0ZWRGaXhlc19vbmVCbGFuaygpIHRocm93cyBJT0V4Y2VwdGlvbiB7CisgICAgICAgIHZhciByZXN1bHQgPSBQYXJzZXIucGFyc2VCYWNrcG9ydGVkRml4ZXMoCisgICAgICAgICAgICAgICAgSW1tdXRhYmxlTGlzdC5vZihpbnB1dFN0cmVhbShCYWNrcG9ydGVkRml4LmdldERlZmF1bHRJbnN0YW5jZSgpKSkpOworCisgICAgICAgIGFzc2VydFRoYXQocmVzdWx0KS5pc0VxdWFsVG8oCisgICAgICAgICAgICAgICAgQmFja3BvcnRlZEZpeGVzLm5ld0J1aWxkZXIoKQorICAgICAgICAgICAgICAgICAgICAgICAgLmFkZEZpeGVzKEJhY2twb3J0ZWRGaXguZ2V0RGVmYXVsdEluc3RhbmNlKCkpCisgICAgICAgICAgICAgICAgICAgICAgICAuYnVpbGQoKSk7CisgICAgfQorCisgICAgQFRlc3QKKyAgICBwdWJsaWMgdm9pZCBwYXJzZUJhY2twb3J0ZWRGaXhlc190d28oKSB0aHJvd3MgSU9FeGNlcHRpb24geworICAgICAgICBCYWNrcG9ydGVkRml4IGtpMTIzID0gQmFja3BvcnRlZEZpeC5uZXdCdWlsZGVyKCkKKyAgICAgICAgICAgICAgICAuc2V0S25vd25Jc3N1ZSgxMjMpCisgICAgICAgICAgICAgICAgLnNldEFsaWFzKDEpCisgICAgICAgICAgICAgICAgLmJ1aWxkKCk7CisgICAgICAgIEJhY2twb3J0ZWRGaXgga2k0NTYgPSBCYWNrcG9ydGVkRml4Lm5ld0J1aWxkZXIoKQorICAgICAgICAgICAgICAgIC5zZXRLbm93bklzc3VlKDQ1NikKKyAgICAgICAgICAgICAgICAuc2V0QWxpYXMoMikKKyAgICAgICAgICAgICAgICAuYnVpbGQoKTsKKyAgICAgICAgdmFyIHJlc3VsdCA9IFBhcnNlci5wYXJzZUJhY2twb3J0ZWRGaXhlcygKKyAgICAgICAgICAgICAgICBJbW11dGFibGVMaXN0Lm9mKGlucHV0U3RyZWFtKGtpMTIzKSwgaW5wdXRTdHJlYW0oa2k0NTYpKSk7CisgICAgICAgIGFzc2VydFRoYXQocmVzdWx0KS5pc0VxdWFsVG8oCisgICAgICAgICAgICAgICAgQmFja3BvcnRlZEZpeGVzLm5ld0J1aWxkZXIoKQorICAgICAgICAgICAgICAgICAgICAgICAgLmFkZEZpeGVzKGtpMTIzKQorICAgICAgICAgICAgICAgICAgICAgICAgLmFkZEZpeGVzKGtpNDU2KQorICAgICAgICAgICAgICAgICAgICAgICAgLmJ1aWxkKCkpOworICAgIH0KKworICAgIHByaXZhdGUgc3RhdGljIEJ5dGVBcnJheUlucHV0U3RyZWFtIGlucHV0U3RyZWFtKEJhY2twb3J0ZWRGaXggZikgeworICAgICAgICByZXR1cm4gbmV3IEJ5dGVBcnJheUlucHV0U3RyZWFtKGYudG9CeXRlQXJyYXkoKSk7CisgICAgfQorfQpkaWZmIC0tZ2l0IGEvY2kvQW5kcm9pZC5icCBiL2NpL0FuZHJvaWQuYnAKaW5kZXggMGRmYmQzNy4uM2YyOGJlNCAxMDA2NDQKLS0tIGEvY2kvQW5kcm9pZC5icAorKysgYi9jaS9BbmRyb2lkLmJwCkBAIC0yNSw3ICsyNSw3IEBACiAgICAgICAgICJidWlsZF90ZXN0X3N1aXRlc190ZXN0LnB5IiwKICAgICBdLAogICAgIGxpYnM6IFsKLSAgICAgICAgImJ1aWxkX3Rlc3Rfc3VpdGVzIiwKKyAgICAgICAgImJ1aWxkX3Rlc3Rfc3VpdGVzX2xpYiIsCiAgICAgICAgICJweWZha2VmcyIsCiAgICAgICAgICJjaV90ZXN0X2xpYiIsCiAgICAgXSwKQEAgLTU2LDcgKzU2LDcgQEAKICAgICAgICAgImJ1aWxkX3Rlc3Rfc3VpdGVzX2xvY2FsX3Rlc3QucHkiLAogICAgIF0sCiAgICAgbGliczogWwotICAgICAgICAiYnVpbGRfdGVzdF9zdWl0ZXMiLAorICAgICAgICAiYnVpbGRfdGVzdF9zdWl0ZXNfbGliIiwKICAgICAgICAgInB5ZmFrZWZzIiwKICAgICAgICAgImNpX3Rlc3RfbGliIiwKICAgICBdLApAQCAtNzksNyArNzksNyBAQAogICAgICAgICAib3B0aW1pemVkX3RhcmdldHNfdGVzdC5weSIsCiAgICAgXSwKICAgICBsaWJzOiBbCi0gICAgICAgICJidWlsZF90ZXN0X3N1aXRlcyIsCisgICAgICAgICJidWlsZF90ZXN0X3N1aXRlc19saWIiLAogICAgICAgICAicHlmYWtlZnMiLAogICAgIF0sCiAgICAgdGVzdF9vcHRpb25zOiB7CkBAIC05NSw3ICs5NSw3IEBACiAgICAgfSwKIH0KIAotcHl0aG9uX2xpYnJhcnlfaG9zdCB7CitweXRob25fYmluYXJ5X2hvc3QgewogICAgIG5hbWU6ICJidWlsZF90ZXN0X3N1aXRlcyIsCiAgICAgc3JjczogWwogICAgICAgICAiYnVpbGRfdGVzdF9zdWl0ZXMucHkiLApAQCAtMTAzLDYgKzEwMywyOCBAQAogICAgICAgICAidGVzdF9tYXBwaW5nX21vZHVsZV9yZXRyaWV2ZXIucHkiLAogICAgICAgICAiYnVpbGRfY29udGV4dC5weSIsCiAgICAgICAgICJ0ZXN0X2Rpc2NvdmVyeV9hZ2VudC5weSIsCisgICAgICAgICJtZXRyaWNzX2FnZW50LnB5IiwKKyAgICAgICAgImJ1aWxkYm90LnB5IiwKKyAgICBdLAorICAgIG1haW46ICJidWlsZF90ZXN0X3N1aXRlcy5weSIsCisgICAgbGliczogWworICAgICAgICAic29vbmctbWV0cmljcy1wcm90by1weSIsCisgICAgXSwKK30KKworcHl0aG9uX2xpYnJhcnlfaG9zdCB7CisgICAgbmFtZTogImJ1aWxkX3Rlc3Rfc3VpdGVzX2xpYiIsCisgICAgc3JjczogWworICAgICAgICAiYnVpbGRfdGVzdF9zdWl0ZXMucHkiLAorICAgICAgICAib3B0aW1pemVkX3RhcmdldHMucHkiLAorICAgICAgICAidGVzdF9tYXBwaW5nX21vZHVsZV9yZXRyaWV2ZXIucHkiLAorICAgICAgICAiYnVpbGRfY29udGV4dC5weSIsCisgICAgICAgICJ0ZXN0X2Rpc2NvdmVyeV9hZ2VudC5weSIsCisgICAgICAgICJtZXRyaWNzX2FnZW50LnB5IiwKKyAgICAgICAgImJ1aWxkYm90LnB5IiwKKyAgICBdLAorICAgIGxpYnM6IFsKKyAgICAgICAgInNvb25nLW1ldHJpY3MtcHJvdG8tcHkiLAogICAgIF0sCiB9CiAKZGlmZiAtLWdpdCBhL2NpL2J1aWxkX2NvbnRleHQucHkgYi9jaS9idWlsZF9jb250ZXh0LnB5CmluZGV4IGNjNDhkNTMuLmM3YTFkZWYgMTAwNjQ0Ci0tLSBhL2NpL2J1aWxkX2NvbnRleHQucHkKKysrIGIvY2kvYnVpbGRfY29udGV4dC5weQpAQCAtNDcsNiArNDcsOSBAQAogICAgICAgc2VsZi5pc190ZXN0X21hcHBpbmcgPSBGYWxzZQogICAgICAgc2VsZi50ZXN0X21hcHBpbmdfdGVzdF9ncm91cHMgPSBzZXQoKQogICAgICAgc2VsZi5maWxlX2Rvd25sb2FkX29wdGlvbnMgPSBzZXQoKQorICAgICAgc2VsZi5uYW1lID0gdGVzdF9pbmZvX2RpY3QuZ2V0KCduYW1lJykKKyAgICAgIHNlbGYuY29tbWFuZCA9IHRlc3RfaW5mb19kaWN0LmdldCgnY29tbWFuZCcpCisgICAgICBzZWxmLmV4dHJhX29wdGlvbnMgPSB0ZXN0X2luZm9fZGljdC5nZXQoJ2V4dHJhT3B0aW9ucycpCiAgICAgICBmb3Igb3B0IGluIHRlc3RfaW5mb19kaWN0LmdldCgnZXh0cmFPcHRpb25zJywgW10pOgogICAgICAgICBrZXkgPSBvcHQuZ2V0KCdrZXknKQogICAgICAgICBpZiBrZXkgPT0gJ3Rlc3QtbWFwcGluZy10ZXN0LWdyb3VwJzoKZGlmZiAtLWdpdCBhL2NpL2J1aWxkX3Rlc3Rfc3VpdGVzIGIvY2kvYnVpbGRfdGVzdF9zdWl0ZXMKaW5kZXggNWFhZjJmNC4uOWQxMTI2OCAxMDA3NTUKLS0tIGEvY2kvYnVpbGRfdGVzdF9zdWl0ZXMKKysrIGIvY2kvYnVpbGRfdGVzdF9zdWl0ZXMKQEAgLTEsNCArMSw0IEBACi0jIXByZWJ1aWx0cy9idWlsZC10b29scy9saW51eC14ODYvYmluL3B5My1jbWQgLUIKKyMhL3Vzci9iaW4vZW52IGJhc2gKICMKICMgQ29weXJpZ2h0IDIwMjQsIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKICMKQEAgLTE0LDcgKzE0LDUgQEAKICMgU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAogIyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KIAotaW1wb3J0IGJ1aWxkX3Rlc3Rfc3VpdGVzCi1pbXBvcnQgc3lzCi0KLWJ1aWxkX3Rlc3Rfc3VpdGVzLm1haW4oc3lzLmFyZ3ZbMTpdKQorYnVpbGQvc29vbmcvc29vbmdfdWkuYmFzaCAtLW1ha2UtbW9kZSBidWlsZF90ZXN0X3N1aXRlcyB8fCBleGl0ICQ/CiskKGJ1aWxkL3Nvb25nL3Nvb25nX3VpLmJhc2ggLS1kdW1wdmFyLW1vZGUgSE9TVF9PVVQpL2Jpbi9idWlsZF90ZXN0X3N1aXRlcyAkQCB8fCBleGl0ICQ/CmRpZmYgLS1naXQgYS9jaS9idWlsZF90ZXN0X3N1aXRlcy5weSBiL2NpL2J1aWxkX3Rlc3Rfc3VpdGVzLnB5CmluZGV4IGI4YzRhMzguLmNkOWQ3NmQgMTAwNjQ0Ci0tLSBhL2NpL2J1aWxkX3Rlc3Rfc3VpdGVzLnB5CisrKyBiL2NpL2J1aWxkX3Rlc3Rfc3VpdGVzLnB5CkBAIC0yMCwxMSArMjAsMTQgQEAKIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgb3MKIGltcG9ydCBwYXRobGliCitpbXBvcnQgcmUKIGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgc3lzCiBmcm9tIHR5cGluZyBpbXBvcnQgQ2FsbGFibGUKIGZyb20gYnVpbGRfY29udGV4dCBpbXBvcnQgQnVpbGRDb250ZXh0CiBpbXBvcnQgb3B0aW1pemVkX3RhcmdldHMKK2ltcG9ydCBtZXRyaWNzX2FnZW50CitpbXBvcnQgdGVzdF9kaXNjb3ZlcnlfYWdlbnQKIAogCiBSRVFVSVJFRF9FTlZfVkFSUyA9IGZyb3plbnNldChbJ1RBUkdFVF9QUk9EVUNUJywgJ1RBUkdFVF9SRUxFQVNFJywgJ1RPUCddKQpAQCAtNzAsNyArNzMsMjQgQEAKIAogICAgIGJ1aWxkX3RhcmdldHMgPSBzZXQoKQogICAgIHBhY2thZ2luZ19jb21tYW5kc19nZXR0ZXJzID0gW10KKyAgICB0ZXN0X2Rpc2NvdmVyeV96aXBfcmVnZXhlcyA9IHNldCgpCisgICAgb3B0aW1pemF0aW9uX3JhdGlvbmFsZSA9ICcnCisgICAgdHJ5OgorICAgICAgIyBEbyBub3QgdXNlIHRoZXNlIHJlZ2V4ZXMgZm9yIG5vdywgb25seSBydW4gdGhpcyB0byBjb2xsZWN0IGRhdGEgb24gd2hhdAorICAgICAgIyB3b3VsZCBiZSBvcHRpbWl6ZWQuCisgICAgICB0ZXN0X2Rpc2NvdmVyeV96aXBfcmVnZXhlcyA9IHNlbGYuX2dldF90ZXN0X2Rpc2NvdmVyeV96aXBfcmVnZXhlcygpCisgICAgICBsb2dnaW5nLmluZm8oZidEaXNjb3ZlcmVkIHRlc3QgZGlzY292ZXJ5IHJlZ2V4ZXM6IHt0ZXN0X2Rpc2NvdmVyeV96aXBfcmVnZXhlc30nKQorICAgIGV4Y2VwdCB0ZXN0X2Rpc2NvdmVyeV9hZ2VudC5UZXN0RGlzY292ZXJ5RXJyb3IgYXMgZToKKyAgICAgIG9wdGltaXphdGlvbl9yYXRpb25hbGUgPSBlLm1lc3NhZ2UKKyAgICAgIGxvZ2dpbmcud2FybmluZyhmJ1VuYWJsZSB0byBwZXJmb3JtIHRlc3QgZGlzY292ZXJ5OiB7b3B0aW1pemF0aW9uX3JhdGlvbmFsZX0nKQogICAgIGZvciB0YXJnZXQgaW4gc2VsZi5hcmdzLmV4dHJhX3RhcmdldHM6CisgICAgICBpZiBvcHRpbWl6YXRpb25fcmF0aW9uYWxlOgorICAgICAgICBnZXRfbWV0cmljc19hZ2VudCgpLnJlcG9ydF91bm9wdGltaXplZF90YXJnZXQodGFyZ2V0LCBvcHRpbWl6YXRpb25fcmF0aW9uYWxlKQorICAgICAgZWxzZToKKyAgICAgICAgcmVnZXggPSByJ1xiKCVzKVxiJyAlIHJlLmVzY2FwZSh0YXJnZXQpCisgICAgICAgIGlmIGFueShyZS5zZWFyY2gocmVnZXgsIG9wdCkgZm9yIG9wdCBpbiB0ZXN0X2Rpc2NvdmVyeV96aXBfcmVnZXhlcyk6CisgICAgICAgICAgZ2V0X21ldHJpY3NfYWdlbnQoKS5yZXBvcnRfb3B0aW1pemVkX3RhcmdldCh0YXJnZXQpCisKICAgICAgIGlmIHNlbGYuX3VudXNlZF90YXJnZXRfZXhjbHVzaW9uX2VuYWJsZWQoCiAgICAgICAgICAgdGFyZ2V0CiAgICAgICApIGFuZCBub3Qgc2VsZi5idWlsZF9jb250ZXh0LmJ1aWxkX3RhcmdldF91c2VkKHRhcmdldCk6CkBAIC05Nyw2ICsxMTcsMzQgQEAKICAgICAgICAgaW4gc2VsZi5idWlsZF9jb250ZXh0LmVuYWJsZWRfYnVpbGRfZmVhdHVyZXMKICAgICApCiAKKyAgZGVmIF9nZXRfdGVzdF9kaXNjb3ZlcnlfemlwX3JlZ2V4ZXMoc2VsZikgLT4gc2V0W3N0cl06CisgICAgYnVpbGRfdGFyZ2V0X3JlZ2V4ZXMgPSBzZXQoKQorICAgIGZvciB0ZXN0X2luZm8gaW4gc2VsZi5idWlsZF9jb250ZXh0LnRlc3RfaW5mb3M6CisgICAgICB0Zl9jb21tYW5kID0gc2VsZi5fYnVpbGRfdGZfY29tbWFuZCh0ZXN0X2luZm8pCisgICAgICBkaXNjb3ZlcnlfYWdlbnQgPSB0ZXN0X2Rpc2NvdmVyeV9hZ2VudC5UZXN0RGlzY292ZXJ5QWdlbnQodHJhZGVmZWRfYXJncz10Zl9jb21tYW5kKQorICAgICAgZm9yIHJlZ2V4IGluIGRpc2NvdmVyeV9hZ2VudC5kaXNjb3Zlcl90ZXN0X3ppcF9yZWdleGVzKCk6CisgICAgICAgIGJ1aWxkX3RhcmdldF9yZWdleGVzLmFkZChyZWdleCkKKyAgICByZXR1cm4gYnVpbGRfdGFyZ2V0X3JlZ2V4ZXMKKworCisgIGRlZiBfYnVpbGRfdGZfY29tbWFuZChzZWxmLCB0ZXN0X2luZm8pIC0+IGxpc3Rbc3RyXToKKyAgICBjb21tYW5kID0gW3Rlc3RfaW5mby5jb21tYW5kXQorICAgIGZvciBleHRyYV9vcHRpb24gaW4gdGVzdF9pbmZvLmV4dHJhX29wdGlvbnM6CisgICAgICBpZiBub3QgZXh0cmFfb3B0aW9uLmdldCgna2V5Jyk6CisgICAgICAgIGNvbnRpbnVlCisgICAgICBhcmdfa2V5ID0gJy0tJyArIGV4dHJhX29wdGlvbi5nZXQoJ2tleScpCisgICAgICBpZiBhcmdfa2V5ID09ICctLWJ1aWxkLWlkJzoKKyAgICAgICAgY29tbWFuZC5hcHBlbmQoYXJnX2tleSkKKyAgICAgICAgY29tbWFuZC5hcHBlbmQob3MuZW52aXJvbi5nZXQoJ0JVSUxEX05VTUJFUicpKQorICAgICAgICBjb250aW51ZQorICAgICAgaWYgZXh0cmFfb3B0aW9uLmdldCgndmFsdWVzJyk6CisgICAgICAgIGZvciB2YWx1ZSBpbiBleHRyYV9vcHRpb24uZ2V0KCd2YWx1ZXMnKToKKyAgICAgICAgICBjb21tYW5kLmFwcGVuZChhcmdfa2V5KQorICAgICAgICAgIGNvbW1hbmQuYXBwZW5kKHZhbHVlKQorICAgICAgZWxzZToKKyAgICAgICAgY29tbWFuZC5hcHBlbmQoYXJnX2tleSkKKworICAgIHJldHVybiBjb21tYW5kCiAKIEBkYXRhY2xhc3MoZnJvemVuPVRydWUpCiBjbGFzcyBCdWlsZFBsYW46CkBAIC0xMTMsMTkgKzE2MSwyNyBAQAogICBSZXR1cm5zOgogICAgIFRoZSBleGl0IGNvZGUgb2YgdGhlIGJ1aWxkLgogICAiIiIKLSAgYXJncyA9IHBhcnNlX2FyZ3MoYXJndikKLSAgY2hlY2tfcmVxdWlyZWRfZW52KCkKLSAgYnVpbGRfY29udGV4dCA9IEJ1aWxkQ29udGV4dChsb2FkX2J1aWxkX2NvbnRleHQoKSkKLSAgYnVpbGRfcGxhbm5lciA9IEJ1aWxkUGxhbm5lcigKLSAgICAgIGJ1aWxkX2NvbnRleHQsIGFyZ3MsIG9wdGltaXplZF90YXJnZXRzLk9QVElNSVpFRF9CVUlMRF9UQVJHRVRTCi0gICkKLSAgYnVpbGRfcGxhbiA9IGJ1aWxkX3BsYW5uZXIuY3JlYXRlX2J1aWxkX3BsYW4oKQorICBnZXRfbWV0cmljc19hZ2VudCgpLmFuYWx5c2lzX3N0YXJ0KCkKKyAgdHJ5OgorICAgIGFyZ3MgPSBwYXJzZV9hcmdzKGFyZ3YpCisgICAgY2hlY2tfcmVxdWlyZWRfZW52KCkKKyAgICBidWlsZF9jb250ZXh0ID0gQnVpbGRDb250ZXh0KGxvYWRfYnVpbGRfY29udGV4dCgpKQorICAgIGJ1aWxkX3BsYW5uZXIgPSBCdWlsZFBsYW5uZXIoCisgICAgICAgIGJ1aWxkX2NvbnRleHQsIGFyZ3MsIG9wdGltaXplZF90YXJnZXRzLk9QVElNSVpFRF9CVUlMRF9UQVJHRVRTCisgICAgKQorICAgIGJ1aWxkX3BsYW4gPSBidWlsZF9wbGFubmVyLmNyZWF0ZV9idWlsZF9wbGFuKCkKKyAgZXhjZXB0OgorICAgIHJhaXNlCisgIGZpbmFsbHk6CisgICAgZ2V0X21ldHJpY3NfYWdlbnQoKS5hbmFseXNpc19lbmQoKQogCiAgIHRyeToKICAgICBleGVjdXRlX2J1aWxkX3BsYW4oYnVpbGRfcGxhbikKICAgZXhjZXB0IEJ1aWxkRmFpbHVyZUVycm9yIGFzIGU6CiAgICAgbG9nZ2luZy5lcnJvcignQnVpbGQgY29tbWFuZCBmYWlsZWQhIENoZWNrIGJ1aWxkX2xvZyBmb3IgZGV0YWlscy4nKQogICAgIHJldHVybiBlLnJldHVybl9jb2RlCisgIGZpbmFsbHk6CisgICAgZ2V0X21ldHJpY3NfYWdlbnQoKS5lbmRfcmVwb3J0aW5nKCkKIAogICByZXR1cm4gMAogCkBAIC0xODMsMTIgKzIzOSwxNSBAQAogICBleGNlcHQgc3VicHJvY2Vzcy5DYWxsZWRQcm9jZXNzRXJyb3IgYXMgZToKICAgICByYWlzZSBCdWlsZEZhaWx1cmVFcnJvcihlLnJldHVybmNvZGUpIGZyb20gZQogCi0gIGZvciBwYWNrYWdpbmdfY29tbWFuZHNfZ2V0dGVyIGluIGJ1aWxkX3BsYW4ucGFja2FnaW5nX2NvbW1hbmRzX2dldHRlcnM6Ci0gICAgdHJ5OgorICBnZXRfbWV0cmljc19hZ2VudCgpLnBhY2thZ2luZ19zdGFydCgpCisgIHRyeToKKyAgICBmb3IgcGFja2FnaW5nX2NvbW1hbmRzX2dldHRlciBpbiBidWlsZF9wbGFuLnBhY2thZ2luZ19jb21tYW5kc19nZXR0ZXJzOgogICAgICAgZm9yIHBhY2thZ2luZ19jb21tYW5kIGluIHBhY2thZ2luZ19jb21tYW5kc19nZXR0ZXIoKToKICAgICAgICAgcnVuX2NvbW1hbmQocGFja2FnaW5nX2NvbW1hbmQpCi0gICAgZXhjZXB0IHN1YnByb2Nlc3MuQ2FsbGVkUHJvY2Vzc0Vycm9yIGFzIGU6Ci0gICAgICByYWlzZSBCdWlsZEZhaWx1cmVFcnJvcihlLnJldHVybmNvZGUpIGZyb20gZQorICBleGNlcHQgc3VicHJvY2Vzcy5DYWxsZWRQcm9jZXNzRXJyb3IgYXMgZToKKyAgICByYWlzZSBCdWlsZEZhaWx1cmVFcnJvcihlLnJldHVybmNvZGUpIGZyb20gZQorICBmaW5hbGx5OgorICAgIGdldF9tZXRyaWNzX2FnZW50KCkucGFja2FnaW5nX2VuZCgpCiAKIAogZGVmIGdldF90b3AoKSAtPiBwYXRobGliLlBhdGg6CkBAIC0xOTksNiArMjU4LDEwIEBACiAgIHN1YnByb2Nlc3MucnVuKGFyZ3M9YXJncywgY2hlY2s9VHJ1ZSwgc3Rkb3V0PXN0ZG91dCkKIAogCitkZWYgZ2V0X21ldHJpY3NfYWdlbnQoKToKKyAgcmV0dXJuIG1ldHJpY3NfYWdlbnQuTWV0cmljc0FnZW50Lmluc3RhbmNlKCkKKworCiBkZWYgbWFpbihhcmd2KToKICAgZGlzdF9kaXIgPSBvcy5lbnZpcm9uLmdldCgnRElTVF9ESVInKQogICBpZiBkaXN0X2RpcjoKQEAgLTIwOSwzICsyNzIsNyBAQAogICAgICAgICBmaWxlbmFtZT1sb2dfZmlsZSwKICAgICApCiAgIHN5cy5leGl0KGJ1aWxkX3Rlc3Rfc3VpdGVzKGFyZ3YpKQorCisKK2lmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CisgIG1haW4oc3lzLmFyZ3ZbMTpdKQpkaWZmIC0tZ2l0IGEvY2kvYnVpbGRfdGVzdF9zdWl0ZXNfdGVzdC5weSBiL2NpL2J1aWxkX3Rlc3Rfc3VpdGVzX3Rlc3QucHkKaW5kZXggMmFmYWFiNy4uMjZmNDMxNiAxMDA2NDQKLS0tIGEvY2kvYnVpbGRfdGVzdF9zdWl0ZXNfdGVzdC5weQorKysgYi9jaS9idWlsZF90ZXN0X3N1aXRlc190ZXN0LnB5CkBAIC0zNyw2ICszNyw4IEBACiBpbXBvcnQgY2lfdGVzdF9saWIKIGltcG9ydCBvcHRpbWl6ZWRfdGFyZ2V0cwogZnJvbSBweWZha2VmcyBpbXBvcnQgZmFrZV9maWxlc3lzdGVtX3VuaXR0ZXN0CitpbXBvcnQgbWV0cmljc19hZ2VudAoraW1wb3J0IHRlc3RfZGlzY292ZXJ5X2FnZW50CiAKIAogY2xhc3MgQnVpbGRUZXN0U3VpdGVzVGVzdChmYWtlX2ZpbGVzeXN0ZW1fdW5pdHRlc3QuVGVzdENhc2UpOgpAQCAtNTIsNiArNTQsMTAgQEAKICAgICBzZWxmLmFkZENsZWFudXAoc3VicHJvY2Vzc19ydW5fcGF0Y2hlci5zdG9wKQogICAgIHNlbGYubW9ja19zdWJwcm9jZXNzX3J1biA9IHN1YnByb2Nlc3NfcnVuX3BhdGNoZXIuc3RhcnQoKQogCisgICAgbWV0cmljc19hZ2VudF9maW5hbGl6ZV9wYXRjaGVyID0gbW9jay5wYXRjaCgnbWV0cmljc19hZ2VudC5NZXRyaWNzQWdlbnQuZW5kX3JlcG9ydGluZycpCisgICAgc2VsZi5hZGRDbGVhbnVwKG1ldHJpY3NfYWdlbnRfZmluYWxpemVfcGF0Y2hlci5zdG9wKQorICAgIHNlbGYubW9ja19tZXRyaWNzX2FnZW50X2VuZCA9IG1ldHJpY3NfYWdlbnRfZmluYWxpemVfcGF0Y2hlci5zdGFydCgpCisKICAgICBzZWxmLl9zZXR1cF93b3JraW5nX2J1aWxkX2VudigpCiAKICAgZGVmIHRlc3RfbWlzc2luZ190YXJnZXRfcmVsZWFzZV9lbnZfdmFyX3JhaXNlcyhzZWxmKToKQEAgLTI1Niw2ICsyNjIsMTIgQEAKICAgICBkZWYgZ2V0X2VuYWJsZWRfZmxhZyhzZWxmKToKICAgICAgIHJldHVybiBmJ3tzZWxmLnRhcmdldH1fZW5hYmxlZCcKIAorICBkZWYgc2V0VXAoc2VsZik6CisgICAgdGVzdF9kaXNjb3ZlcnlfYWdlbnRfcGF0Y2hlciA9IG1vY2sucGF0Y2goJ3Rlc3RfZGlzY292ZXJ5X2FnZW50LlRlc3REaXNjb3ZlcnlBZ2VudC5kaXNjb3Zlcl90ZXN0X3ppcF9yZWdleGVzJykKKyAgICBzZWxmLmFkZENsZWFudXAodGVzdF9kaXNjb3ZlcnlfYWdlbnRfcGF0Y2hlci5zdG9wKQorICAgIHNlbGYubW9ja190ZXN0X2Rpc2NvdmVyeV9hZ2VudF9lbmQgPSB0ZXN0X2Rpc2NvdmVyeV9hZ2VudF9wYXRjaGVyLnN0YXJ0KCkKKworCiAgIGRlZiB0ZXN0X2J1aWxkX29wdGltaXphdGlvbl9vZmZfYnVpbGRzX2V2ZXJ5dGhpbmcoc2VsZik6CiAgICAgYnVpbGRfdGFyZ2V0cyA9IHsndGFyZ2V0XzEnLCAndGFyZ2V0XzInfQogICAgIGJ1aWxkX3BsYW5uZXIgPSBzZWxmLmNyZWF0ZV9idWlsZF9wbGFubmVyKApkaWZmIC0tZ2l0IGEvY2kvbWV0cmljc19hZ2VudC5weSBiL2NpL21ldHJpY3NfYWdlbnQucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYmMyNDc5ZQotLS0gL2Rldi9udWxsCisrKyBiL2NpL21ldHJpY3NfYWdlbnQucHkKQEAgLTAsMCArMSwxMTYgQEAKKyMgQ29weXJpZ2h0IDIwMjQsIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKyMKKyMgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlICJMaWNlbnNlIik7CisjIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKyMgWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0CisjCisjICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKyMKKyMgVW5sZXNzIHJlcXVpcmVkIGJ5IGFwcGxpY2FibGUgbGF3IG9yIGFncmVlZCB0byBpbiB3cml0aW5nLCBzb2Z0d2FyZQorIyBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorIyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4KKyMgU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAorIyBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKworIiIiTWV0cmljc0FnZW50IGlzIGEgc2luZ2xldG9uIGNsYXNzIHRoYXQgY29sbGVjdHMgbWV0cmljcyBmb3Igb3B0aW1pemVkIGJ1aWxkLiIiIgorCitmcm9tIGVudW0gaW1wb3J0IEVudW0KK2ltcG9ydCB0aW1lCitpbXBvcnQgbWV0cmljc19wYjIKK2ltcG9ydCBvcworaW1wb3J0IGxvZ2dpbmcKKworCitjbGFzcyBNZXRyaWNzQWdlbnQ6CisgIF9TT09OR19NRVRSSUNTX1BBVEggPSAnbG9ncy9zb29uZ19tZXRyaWNzJworICBfRElTVF9ESVIgPSAnRElTVF9ESVInCisgIF9pbnN0YW5jZSA9IE5vbmUKKworICBkZWYgX19pbml0X18oc2VsZik6CisgICAgcmFpc2UgUnVudGltZUVycm9yKAorICAgICAgICAnTWV0cmljc0FnZW50IGNhbm5vdCBiZSBpbnN0YW50aWFsaXplZCwgdXNlIGluc3RhbmNlKCkgaW5zdGVhZCcKKyAgICApCisKKyAgQGNsYXNzbWV0aG9kCisgIGRlZiBpbnN0YW5jZShjbHMpOgorICAgIGlmIG5vdCBjbHMuX2luc3RhbmNlOgorICAgICAgY2xzLl9pbnN0YW5jZSA9IGNscy5fX25ld19fKGNscykKKyAgICAgIGNscy5faW5zdGFuY2UuX3Byb3RvID0gbWV0cmljc19wYjIuT3B0aW1pemVkQnVpbGRNZXRyaWNzKCkKKyAgICAgIGNscy5faW5zdGFuY2UuX2luaXRfcHJvdG8oKQorICAgICAgY2xzLl9pbnN0YW5jZS5fdGFyZ2V0X3Jlc3VsdHMgPSBkaWN0KCkKKworICAgIHJldHVybiBjbHMuX2luc3RhbmNlCisKKyAgZGVmIF9pbml0X3Byb3RvKHNlbGYpOgorICAgIHNlbGYuX3Byb3RvLmFuYWx5c2lzX3BlcmYubmFtZSA9ICdPcHRpbWl6ZWQgYnVpbGQgYW5hbHlzaXMgdGltZS4nCisgICAgc2VsZi5fcHJvdG8ucGFja2FnaW5nX3BlcmYubmFtZSA9ICdPcHRpbWl6ZWQgYnVpbGQgdG90YWwgcGFja2FnaW5nIHRpbWUuJworCisgIGRlZiBhbmFseXNpc19zdGFydChzZWxmKToKKyAgICBzZWxmLl9wcm90by5hbmFseXNpc19wZXJmLnN0YXJ0X3RpbWUgPSB0aW1lLnRpbWVfbnMoKQorCisgIGRlZiBhbmFseXNpc19lbmQoc2VsZik6CisgICAgc2VsZi5fcHJvdG8uYW5hbHlzaXNfcGVyZi5yZWFsX3RpbWUgPSAoCisgICAgICAgIHRpbWUudGltZV9ucygpIC0gc2VsZi5fcHJvdG8uYW5hbHlzaXNfcGVyZi5zdGFydF90aW1lCisgICAgKQorCisgIGRlZiBwYWNrYWdpbmdfc3RhcnQoc2VsZik6CisgICAgc2VsZi5fcHJvdG8ucGFja2FnaW5nX3BlcmYuc3RhcnRfdGltZSA9IHRpbWUudGltZV9ucygpCisKKyAgZGVmIHBhY2thZ2luZ19lbmQoc2VsZik6CisgICAgc2VsZi5fcHJvdG8ucGFja2FnaW5nX3BlcmYucmVhbF90aW1lID0gKAorICAgICAgICB0aW1lLnRpbWVfbnMoKSAtIHNlbGYuX3Byb3RvLnBhY2thZ2luZ19wZXJmLnN0YXJ0X3RpbWUKKyAgICApCisKKyAgZGVmIHJlcG9ydF9vcHRpbWl6ZWRfdGFyZ2V0KHNlbGYsIG5hbWU6IHN0cik6CisgICAgdGFyZ2V0X3Jlc3VsdCA9IG1ldHJpY3NfcGIyLk9wdGltaXplZEJ1aWxkTWV0cmljcy5UYXJnZXRPcHRpbWl6YXRpb25SZXN1bHQoKQorICAgIHRhcmdldF9yZXN1bHQubmFtZSA9IG5hbWUKKyAgICB0YXJnZXRfcmVzdWx0Lm9wdGltaXplZCA9IFRydWUKKyAgICBzZWxmLl90YXJnZXRfcmVzdWx0c1tuYW1lXSA9IHRhcmdldF9yZXN1bHQKKworICBkZWYgcmVwb3J0X3Vub3B0aW1pemVkX3RhcmdldChzZWxmLCBuYW1lOiBzdHIsIG9wdGltaXphdGlvbl9yYXRpb25hbGU6IHN0cik6CisgICAgdGFyZ2V0X3Jlc3VsdCA9IG1ldHJpY3NfcGIyLk9wdGltaXplZEJ1aWxkTWV0cmljcy5UYXJnZXRPcHRpbWl6YXRpb25SZXN1bHQoKQorICAgIHRhcmdldF9yZXN1bHQubmFtZSA9IG5hbWUKKyAgICB0YXJnZXRfcmVzdWx0Lm9wdGltaXphdGlvbl9yYXRpb25hbGUgPSBvcHRpbWl6YXRpb25fcmF0aW9uYWxlCisgICAgdGFyZ2V0X3Jlc3VsdC5vcHRpbWl6ZWQgPSBGYWxzZQorICAgIHNlbGYuX3RhcmdldF9yZXN1bHRzW25hbWVdID0gdGFyZ2V0X3Jlc3VsdAorCisgIGRlZiB0YXJnZXRfcGFja2FnaW5nX3N0YXJ0KHNlbGYsIG5hbWU6IHN0cik6CisgICAgdGFyZ2V0X3Jlc3VsdCA9IHNlbGYuX3RhcmdldF9yZXN1bHRzLmdldChuYW1lKQorICAgIHRhcmdldF9yZXN1bHQucGFja2FnaW5nX3BlcmYuc3RhcnRfdGltZSA9IHRpbWUudGltZV9ucygpCisgICAgc2VsZi5fdGFyZ2V0X3Jlc3VsdHNbbmFtZV0gPSB0YXJnZXRfcmVzdWx0CisKKyAgZGVmIHRhcmdldF9wYWNrYWdpbmdfZW5kKHNlbGYsIG5hbWU6IHN0cik6CisgICAgdGFyZ2V0X3Jlc3VsdCA9IHNlbGYuX3RhcmdldF9yZXN1bHRzLmdldChuYW1lKQorICAgIHRhcmdldF9yZXN1bHQucGFja2FnaW5nX3BlcmYucmVhbF90aW1lID0gKAorICAgICAgICB0aW1lLnRpbWVfbnMoKSAtIHRhcmdldF9yZXN1bHQucGFja2FnaW5nX3BlcmYuc3RhcnRfdGltZQorICAgICkKKworICBkZWYgYWRkX3RhcmdldF9hcnRpZmFjdCgKKyAgICAgIHNlbGYsCisgICAgICB0YXJnZXRfbmFtZTogc3RyLAorICAgICAgYXJ0aWZhY3RfbmFtZTogc3RyLAorICAgICAgc2l6ZTogaW50LAorICAgICAgaW5jbHVkZWRfbW9kdWxlczogc2V0W3N0cl0sCisgICk6CisgICAgdGFyZ2V0X3Jlc3VsdCA9IHNlbGYudGFyZ2V0X3Jlc3VsdHMuZ2V0KHRhcmdldF9uYW1lKQorICAgIGFydGlmYWN0ID0gKAorICAgICAgICBtZXRyaWNzX3BiMi5PcHRpbWl6ZWRCdWlsZE1ldHJpY3MuVGFyZ2V0T3B0aW1pemF0aW9uUmVzdWx0Lk91dHB1dEFydGlmYWN0KCkKKyAgICApCisgICAgYXJ0aWZhY3QubmFtZSA9IGFydGlmYWN0X25hbWUKKyAgICBhcnRpZmFjdC5zaXplID0gc2l6ZQorICAgIGZvciBtb2R1bGUgaW4gaW5jbHVkZWRfbW9kdWxlczoKKyAgICAgIGFydGlmYWN0LmluY2x1ZGVkX21vZHVsZXMuYWRkKG1vZHVsZSkKKyAgICB0YXJnZXRfcmVzdWx0Lm91dHB1dF9hcnRpZmFjdHMuYWRkKGFydGlmYWN0KQorCisgIGRlZiBlbmRfcmVwb3J0aW5nKHNlbGYpOgorICAgIGZvciB0YXJnZXRfcmVzdWx0IGluIHNlbGYuX3RhcmdldF9yZXN1bHRzLnZhbHVlcygpOgorICAgICAgc2VsZi5fcHJvdG8udGFyZ2V0X3Jlc3VsdC5hcHBlbmQodGFyZ2V0X3Jlc3VsdCkKKyAgICBzb29uZ19tZXRyaWNzX3Byb3RvID0gbWV0cmljc19wYjIuTWV0cmljc0Jhc2UoKQorICAgICMgUmVhZCBpbiBleGlzdGluZyBtZXRyaWNzIHRoYXQgc2hvdWxkIGhhdmUgYmVlbiB3cml0dGVuIG91dCBieSB0aGUgc29vbmcKKyAgICAjIGJ1aWxkIGNvbW1hbmQgc28gdGhhdCB3ZSBkb24ndCBvdmVyd3JpdGUgdGhlbS4KKyAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKG9zLmVudmlyb25bc2VsZi5fRElTVF9ESVJdLCBzZWxmLl9TT09OR19NRVRSSUNTX1BBVEgpLCAncmInKSBhcyBmOgorICAgICAgc29vbmdfbWV0cmljc19wcm90by5QYXJzZUZyb21TdHJpbmcoZi5yZWFkKCkpCisgICAgc29vbmdfbWV0cmljc19wcm90by5vcHRpbWl6ZWRfYnVpbGRfbWV0cmljcy5Db3B5RnJvbShzZWxmLl9wcm90bykKKyAgICBsb2dnaW5nLmluZm8oc29vbmdfbWV0cmljc19wcm90bykKKyAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKG9zLmVudmlyb25bc2VsZi5fRElTVF9ESVJdLCBzZWxmLl9TT09OR19NRVRSSUNTX1BBVEgpLCAnd2InKSBhcyBmOgorICAgICAgZi53cml0ZShzb29uZ19tZXRyaWNzX3Byb3RvLlNlcmlhbGl6ZVRvU3RyaW5nKCkpCmRpZmYgLS1naXQgYS9jaS90ZXN0X2Rpc2NvdmVyeV9hZ2VudC5weSBiL2NpL3Rlc3RfZGlzY292ZXJ5X2FnZW50LnB5CmluZGV4IDRlZWQyOGQuLjAwOGVlNDcgMTAwNjQ0Ci0tLSBhL2NpL3Rlc3RfZGlzY292ZXJ5X2FnZW50LnB5CisrKyBiL2NpL3Rlc3RfZGlzY292ZXJ5X2FnZW50LnB5CkBAIC0xNyw3ICsxNyw2IEBACiBpbXBvcnQgbG9nZ2luZwogaW1wb3J0IG9zCiBpbXBvcnQgc3VicHJvY2VzcwotaW1wb3J0IGJ1aWxkYm90CiAKIAogY2xhc3MgVGVzdERpc2NvdmVyeUFnZW50OgpAQCAtNTAsNyArNDksNyBAQAogICAgICAgQSBsaXN0IG9mIHRlc3QgemlwIHJlZ2V4ZXMgdGhhdCBURiBpcyBnb2luZyB0byB0cnkgdG8gcHVsbCBmaWxlcyBmcm9tLgogICAgICIiIgogICAgIHRlc3RfZGlzY292ZXJ5X291dHB1dF9maWxlX25hbWUgPSBvcy5wYXRoLmpvaW4oCi0gICAgICAgIGJ1aWxkYm90Lk91dERpcigpLCBzZWxmLl9UUkFERUZFRF9ESVNDT1ZFUllfT1VUUFVUX0ZJTEVfTkFNRQorICAgICAgICBvcy5lbnZpcm9uLmdldCgnVE9QJyksICdvdXQnLCBzZWxmLl9UUkFERUZFRF9ESVNDT1ZFUllfT1VUUFVUX0ZJTEVfTkFNRQogICAgICkKICAgICB3aXRoIG9wZW4oCiAgICAgICAgIHRlc3RfZGlzY292ZXJ5X291dHB1dF9maWxlX25hbWUsIG1vZGU9IncrdCIKZGlmZiAtLWdpdCBhL2NvcmUvTWFrZWZpbGUgYi9jb3JlL01ha2VmaWxlCmluZGV4IGY3YTRhYzAuLjVlMGQ0ZGYgMTAwNjQ0Ci0tLSBhL2NvcmUvTWFrZWZpbGUKKysrIGIvY29yZS9NYWtlZmlsZQpAQCAtMTkyLDYgKzE5MiwzNCBAQAogdW5pcXVlX3Byb2R1Y3RfY29weV9maWxlc19wYWlycyA6PQogdW5pcXVlX3Byb2R1Y3RfY29weV9maWxlc19kZXN0aW5hdGlvbnMgOj0KIAorCisjIFJldHVybnMgYSBsaXN0IG9mIEVYVFJBX0lOU1RBTExfWklQUyB0cmlvcyB3aG9zZSBwcmltYXJ5IGZpbGUgaXMgY29udGFpbmVkIHdpdGhpbiAkKDEpCisjIFRoZSB0cmlvcyB3aWxsIGNvbnRhaW4gdGhlIHByaW1hcnkgaW5zdGFsbGVkIGZpbGUgOiB0aGUgZGlyZWN0b3J5IHRvIHVuemlwIHRoZSB6aXAgdG8gOiB0aGUgemlwCitkZWZpbmUgcmVsZXZhbnQtZXh0cmEtaW5zdGFsbC16aXBzCiskKHN0cmlwICQoZm9yZWFjaCBwLCQoRVhUUkFfSU5TVEFMTF9aSVBTKSwgXAorICAkKGlmICQoZmlsdGVyICQoY2FsbCB3b3JkLWNvbG9uLDEsJChwKSksJCgxKSksIFwKKyAgICAkKHApKSkpCitlbmRlZgorCisjIFdyaXRlcyBhIHRleHQgZmlsZSB0aGF0IGNvbnRhaW5zIGFsbCBvZiB0aGUgZmlsZXMgdGhhdCB3aWxsIGJlIGluc2lkZSBhIHBhcnRpdGlvbi4KKyMgQWxsIHRoZSBmaWxlIHBhdGhzIHdpbGwgYmUgcmVsYXRpdmUgdG8gdGhlIHBhcnRpdGlvbidzIHN0YWdpbmcgZGlyZWN0b3J5LgorIyBJdCB3aWxsIGFsc28gdGFrZSBpbnRvIGFjY291bnQgZmlsZXMgaW5zaWRlIHppcHMgbGlzdGVkIGluIEVYVFJBX0lOU1RBTExfWklQUy4KKyMKKyMgQXJndW1lbnRzOgorIyAgICQoMSk6IE91dHB1dCBmaWxlCisjICAgJCgyKTogVGhlIHBhcnRpdGlvbidzIHN0YWdpbmcgZGlyZWN0b3J5CisjICAgJCgzKTogRmlsZXMgdG8gaW5jbHVkZSBpbiB0aGUgcGFydGl0aW9uCitkZWZpbmUgd3JpdGUtcGFydGl0aW9uLWZpbGUtbGlzdAorJCgxKTogUFJJVkFURV9GSUxFUyA6PSAkKHN1YnN0ICQoMikvLCwkKGZpbHRlciAkKDIpLyUsJCgzKSkpCiskKDEpOiBQUklWQVRFX0VYVFJBX0lOU1RBTExfWklQUyA6PSAkKGNhbGwgcmVsZXZhbnQtZXh0cmEtaW5zdGFsbC16aXBzLCQoZmlsdGVyICQoMikvJSwkKDMpKSkKKyQoMSk6ICQkKEhPU1RfT1VUX0VYRUNVVEFCTEVTKS9leHRyYV9pbnN0YWxsX3ppcHNfZmlsZV9saXN0ICQoZm9yZWFjaCBwLCQoY2FsbCByZWxldmFudC1leHRyYS1pbnN0YWxsLXppcHMsJChmaWx0ZXIgJCgyKS8lLCQoMykpKSwkKGNhbGwgd29yZC1jb2xvbiwzLCQocCkpKQorCUBlY2hvIFdyaXRpbmcgJCRACisJcm0gLWYgJCRACisJZWNobyAtbiA+ICQkQAorCSQkKGZvcmVhY2ggZiwkJChQUklWQVRFX0ZJTEVTKSxlY2hvICIkJChmKSIgPj4gJCRAJCQobmV3bGluZSkpCisJJCQoSE9TVF9PVVRfRVhFQ1VUQUJMRVMpL2V4dHJhX2luc3RhbGxfemlwc19maWxlX2xpc3QgJCgyKSAkJChQUklWQVRFX0VYVFJBX0lOU1RBTExfWklQUykgPj4gJCRACitlbmRlZgorCiAjIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAjIFJldHVybnMgdGhlIG1heCBhbGxvd2VkIHNpemUgZm9yIGFuIGltYWdlIHN1aXRhYmxlIGZvciBoYXNoIHZlcmlmaWNhdGlvbgogIyAoZS5nLiwgYm9vdC5pbWcsIHJlY292ZXJ5LmltZywgZXRjKS4KQEAgLTY5Miw3ICs3MjAsNyBAQAogCiBCT0FSRF9LRVJORUxfTU9EVUxFX0RJUlMgKz0gdG9wCiAKLSMgRGVmYXVsdCB0byBub3QgZ2VuZXJhdGluZyBtb2R1bGVzLmRlcCBmb3Iga2VybmVsIG1vZHVsZXMgb24gc3lzdGVtCisjIERlZmF1bHQgdG8gbm90IGdlbmVyYXRpbmcgbW9kdWxlcy5sb2FkIGZvciBrZXJuZWwgbW9kdWxlcyBvbiBzeXN0ZW0KICMgc2lkZS4gV2Ugc2hvdWxkIG9ubHkgbG9hZCB0aGVzZSBtb2R1bGVzIGlmIHRoZXkgYXJlIGRlcGVuZGVkIGJ5IHZlbmRvcgogIyBzaWRlIG1vZHVsZXMuCiBpZmVxICgkKEJPQVJEX1NZU1RFTV9LRVJORUxfTU9EVUxFU19MT0FEKSwpCkBAIC0xMjY3LDYgKzEyOTUsMTAgQEAKIAogZW5kaWYKIAorCityYW1kaXNrX2ludGVybWVkaWF0ZXMgOj0kPSAkKGNhbGwgaW50ZXJtZWRpYXRlcy1kaXItZm9yLFBBQ0tBR0lORyxyYW1kaXNrKQorJChldmFsICQoY2FsbCB3cml0ZS1wYXJ0aXRpb24tZmlsZS1saXN0LCQocmFtZGlza19pbnRlcm1lZGlhdGVzKS9maWxlX2xpc3QudHh0LCQoVEFSR0VUX1JBTURJU0tfT1VUKSwkKElOVEVSTkFMX1JBTURJU0tfRklMRVMpKSkKKwogIyBUaGUgdmFsdWUgb2YgUkFNRElTS19OT0RFX0xJU1QgaXMgZGVmaW5lZCBpbiBzeXN0ZW0vY29yZS9yb290ZGlyL0FuZHJvaWQuYnAuCiAjIFRoaXMgZmlsZSBjb250YWlucyAvZGV2IG5vZGVzIGRlc2NyaXB0aW9uIGFkZGVkIHRvIHRoZSBnZW5lcmljIHJhbWRpc2sKIApAQCAtMzQ3MiwzMyArMzUwNCw2IEBACiAKIEZVTExfU1lTVEVNSU1BR0VfREVQUyArPSAkKElOVEVSTkFMX1JPT1RfRklMRVMpICQoSU5TVEFMTEVEX0ZJTEVTX0ZJTEVfUk9PVCkKIAotIyBSZXR1cm5zIGEgbGlzdCBvZiBFWFRSQV9JTlNUQUxMX1pJUFMgdHJpb3Mgd2hvc2UgcHJpbWFyeSBmaWxlIGlzIGNvbnRhaW5lZCB3aXRoaW4gJCgxKQotIyBUaGUgdHJpb3Mgd2lsbCBjb250YWluIHRoZSBwcmltYXJ5IGluc3RhbGxlZCBmaWxlIDogdGhlIGRpcmVjdG9yeSB0byB1bnppcCB0aGUgemlwIHRvIDogdGhlIHppcAotZGVmaW5lIHJlbGV2YW50LWV4dHJhLWluc3RhbGwtemlwcwotJChzdHJpcCAkKGZvcmVhY2ggcCwkKEVYVFJBX0lOU1RBTExfWklQUyksIFwKLSAgJChpZiAkKGZpbHRlciAkKGNhbGwgd29yZC1jb2xvbiwxLCQocCkpLCQoMSkpLCBcCi0gICAgJChwKSkpKQotZW5kZWYKLQotIyBXcml0ZXMgYSB0ZXh0IGZpbGUgdGhhdCBjb250YWlucyBhbGwgb2YgdGhlIGZpbGVzIHRoYXQgd2lsbCBiZSBpbnNpZGUgYSBwYXJ0aXRpb24uCi0jIEFsbCB0aGUgZmlsZSBwYXRocyB3aWxsIGJlIHJlbGF0aXZlIHRvIHRoZSBwYXJ0aXRpb24ncyBzdGFnaW5nIGRpcmVjdG9yeS4KLSMgSXQgd2lsbCBhbHNvIHRha2UgaW50byBhY2NvdW50IGZpbGVzIGluc2lkZSB6aXBzIGxpc3RlZCBpbiBFWFRSQV9JTlNUQUxMX1pJUFMuCi0jCi0jIEFyZ3VtZW50czoKLSMgICAkKDEpOiBPdXRwdXQgZmlsZQotIyAgICQoMik6IFRoZSBwYXJ0aXRpb24ncyBzdGFnaW5nIGRpcmVjdG9yeQotIyAgICQoMyk6IEZpbGVzIHRvIGluY2x1ZGUgaW4gdGhlIHBhcnRpdGlvbgotZGVmaW5lIHdyaXRlLXBhcnRpdGlvbi1maWxlLWxpc3QKLSQoMSk6IFBSSVZBVEVfRklMRVMgOj0gJChzdWJzdCAkKDIpLywsJChmaWx0ZXIgJCgyKS8lLCQoMykpKQotJCgxKTogUFJJVkFURV9FWFRSQV9JTlNUQUxMX1pJUFMgOj0gJChjYWxsIHJlbGV2YW50LWV4dHJhLWluc3RhbGwtemlwcywkKGZpbHRlciAkKDIpLyUsJCgzKSkpCi0kKDEpOiAkJChIT1NUX09VVF9FWEVDVVRBQkxFUykvZXh0cmFfaW5zdGFsbF96aXBzX2ZpbGVfbGlzdCAkKGZvcmVhY2ggcCwkKGNhbGwgcmVsZXZhbnQtZXh0cmEtaW5zdGFsbC16aXBzLCQoZmlsdGVyICQoMikvJSwkKDMpKSksJChjYWxsIHdvcmQtY29sb24sMywkKHApKSkKLQlAZWNobyBXcml0aW5nICQkQAotCXJtIC1mICQkQAotCWVjaG8gLW4gPiAkJEAKLQkkJChmb3JlYWNoIGYsJCQoUFJJVkFURV9GSUxFUyksZWNobyAiJCQoZikiID4+ICQkQCQkKG5ld2xpbmUpKQotCSQkKEhPU1RfT1VUX0VYRUNVVEFCTEVTKS9leHRyYV9pbnN0YWxsX3ppcHNfZmlsZV9saXN0ICQoMikgJCQoUFJJVkFURV9FWFRSQV9JTlNUQUxMX1pJUFMpID4+ICQkQAotZW5kZWYKLQogIyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogaWZkZWYgQlVJTERJTkdfU1lTVEVNX0lNQUdFCiAKQEAgLTYzODMsNiArNjM4OCwxMCBAQAogICBlbmRpZgogZW5kaWYKIAoraWZkZWYgQlVJTERJTkdfVkVORE9SX0tFUk5FTF9CT09UX0lNQUdFCisgICQoQlVJTFRfVEFSR0VUX0ZJTEVTX0RJUik6ICQoSU5URVJOQUxfVkVORE9SX0tFUk5FTF9SQU1ESVNLX0ZJTEVTKQorZW5kaWYKKwogaWZkZWYgQlVJTERJTkdfUkVDT1ZFUllfSU1BR0UKICAgIyBUT0RPKGIvMzA0MTQ0MjgpOiBDYW4ndCBkZXBlbmQgb24gSU5URVJOQUxfUkVDT1ZFUllJTUFHRV9GSUxFUyBhbG9uZSBsaWtlIG90aGVyCiAgICMgQlVJTFRfVEFSR0VUX0ZJTEVTX1BBQ0tBR0UgZGVwZW5kZW5jaWVzIGJlY2F1c2UgY3VycmVudGx5IHRoZXJlJ3JlIGNwL3JzeW5jL3JtCmRpZmYgLS1naXQgYS9jb3JlL2FuZHJvaWRfc29vbmdfY29uZmlnX3ZhcnMubWsgYi9jb3JlL2FuZHJvaWRfc29vbmdfY29uZmlnX3ZhcnMubWsKaW5kZXggMjZmZTFkYS4uNzY5YTZmNyAxMDA2NDQKLS0tIGEvY29yZS9hbmRyb2lkX3Nvb25nX2NvbmZpZ192YXJzLm1rCisrKyBiL2NvcmUvYW5kcm9pZF9zb29uZ19jb25maWdfdmFycy5tawpAQCAtMzksNiArMzksNyBAQAogJChjYWxsIGFkZF9zb29uZ19jb25maWdfdmFyLEFORFJPSUQsVEFSR0VUX0RZTkFNSUNfNjRfMzJfRFJNU0VSVkVSKQogJChjYWxsIGFkZF9zb29uZ19jb25maWdfdmFyLEFORFJPSUQsVEFSR0VUX0VOQUJMRV9NRURJQURSTV82NCkKICQoY2FsbCBhZGRfc29vbmdfY29uZmlnX3ZhcixBTkRST0lELFRBUkdFVF9EWU5BTUlDXzY0XzMyX01FRElBU0VSVkVSKQorJChjYWxsIGFkZF9zb29uZ19jb25maWdfdmFyLEFORFJPSUQsQk9BUkRfR0VORlNfTEFCRUxTX1ZFUlNJT04pCiAKICQoY2FsbCBhZGRfc29vbmdfY29uZmlnX3ZhcixBTkRST0lELEFERElUSU9OQUxfTTRERUZTLCQoaWYgJChCT0FSRF9TRVBPTElDWV9NNERFRlMpLCQoYWRkcHJlZml4IC1ELCQoQk9BUkRfU0VQT0xJQ1lfTTRERUZTKSkpKQogCkBAIC0yMjksMjEgKzIzMCw2IEBACiAkKGNhbGwgc29vbmdfY29uZmlnX3NldF9ib29sLGdvb2dsZV9ncmFwaGljcyxib2FyZF91c2VzX3NjYWxlcl9tMm0xc2hvdCwkKGlmICQoZmlsdGVyIHRydWUsJChCT0FSRF9VU0VTX1NDQUxFUl9NMk0xU0hPVCkpLHRydWUsZmFsc2UpKQogJChjYWxsIHNvb25nX2NvbmZpZ19zZXRfYm9vbCxnb29nbGVfZ3JhcGhpY3MsYm9hcmRfdXNlc19hbGlnbl9yZXN0cmljdGlvbiwkKGlmICQoZmlsdGVyIHRydWUsJChCT0FSRF9VU0VTX0FMSUdOX1JFU1RSSUNUSU9OKSksdHJ1ZSxmYWxzZSkpCiAKLSMgRXhwb3J0IHZpZGVvX2NvZGVjIHZhcmlhYmxlcyB0byBzb29uZyBmb3IgZXh5bm9zIG1vZHVsZXMKLSQoY2FsbCBzb29uZ19jb25maWdfc2V0LHZpZGVvX2NvZGVjLHRhcmdldF9zb2NfbmFtZSwkKFRBUkdFVF9TT0NfTkFNRSkpCi0kKGNhbGwgc29vbmdfY29uZmlnX3NldF9ib29sLHZpZGVvX2NvZGVjLGJvYXJkX3VzZV9jb2RlYzJfaGlkbF8xXzIsJChpZiAkKGZpbHRlciB0cnVlLCQoQk9BUkRfVVNFX0NPREVDMl9ISURMXzFfMikpLHRydWUsZmFsc2UpKQotJChjYWxsIHNvb25nX2NvbmZpZ19zZXRfYm9vbCx2aWRlb19jb2RlYyxib2FyZF9zdXBwb3J0X21mY19lbmNfYnQyMDIwLCQoaWYgJChmaWx0ZXIgdHJ1ZSwkKEJPQVJEX1NVUFBPUlRfTUZDX0VOQ19CVDIwMjApKSx0cnVlLGZhbHNlKSkKLSQoY2FsbCBzb29uZ19jb25maWdfc2V0X2Jvb2wsdmlkZW9fY29kZWMsYm9hcmRfc3VwcG9ydF9mbGV4aWJsZV9wMDEwLCQoaWYgJChmaWx0ZXIgdHJ1ZSwkKEJPQVJEX1NVUFBPUlRfRkxFWElCTEVfUDAxMCkpLHRydWUsZmFsc2UpKQotJChjYWxsIHNvb25nX2NvbmZpZ19zZXRfYm9vbCx2aWRlb19jb2RlYyxib2FyZF91c2VfY29kZWMyX2FpZGwsJChpZiAkKEJPQVJEX1VTRV9DT0RFQzJfQUlETCksdHJ1ZSxmYWxzZSkpCi0kKGNhbGwgc29vbmdfY29uZmlnX3NldCx2aWRlb19jb2RlYyxib2FyZF9ncHVfdHlwZSwkKEJPQVJEX0dQVV9UWVBFKSkKLSQoY2FsbCBzb29uZ19jb25maWdfc2V0X2Jvb2wsdmlkZW9fY29kZWMsYm9hcmRfdXNlX3NtYWxsX3NlY3VyZV9tZW1vcnksJChpZiAkKGZpbHRlciB0cnVlLCQoQk9BUkRfVVNFX1NNQUxMX1NFQ1VSRV9NRU1PUlkpKSx0cnVlLGZhbHNlKSkKLWlmZGVmIEJPQVJEX1NVUFBPUlRfTUZDX1ZFUlNJT04KLSAgJChjYWxsIHNvb25nX2NvbmZpZ19zZXQsdmlkZW9fY29kZWMsYm9hcmRfc3VwcG9ydF9tZmNfdmVyc2lvbiwkKEJPQVJEX1NVUFBPUlRfTUZDX1ZFUlNJT04pKQotZW5kaWYKLWlmZGVmIEJPQVJEX1VTRV9NQVhfU0VDVVJFX1JFU09VUkNFCi0gICQoY2FsbCBzb29uZ19jb25maWdfc2V0LHZpZGVvX2NvZGVjLGJvYXJkX3VzZV9tYXhfc2VjdXJlX3Jlc291cmNlLCQoQk9BUkRfVVNFX01BWF9TRUNVUkVfUkVTT1VSQ0UpKQotZW5kaWYKLQogIyBFeHBvcnQgcmVsYXRlZCB2YXJpYWJsZXMgdG8gc29vbmcgZm9yIGhhcmR3YXJlL2dvb2dsZS9ncmFwaGljcy9jb21tb24vbGliYWNyeWw6bGliYWNyeWwKIGlmZGVmIEJPQVJEX0xJQkFDUllMX0RFRkFVTFRfQ09NUE9TSVRPUgogICAkKGNhbGwgc29vbmdfY29uZmlnX3NldCxhY3J5bCxsaWJhY3J5bF9kZWZhdWx0X2NvbXBvc2l0b3IsJChCT0FSRF9MSUJBQ1JZTF9ERUZBVUxUX0NPTVBPU0lUT1IpKQpkaWZmIC0tZ2l0IGEvY29yZS9jb25maWcubWsgYi9jb3JlL2NvbmZpZy5tawppbmRleCBmOWJhMzhjLi40ODVlOGNjIDEwMDY0NAotLS0gYS9jb3JlL2NvbmZpZy5taworKysgYi9jb3JlL2NvbmZpZy5tawpAQCAtODk0LDYgKzg5NCwxMSBAQAogICAgIFBMQVRGT1JNX1NFUE9MSUNZX0NPTVBBVF9WRVJTSU9OUyBcCiAgICAgUExBVEZPUk1fU0VQT0xJQ1lfVkVSU0lPTiBcCiAKK0JPQVJEX0dFTkZTX0xBQkVMU19WRVJTSU9OID89ICQoQk9BUkRfQVBJX0xFVkVMKQoraWZlcSAoJChjYWxsIG1hdGhfZ3QsJChCT0FSRF9BUElfTEVWRUwpLCQoQk9BUkRfR0VORlNfTEFCRUxTX1ZFUlNJT04pKSx0cnVlKQorICAkKGVycm9yIEJPQVJEX0dFTkZTX0xBQkVMU19WRVJTSU9OICgkKEJPQVJEX0dFTkZTX0xBQkVMU19WRVJTSU9OKSkgbXVzdCBiZSBncmVhdGVyIHRoYW4gb3IgZXF1YWwgdG8gQk9BUkRfQVBJX0xFVkVMICgkKEJPQVJEX0FQSV9MRVZFTCkpKQorZW5kaWYKKwogaWZlcSAoJChQUk9EVUNUX1JFVFJPRklUX0RZTkFNSUNfUEFSVElUSU9OUyksdHJ1ZSkKICAgaWZuZXEgKCQoUFJPRFVDVF9VU0VfRFlOQU1JQ19QQVJUSVRJT05TKSx0cnVlKQogICAgICQoZXJyb3IgUFJPRFVDVF9VU0VfRFlOQU1JQ19QQVJUSVRJT05TIG11c3QgYmUgdHJ1ZSB3aGVuIFBST0RVQ1RfUkVUUk9GSVRfRFlOQU1JQ19QQVJUSVRJT05TIFwKZGlmZiAtLWdpdCBhL2NvcmUvbGF5b3V0bGliX2RhdGEubWsgYi9jb3JlL2xheW91dGxpYl9kYXRhLm1rCmluZGV4IGU0MjBhMDAuLmRhYmNmYjIgMTAwNjQ0Ci0tLSBhL2NvcmUvbGF5b3V0bGliX2RhdGEubWsKKysrIGIvY29yZS9sYXlvdXRsaWJfZGF0YS5tawpAQCAtMzEsOCArMzEsMTggQEAKIAkkKGhpZGUpIG1rZGlyIC1wICQoZGlyICRAKQogCSQoaGlkZSkgY3AgLXZmICQ8ICRACiAKLSMgTGlzdCBvZiBhbGwgZGF0YSBmaWxlcyAtIGZvbnQgZmlsZXMsIGZvbnQgY29uZmlndXJhdGlvbiBmaWxlcywga2V5IGNoYXJhY3RlciBtYXAgZmlsZXMKLUxBWU9VVExJQl9GSUxFUyA6PSAkKGZvbnRzX2RldmljZSkgJChmb250X2NvbmZpZykgJChrZXlib2FyZHMpCitIWVBIRU5fVEVNUCA6PSAkKGNhbGwgaW50ZXJtZWRpYXRlcy1kaXItZm9yLFBBQ0tBR0lORyxoeXBoZW4sSE9TVCxDT01NT04pCisKKyMgVGhlIGh5cGhlbmF0aW9uIHBhdHRlcm4gZmlsZXMgbmVlZGVkIHRvIHN1cHBvcnQgdGV4dCBoeXBoZW5hdGlvbgoraHlwaGVuIDo9ICQoZmlsdGVyICQoVEFSR0VUX09VVCkvdXNyL2h5cGhlbi1kYXRhLyUuaHliLCAkKElOVEVSTkFMX1NZU1RFTUlNQUdFX0ZJTEVTKSkKK2h5cGhlbiA6PSAkKGFkZHByZWZpeCAkKEhZUEhFTl9URU1QKS8sICQobm90ZGlyICQoaHlwaGVuKSkpCisKKyQoaHlwaGVuKTogJChIWVBIRU5fVEVNUCkvJTogJChUQVJHRVRfT1VUKS91c3IvaHlwaGVuLWRhdGEvJQorCSQoaGlkZSkgbWtkaXIgLXAgJChkaXIgJEApCisJJChoaWRlKSBjcCAtdmYgJDwgJEAKKworIyBMaXN0IG9mIGFsbCBkYXRhIGZpbGVzIC0gZm9udCBmaWxlcywgZm9udCBjb25maWd1cmF0aW9uIGZpbGVzLCBrZXkgY2hhcmFjdGVyIG1hcCBmaWxlcywgaHlwaGVuYXRpb24gcGF0dGVybiBmaWxlcworTEFZT1VUTElCX0ZJTEVTIDo9ICQoZm9udHNfZGV2aWNlKSAkKGZvbnRfY29uZmlnKSAkKGtleWJvYXJkcykgJChoeXBoZW4pCiAKIC5QSE9OWTogbGF5b3V0bGliIGxheW91dGxpYi10ZXN0cwogbGF5b3V0bGliIGxheW91dGxpYi10ZXN0czogJChMQVlPVVRMSUJfRklMRVMpCkBAIC00MCw2ICs1MCw3IEBACiAkKGNhbGwgZGlzdC1mb3ItZ29hbHMsIGxheW91dGxpYiwgJChmb3JlYWNoIG0sJChmb250c19kZXZpY2UpLCAkKG0pOmxheW91dGxpYl9uYXRpdmUvZm9udHMvJChub3RkaXIgJChtKSkpKQogJChjYWxsIGRpc3QtZm9yLWdvYWxzLCBsYXlvdXRsaWIsICQoZm9yZWFjaCBtLCQoZm9udF9jb25maWcpLCAkKG0pOmxheW91dGxpYl9uYXRpdmUvZm9udHMvJChub3RkaXIgJChtKSkpKQogJChjYWxsIGRpc3QtZm9yLWdvYWxzLCBsYXlvdXRsaWIsICQoZm9yZWFjaCBtLCQoa2V5Ym9hcmRzKSwgJChtKTpsYXlvdXRsaWJfbmF0aXZlL2tleWJvYXJkcy8kKG5vdGRpciAkKG0pKSkpCiskKGNhbGwgZGlzdC1mb3ItZ29hbHMsIGxheW91dGxpYiwgJChmb3JlYWNoIG0sJChoeXBoZW4pLCAkKG0pOmxheW91dGxpYl9uYXRpdmUvaHlwaGVuLWRhdGEvJChub3RkaXIgJChtKSkpKQogCiBGT05UX1RFTVAgOj0KIGZvbnRfY29uZmlnIDo9CkBAIC05NSw2ICsxMDYsNyBAQAogX2xheW91dGxpYl9mb250X2NvbmZpZ19maWxlcyA6PSAkKHNvcnQgJCh3aWxkY2FyZCBmcmFtZXdvcmtzL2Jhc2UvZGF0YS9mb250cy8qLnhtbCkpCiBfbGF5b3V0bGliX2ZvbnRzX2ZpbGVzIDo9ICQoZmlsdGVyICQoVEFSR0VUX09VVCkvZm9udHMvJS50dGYgJChUQVJHRVRfT1VUKS9mb250cy8lLnR0YyAkKFRBUkdFVF9PVVQpL2ZvbnRzLyUub3RmLCAkKElOVEVSTkFMX1NZU1RFTUlNQUdFX0ZJTEVTKSkKIF9sYXlvdXRsaWJfa2V5Ym9hcmRfZmlsZXMgOj0gJChzb3J0ICQod2lsZGNhcmQgZnJhbWV3b3Jrcy9iYXNlL2RhdGEva2V5Ym9hcmRzLyoua2NtKSkKK19sYXlvdXRsaWJfaHlwaGVuX2ZpbGVzIDo9ICQoZmlsdGVyICQoVEFSR0VUX09VVCkvdXNyL2h5cGhlbi1kYXRhLyUuaHliLCAkKElOVEVSTkFMX1NZU1RFTUlNQUdFX0ZJTEVTKSkKIAogIyBGaW5kIG91dCBmaWxlcyBkaXN0ZWQgd2l0aCBsYXlvdXRsaWIgaW4gU29vbmcuCiAjIyMgRmlsdGVyIG91dCBzdGF0aWMgbGlicmFyaWVzIGZvciBXaW5kb3dzIGFuZCBmaWxlcyBhbHJlYWR5IGhhbmRsZWQgaW4gbWFrZS4KQEAgLTEyNCw2ICsxMzYsMTMgQEAKIAkgIGVjaG8gZGF0YS9rZXlib2FyZHMvJChub3RkaXIgJGYpLGZyYW1ld29ya3MvYmFzZS9kYXRhL2tleWJvYXJkcyxwcmVidWlsdF9ldGMsLCwsLCRmLCwsID4+ICRAOyBcCiAJKQogCisJJChmb3JlYWNoIGYsJChfbGF5b3V0bGliX2h5cGhlbl9maWxlcyksIFwKKwkgICQoZXZhbCBfbW9kdWxlX25hbWUgOj0gJChBTExfSU5TVEFMTEVEX0ZJTEVTLiRmKSkgXAorCSAgJChldmFsIF9tb2R1bGVfcGF0aCA6PSAkKHN0cmlwICQoc29ydCAkKEFMTF9NT0RVTEVTLiQoX21vZHVsZV9uYW1lKS5QQVRIKSkpKSBcCisJICAkKGV2YWwgX3Nvb25nX21vZHVsZV90eXBlIDo9ICQoc3RyaXAgJChzb3J0ICQoQUxMX01PRFVMRVMuJChfbW9kdWxlX25hbWUpLlNPT05HX01PRFVMRV9UWVBFKSkpKSBcCisJICBlY2hvIGRhdGEvaHlwaGVuLWRhdGEvJChub3RkaXIgJGYpLCQoX21vZHVsZV9wYXRoKSwkKF9zb29uZ19tb2R1bGVfdHlwZSksLCwsLCRmLCwsID4+ICRAOyBcCisJKQorCiAJJChmb3JlYWNoIGYsJChfbGF5b3V0bGliX2ZpbGVzX2Rpc3RlZF9ieV9zb29uZyksIFwKIAkgICQoZXZhbCBfcHJlYnVpbHRfbW9kdWxlX2ZpbGUgOj0gJChjYWxsIHdvcmQtY29sb24sMSwkZikpIFwKIAkgICQoZXZhbCBfZGlzdF9maWxlIDo9ICQoY2FsbCB3b3JkLWNvbG9uLDIsJGYpKSBcCkBAIC0xNTIsNyArMTcxLDcgQEAKIAogLlBIT05ZOiBsYXlvdXRsaWItc2JvbQogbGF5b3V0bGliLXNib206ICQoTEFZT1VUTElCX1NCT00pL2xheW91dGxpYi5zcGR4Lmpzb24KLSQoTEFZT1VUTElCX1NCT00pL2xheW91dGxpYi5zcGR4Lmpzb246ICQoUFJPRFVDVF9PVVQpL2Fsd2F5c19kaXJ0eV9maWxlLnR4dCAkKEdFTl9TQk9NKSAkKExBWU9VVExJQl9TQk9NKS9zYm9tLW1ldGFkYXRhLmNzdiAkKF9sYXlvdXRsaWJfZm9udF9jb25maWdfZmlsZXMpICQoX2xheW91dGxpYl9mb250c19maWxlcykgJChMQVlPVVRMSUJfQlVJTERfUFJPUCkvbGF5b3V0bGliLWJ1aWxkLnByb3AgJChfbGF5b3V0bGliX2tleWJvYXJkX2ZpbGVzKSAkKExBWU9VVExJQl9SRVNfRklMRVMpICQoRU1VTEFURURfT1ZFUkxBWVNfRklMRVMpICQoREVWSUNFX09WRVJMQVlTX0ZJTEVTKQorJChMQVlPVVRMSUJfU0JPTSkvbGF5b3V0bGliLnNwZHguanNvbjogJChQUk9EVUNUX09VVCkvYWx3YXlzX2RpcnR5X2ZpbGUudHh0ICQoR0VOX1NCT00pICQoTEFZT1VUTElCX1NCT00pL3Nib20tbWV0YWRhdGEuY3N2ICQoX2xheW91dGxpYl9mb250X2NvbmZpZ19maWxlcykgJChfbGF5b3V0bGliX2ZvbnRzX2ZpbGVzKSAkKExBWU9VVExJQl9CVUlMRF9QUk9QKS9sYXlvdXRsaWItYnVpbGQucHJvcCAkKF9sYXlvdXRsaWJfa2V5Ym9hcmRfZmlsZXMpICQoX2xheW91dGxpYl9oeXBoZW5fZmlsZXMpICQoTEFZT1VUTElCX1JFU19GSUxFUykgJChFTVVMQVRFRF9PVkVSTEFZU19GSUxFUykgJChERVZJQ0VfT1ZFUkxBWVNfRklMRVMpCiAJcm0gLXJmICRACiAJJChHRU5fU0JPTSkgLS1vdXRwdXRfZmlsZSAkQCAtLW1ldGFkYXRhICQoTEFZT1VUTElCX1NCT00pL3Nib20tbWV0YWRhdGEuY3N2IC0tYnVpbGRfdmVyc2lvbiAkKEJVSUxEX0ZJTkdFUlBSSU5UX0ZST01fRklMRSkgLS1wcm9kdWN0X21mciAiJChQUk9EVUNUX01BTlVGQUNUVVJFUikiIC0tbW9kdWxlX25hbWUgImxheW91dGxpYiIgLS1qc29uCiAKZGlmZiAtLWdpdCBhL2NvcmUvbWFpbi5tayBiL2NvcmUvbWFpbi5tawppbmRleCA1MTQyYWRjLi42MjRkZjQ5IDEwMDY0NAotLS0gYS9jb3JlL21haW4ubWsKKysrIGIvY29yZS9tYWluLm1rCkBAIC0yNzcsMTEgKzI3NywyNCBAQAogIyBJbmNsdWRlIGFsbCBvZiB0aGUgbWFrZWZpbGVzIGluIHRoZSBzeXN0ZW0KICMKIAotc3ViZGlyX21ha2VmaWxlcyA6PSAkKFNPT05HX09VVF9ESVIpL2luc3RhbGxzLSQoVEFSR0VUX1BST0RVQ1QpJChDT1ZFUkFHRV9TVUZGSVgpLm1rICQoU09PTkdfQU5EUk9JRF9NSykKK3N1YmRpcl9tYWtlZmlsZXMgOj0gXAorICAgICQoU09PTkdfT1VUX0RJUikvaW5zdGFsbHMtJChUQVJHRVRfUFJPRFVDVCkkKENPVkVSQUdFX1NVRkZJWCkubWsgXAorICAgICQoU09PTkdfQU5EUk9JRF9NSykgXAorICAgIGJ1aWxkL21ha2UvdGFyZ2V0L2JvYXJkL2FuZHJvaWQtaW5mby5tawogCiAjIEFuZHJvaWQubWsgZmlsZXMgYXJlIG9ubHkgdXNlZCBvbiBMaW51eCBidWlsZHMsIE1hYyBvbmx5IHN1cHBvcnRzIEFuZHJvaWQuYnAKIGlmZXEgKCQoSE9TVF9PUyksbGludXgpCi0gIHN1YmRpcl9tYWtlZmlsZXMgKz0gJChmaWxlIDwkKE9VVF9ESVIpLy5tb2R1bGVfcGF0aHMvQW5kcm9pZC5tay5saXN0KQorICBpZmVxICgkKFBST0RVQ1RfSUdOT1JFX0FMTF9BTkRST0lETUspLHRydWUpCisgICAgYWxsb3dlZF9hbmRyb2lkbWtfZmlsZXMgOj0KKyAgICBpZmRlZiBQUk9EVUNUX0FORFJPSURNS19BTExPV0xJU1RfRklMRQorICAgICAgLWluY2x1ZGUgJChQUk9EVUNUX0FORFJPSURNS19BTExPV0xJU1RfRklMRSkKKyAgICBlbmRpZgorICAgIGFsbG93ZWRfYW5kcm9pZG1rX2ZpbGVzICs9ICQoUFJPRFVDVF9BTExPV0VEX0FORFJPSURNS19GSUxFUykKKyAgICBzdWJkaXJfbWFrZWZpbGVzICs9ICQoZmlsdGVyICQoYWxsb3dlZF9hbmRyb2lkbWtfZmlsZXMpLCQoZmlsZSA8JChPVVRfRElSKS8ubW9kdWxlX3BhdGhzL0FuZHJvaWQubWsubGlzdCkpCisgICAgYWxsb3dlZF9hbmRyb2lkbWtfZmlsZXMgOj0KKyAgZWxzZQorICAgIHN1YmRpcl9tYWtlZmlsZXMgKz0gJChmaWxlIDwkKE9VVF9ESVIpLy5tb2R1bGVfcGF0aHMvQW5kcm9pZC5tay5saXN0KQorICBlbmRpZgogZW5kaWYKIAogc3ViZGlyX21ha2VmaWxlcyArPSAkKFNPT05HX09VVF9ESVIpL2xhdGUtJChUQVJHRVRfUFJPRFVDVCkkKENPVkVSQUdFX1NVRkZJWCkubWsKQEAgLTEzODYsNiArMTM5OSw3IEBACiAgICAgJChJTlNUQUxMRURfUkFNRElTS19UQVJHRVQpIFwKICAgICAkKElOU1RBTExFRF9CT09USU1BR0VfVEFSR0VUKSBcCiAgICAgJChJTlNUQUxMRURfSU5JVF9CT09UX0lNQUdFX1RBUkdFVCkgXAorICAgICQoSU5TVEFMTEVEX0RUQk9JTUFHRV9UQVJHRVQpIFwKICAgICAkKElOU1RBTExFRF9SQURJT0lNQUdFX1RBUkdFVCkgXAogICAgICQoSU5TVEFMTEVEX0RFQlVHX1JBTURJU0tfVEFSR0VUKSBcCiAgICAgJChJTlNUQUxMRURfREVCVUdfQk9PVElNQUdFX1RBUkdFVCkgXApkaWZmIC0tZ2l0IGEvY29yZS9wcm9kdWN0Lm1rIGIvY29yZS9wcm9kdWN0Lm1rCmluZGV4IDdjZjRlYzIuLjljNTY3YzMgMTAwNjQ0Ci0tLSBhL2NvcmUvcHJvZHVjdC5taworKysgYi9jb3JlL3Byb2R1Y3QubWsKQEAgLTQ5Miw2ICs0OTIsMTMgQEAKICMgc2hvdWxkIGJlIGluY2x1ZGVkIGluIHRoZSBzeXN0ZW1fbGlua2VyX2NvbmZpZy4KIF9wcm9kdWN0X2xpc3RfdmFycyArPSBQUk9EVUNUX0VYVFJBX1NUVUJfTElCUkFSSUVTCiAKKyMgSWYgc2V0IHRvIHRydWUsIGFsbCBBbmRyb2lkLm1rIGZpbGVzIHdpbGwgYmUgaWdub3JlZC4KK19wcm9kdWN0X3NpbmdsZV92YWx1ZV92YXJzICs9IFBST0RVQ1RfSUdOT1JFX0FMTF9BTkRST0lETUsKKyMgV2hlbiBQUk9EVUNUX0lHTk9SRV9BTExfQU5EUk9JRE1LIGlzIHNldCB0byB0cnVlLCB0aGlzIHZhcmlhYmxlIHdpbGwgYmUgdXNlZCB0byBhbGxvdyBzb21lIEFuZHJvaWQubWsgZmlsZXMuCitfcHJvZHVjdF9saXN0X3ZhcnMgKz0gUFJPRFVDVF9BTExPV0VEX0FORFJPSURNS19GSUxFUworIyBXaGVuIFBST0RVQ1RfSUdOT1JFX0FMTF9BTkRST0lETUsgaXMgc2V0IHRvIHRydWUsIHBhdGggb2YgZmlsZSB0aGF0IGNvbnRhaW5zIGEgbGlzdCBvZiBhbGxvd2VkIEFuZHJvaWQubWsgZmlsZXMKK19wcm9kdWN0X3NpbmdsZV92YWx1ZV92YXJzICs9IFBST0RVQ1RfQU5EUk9JRE1LX0FMTE9XTElTVF9GSUxFCisKIC5LQVRJX1JFQURPTkxZIDo9IF9wcm9kdWN0X3NpbmdsZV92YWx1ZV92YXJzIF9wcm9kdWN0X2xpc3RfdmFycwogX3Byb2R1Y3RfdmFyX2xpc3QgOj0kPSAkKF9wcm9kdWN0X3NpbmdsZV92YWx1ZV92YXJzKSAkKF9wcm9kdWN0X2xpc3RfdmFycykKIApkaWZmIC0tZ2l0IGEvY29yZS9yb2JvbGVjdHJpY190ZXN0X2NvbmZpZ190ZW1wbGF0ZS54bWwgYi9jb3JlL3JvYm9sZWN0cmljX3Rlc3RfY29uZmlnX3RlbXBsYXRlLnhtbAppbmRleCAyNTdjODIwLi4xOTU2YjZlIDEwMDY0NAotLS0gYS9jb3JlL3JvYm9sZWN0cmljX3Rlc3RfY29uZmlnX3RlbXBsYXRlLnhtbAorKysgYi9jb3JlL3JvYm9sZWN0cmljX3Rlc3RfY29uZmlnX3RlbXBsYXRlLnhtbApAQCAtMjIsNiArMjIsMTMgQEAKICAgICA8b3B0aW9uIG5hbWU9ImV4Y2x1ZGUtcGF0aHMiIHZhbHVlPSJqYXZhIiAvPgogICAgIDxvcHRpb24gbmFtZT0idXNlLXJvYm9sZWN0cmljLXJlc291cmNlcyIgdmFsdWU9InRydWUiIC8+CiAKKyAgICA8IS0tIGF0dGVtcHQgdG8gYWx3YXlzIHNob3cgVHJhZGVmZWQgZXJyb3JzIC0tPgorICAgIDxvcHRpb24gbmFtZT0iZG8tbm90LXN3YWxsb3ctcnVubmVyLWVycm9ycyIgdmFsdWU9InRydWUiIC8+CisKKyAgICA8IS0tIHByZXZlbnQgVHJhZGVmZWQgZnJvbSBoYW5naW5nIGluZGVmaW5pdGVseSBpbiBDSSAtLT4KKyAgICA8b3B0aW9uIG5hbWU9InNvY2tldC10aW1lb3V0IiB2YWx1ZT0iNjAwMDAwIiAvPgorICAgIDxvcHRpb24gbmFtZT0idGVzdC1jYXNlLXRpbWVvdXQiIHZhbHVlPSIybSIgLz4KKwogICAgIHtFWFRSQV9DT05GSUdTfQogCiAgICAgPHRlc3QgY2xhc3M9ImNvbS5hbmRyb2lkLnRyYWRlZmVkLnRlc3R0eXBlLklzb2xhdGVkSG9zdFRlc3QiID4KZGlmZiAtLWdpdCBhL2NvcmUvc29vbmdfY29uZmlnLm1rIGIvY29yZS9zb29uZ19jb25maWcubWsKaW5kZXggYzA2NDFkZS4uMGY4MmI2OCAxMDA2NDQKLS0tIGEvY29yZS9zb29uZ19jb25maWcubWsKKysrIGIvY29yZS9zb29uZ19jb25maWcubWsKQEAgLTI3NSwxMCArMjc1LDYgQEAKIAogJChjYWxsIGFkZF9qc29uX2Jvb2wsIENvbXByZXNzZWRBcGV4LCAkKGZpbHRlciB0cnVlLCQoUFJPRFVDVF9DT01QUkVTU0VEX0FQRVgpKSkKIAotaWZuZGVmIEFQRVhfQlVJTERfRk9SX1BSRV9TX0RFVklDRVMKLSQoY2FsbCBhZGRfanNvbl9ib29sLCBUcmltbWVkQXBleCwgJChmaWx0ZXIgdHJ1ZSwkKFBST0RVQ1RfVFJJTU1FRF9BUEVYKSkpCi1lbmRpZgotCiAkKGNhbGwgYWRkX2pzb25fYm9vbCwgQm9hcmRVc2VzUmVjb3ZlcnlBc0Jvb3QsICQoZmlsdGVyIHRydWUsJChCT0FSRF9VU0VTX1JFQ09WRVJZX0FTX0JPT1QpKSkKIAogJChjYWxsIGFkZF9qc29uX2xpc3QsIEJvYXJkS2VybmVsQmluYXJpZXMsICQoQk9BUkRfS0VSTkVMX0JJTkFSSUVTKSkKQEAgLTQwMSw2ICszOTcsMTAgQEAKICAgICAkKGNhbGwgYWRkX2pzb25fc3RyLCBCb2FyZFNxdWFzaGZzQ29tcHJlc3NvciwgJChCT0FSRF8kKGltYWdlX3R5cGUpSU1BR0VfU1FVQVNIRlNfQ09NUFJFU1NPUikpIFwKICAgICAkKGNhbGwgYWRkX2pzb25fc3RyLCBCb2FyZFNxdWFzaGZzQ29tcHJlc3Nvck9wdCwgJChCT0FSRF8kKGltYWdlX3R5cGUpSU1BR0VfU1FVQVNIRlNfQ09NUFJFU1NPUl9PUFQpKSBcCiAgICAgJChjYWxsIGFkZF9qc29uX3N0ciwgQm9hcmRTcXVhc2hmc0Rpc2FibGU0a0FsaWduLCAkKEJPQVJEXyQoaW1hZ2VfdHlwZSlJTUFHRV9TUVVBU0hGU19ESVNBQkxFXzRLX0FMSUdOKSkgXAorICAgICQoY2FsbCBhZGRfanNvbl9zdHIsIEJvYXJkQXZiS2V5UGF0aCwgJChCT0FSRF9BVkJfJChpbWFnZV90eXBlKV9LRVlfUEFUSCkpIFwKKyAgICAkKGNhbGwgYWRkX2pzb25fc3RyLCBCb2FyZEF2YkFsZ29yaXRobSwgJChCT0FSRF9BVkJfJChpbWFnZV90eXBlKV9BTEdPUklUSE0pKSBcCisgICAgJChjYWxsIGFkZF9qc29uX3N0ciwgQm9hcmRBdmJSb2xsYmFja0luZGV4LCAkKEJPQVJEX0FWQl8kKGltYWdlX3R5cGUpX1JPTExCQUNLX0lOREVYKSkgXAorICAgICQoY2FsbCBhZGRfanNvbl9zdHIsIEJvYXJkQXZiUm9sbGJhY2tJbmRleExvY2F0aW9uLCAkKEJPQVJEX0FWQl8kKGltYWdlX3R5cGUpX1JPTExCQUNLX0lOREVYX0xPQ0FUSU9OKSkgXAogICAgICQoY2FsbCBhZGRfanNvbl9zdHIsIFByb2R1Y3RCYXNlRnNQYXRoLCAkKFBST0RVQ1RfJChpbWFnZV90eXBlKV9CQVNFX0ZTX1BBVEgpKSBcCiAgICAgJChjYWxsIGFkZF9qc29uX3N0ciwgUHJvZHVjdEhlYWRyb29tLCAkKFBST0RVQ1RfJChpbWFnZV90eXBlKV9IRUFEUk9PTSkpIFwKICAgICAkKGNhbGwgYWRkX2pzb25fc3RyLCBQcm9kdWN0VmVyaXR5UGFydGl0aW9uLCAkKFBST0RVQ1RfJChpbWFnZV90eXBlKV9WRVJJVFlfUEFSVElUSU9OKSkgXApAQCAtNDI1LDYgKzQyNSwyMSBAQAogICAkKGNhbGwgYWRkX2pzb25fc3RyLCBCb2FyZEV4dDRTaGFyZUR1cEJsb2NrcywgJChCT0FSRF9FWFQ0X1NIQVJFX0RVUF9CTE9DS1MpKQogICAkKGNhbGwgYWRkX2pzb25fc3RyLCBCb2FyZEZsYXNoTG9naWNhbEJsb2NrU2l6ZSwgJChCT0FSRF9GTEFTSF9MT0dJQ0FMX0JMT0NLX1NJWkUpKQogICAkKGNhbGwgYWRkX2pzb25fc3RyLCBCb2FyZEZsYXNoRXJhc2VCbG9ja1NpemUsICQoQk9BUkRfRkxBU0hfRVJBU0VfQkxPQ0tfU0laRSkpCisgICQoY2FsbCBhZGRfanNvbl9ib29sLCBCdWlsZGluZ1ZibWV0YUltYWdlLCAkKEJVSUxESU5HX1ZCTUVUQV9JTUFHRSkpCisgICQoY2FsbCBhZGRfanNvbl9ib29sLCBCb2FyZEF2YkVuYWJsZSwgJChmaWx0ZXIgdHJ1ZSwkKEJPQVJEX0FWQl9FTkFCTEUpKSkKKyAgJChjYWxsIGFkZF9qc29uX3N0ciwgQm9hcmRBdmJBbGdvcml0aG0sICQoQk9BUkRfQVZCX0FMR09SSVRITSkpCisgICQoY2FsbCBhZGRfanNvbl9zdHIsIEJvYXJkQXZiS2V5UGF0aCwgJChCT0FSRF9BVkJfS0VZX1BBVEgpKQorICAkKGNhbGwgYWRkX2pzb25fc3RyLCBCb2FyZEF2YlJvbGxiYWNrSW5kZXgsICQoQk9BUkRfQVZCX1JPTExCQUNLX0lOREVYKSkKKyAgJChjYWxsIGFkZF9qc29uX21hcCwgQ2hhaW5lZFZibWV0YVBhcnRpdGlvbnMpCisgICQoZm9yZWFjaCBwYXJ0aXRpb24sc3lzdGVtIHZlbmRvciAkKEJPQVJEX0FWQl9WQk1FVEFfQ1VTVE9NX1BBUlRJVElPTlMpLFwKKyAgICAkKGNhbGwgYWRkX2pzb25fbWFwLCAkKHBhcnRpdGlvbikpIFwKKyAgICAgICQoY2FsbCBhZGRfanNvbl9saXN0LFBhcnRpdGlvbnMsJChCT0FSRF9BVkJfVkJNRVRBXyQoY2FsbCB0by11cHBlciwkKHBhcnRpdGlvbikpKSkgXAorICAgICAgJChjYWxsIGFkZF9qc29uX3N0cixLZXksJChCT0FSRF9BVkJfVkJNRVRBXyQoY2FsbCB0by11cHBlciwkKHBhcnRpdGlvbikpX0tFWV9QQVRIKSkgXAorICAgICAgJChjYWxsIGFkZF9qc29uX3N0cixBbGdvcml0aG0sJChCT0FSRF9BVkJfVkJNRVRBXyQoY2FsbCB0by11cHBlciwkKHBhcnRpdGlvbikpX0FMR09SSVRITSkpIFwKKyAgICAgICQoY2FsbCBhZGRfanNvbl9zdHIsUm9sbGJhY2tJbmRleCwkKEJPQVJEX0FWQl9WQk1FVEFfJChjYWxsIHRvLXVwcGVyLCQocGFydGl0aW9uKSlfUk9MTEJBQ0tfSU5ERVgpKSBcCisgICAgICAkKGNhbGwgYWRkX2pzb25fc3RyLFJvbGxiYWNrSW5kZXhMb2NhdGlvbiwkKEJPQVJEX0FWQl9WQk1FVEFfJChjYWxsIHRvLXVwcGVyLCQocGFydGl0aW9uKSlfUk9MTEJBQ0tfSU5ERVhfTE9DQVRJT04pKSBcCisgICAgJChjYWxsIGVuZF9qc29uX21hcCkpCisgICQoY2FsbCBlbmRfanNvbl9tYXApCiAKICAgJChjYWxsIGFkZF9qc29uX2Jvb2wsIEJvYXJkVXNlc1JlY292ZXJ5QXNCb290LCAkKGZpbHRlciB0cnVlLCQoQk9BUkRfVVNFU19SRUNPVkVSWV9BU19CT09UKSkpCiAgICQoY2FsbCBhZGRfanNvbl9ib29sLCBQcm9kdWN0VXNlRHluYW1pY1BhcnRpdGlvblNpemUsICQoZmlsdGVyIHRydWUsJChQUk9EVUNUX1VTRV9EWU5BTUlDX1BBUlRJVElPTl9TSVpFKSkpCkBAIC00NDAsMTUgKzQ1NSwyMCBAQAogICAjIFVzZWQgdG8gZ2VuZXJhdGUgX2Rsa20gcGFydGl0aW9ucwogICAkKGNhbGwgYWRkX2pzb25fYm9vbCwgQnVpbGRpbmdTeXN0ZW1EbGttSW1hZ2UsICAgICAgICAgICAgICAgJChCVUlMRElOR19TWVNURU1fRExLTV9JTUFHRSkpCiAgICQoY2FsbCBhZGRfanNvbl9saXN0LCBTeXN0ZW1LZXJuZWxNb2R1bGVzLCAkKEJPQVJEX1NZU1RFTV9LRVJORUxfTU9EVUxFUykpCisgICQoY2FsbCBhZGRfanNvbl9zdHIsIFN5c3RlbUtlcm5lbEJsb2NrbGlzdEZpbGUsICQoQk9BUkRfU1lTVEVNX0tFUk5FTF9NT0RVTEVTX0JMT0NLTElTVF9GSUxFKSkKKyAgJChjYWxsIGFkZF9qc29uX2xpc3QsIFN5c3RlbUtlcm5lbExvYWRNb2R1bGVzLCAkKEJPQVJEX1NZU1RFTV9LRVJORUxfTU9EVUxFU19MT0FEKSkKKyAgJChjYWxsIGFkZF9qc29uX2Jvb2wsIEJ1aWxkaW5nVmVuZG9yRGxrbUltYWdlLCAgICAgICAgICAgICAgICQoQlVJTERJTkdfVkVORE9SX0RMS01fSU1BR0UpKQorICAkKGNhbGwgYWRkX2pzb25fbGlzdCwgVmVuZG9yS2VybmVsTW9kdWxlcywgJChCT0FSRF9WRU5ET1JfS0VSTkVMX01PRFVMRVMpKQorICAkKGNhbGwgYWRkX2pzb25fc3RyLCBWZW5kb3JLZXJuZWxCbG9ja2xpc3RGaWxlLCAkKEJPQVJEX1ZFTkRPUl9LRVJORUxfTU9EVUxFU19CTE9DS0xJU1RfRklMRSkpCisgICQoY2FsbCBhZGRfanNvbl9ib29sLCBCdWlsZGluZ09kbURsa21JbWFnZSwgICAgICAgICAgICAgICAkKEJVSUxESU5HX09ETV9ETEtNX0lNQUdFKSkKKyAgJChjYWxsIGFkZF9qc29uX2xpc3QsIE9kbUtlcm5lbE1vZHVsZXMsICQoQk9BUkRfT0RNX0tFUk5FTF9NT0RVTEVTKSkKKyAgJChjYWxsIGFkZF9qc29uX3N0ciwgT2RtS2VybmVsQmxvY2tsaXN0RmlsZSwgJChCT0FSRF9PRE1fS0VSTkVMX01PRFVMRVNfQkxPQ0tMSVNUX0ZJTEUpKQogCiAgICMgVXNlZCB0byBnZW5lcmF0ZSAvdmVuZG9yL2J1aWxkLnByb3AKICAgJChjYWxsIGFkZF9qc29uX2xpc3QsIEJvYXJkSW5mb0ZpbGVzLCAkKGlmICQoVEFSR0VUX0JPQVJEX0lORk9fRklMRVMpLCQoVEFSR0VUX0JPQVJEX0lORk9fRklMRVMpLCQoZmlyc3R3b3JkICQoVEFSR0VUX0JPQVJEX0lORk9fRklMRSkgJCh3aWxkY2FyZCAkKFRBUkdFVF9ERVZJQ0VfRElSKS9ib2FyZC1pbmZvLnR4dCkpKSkKICAgJChjYWxsIGFkZF9qc29uX3N0ciwgQm9vdExvYWRlckJvYXJkTmFtZSwgJChUQVJHRVRfQk9PVExPQURFUl9CT0FSRF9OQU1FKSkKIAotICAkKGNhbGwgYWRkX2pzb25fbWFwLCBQcm9kdWN0Q29weUZpbGVzKQotICAkKGZvcmVhY2ggcGFpciwkKFBST0RVQ1RfQ09QWV9GSUxFUyksXAotICAgICQoY2FsbCBhZGRfanNvbl9zdHIsJCh3b3JkIDEsJChzdWJzdCA6LCAsJChwYWlyKSkpLCQod29yZCAyLCQoc3Vic3QgOiwgLCQocGFpcikpKSkpCi0gICQoY2FsbCBlbmRfanNvbl9tYXApCisgICQoY2FsbCBhZGRfanNvbl9saXN0LCBQcm9kdWN0Q29weUZpbGVzLCAkKFBST0RVQ1RfQ09QWV9GSUxFUykpCiAKICQoY2FsbCBlbmRfanNvbl9tYXApCiAKZGlmZiAtLWdpdCBhL2NvcmUvc3lzcHJvcC5tayBiL2NvcmUvc3lzcHJvcC5tawppbmRleCA5YjcwZDFjLi4yNTViNjk5IDEwMDY0NAotLS0gYS9jb3JlL3N5c3Byb3AubWsKKysrIGIvY29yZS9zeXNwcm9wLm1rCkBAIC0zMDEsMjIgKzMwMSwxMiBAQAogCiBJTlNUQUxMRURfU1lTVEVNX0VYVF9CVUlMRF9QUk9QX1RBUkdFVCA6PSAkKFRBUkdFVF9PVVRfU1lTVEVNX0VYVCkvZXRjL2J1aWxkLnByb3AKIAotIyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCi0jIHJhbWRpc2svYm9vdC9ldGMvYnVpbGQucHJvcAotIwotCiBSQU1ESVNLX0JVSUxEX1BST1BfUkVMX1BBVEggOj0gc3lzdGVtL2V0Yy9yYW1kaXNrL2J1aWxkLnByb3AKK2lmZXEgKHRydWUsJChCT0FSRF9VU0VTX1JFQ09WRVJZX0FTX0JPT1QpKQorSU5TVEFMTEVEX1JBTURJU0tfQlVJTERfUFJPUF9UQVJHRVQgOj0gJChUQVJHRVRfUkVDT1ZFUllfUk9PVF9PVVQpL2ZpcnN0X3N0YWdlX3JhbWRpc2svJChSQU1ESVNLX0JVSUxEX1BST1BfUkVMX1BBVEgpCitlbHNlCiBJTlNUQUxMRURfUkFNRElTS19CVUlMRF9QUk9QX1RBUkdFVCA6PSAkKFRBUkdFVF9SQU1ESVNLX09VVCkvJChSQU1ESVNLX0JVSUxEX1BST1BfUkVMX1BBVEgpCi0kKGV2YWwgJChjYWxsIGJ1aWxkLXByb3BlcnRpZXMsXAotICAgIGJvb3RpbWFnZSxcCi0gICAgJChJTlNUQUxMRURfUkFNRElTS19CVUlMRF9QUk9QX1RBUkdFVCksXAotICAgICQoZW1wdHkpLFwKLSAgICAkKGVtcHR5KSxcCi0gICAgJChlbXB0eSksXAotICAgICQoZW1wdHkpLFwKLSAgICAkKGVtcHR5KSkpCi0KLSQoZXZhbCAkKGNhbGwgZGVjbGFyZS0xcC10YXJnZXQsJChJTlNUQUxMRURfUkFNRElTS19CVUlMRF9QUk9QX1RBUkdFVCkpKQorZW5kaWYKIAogQUxMX0lOU1RBTExFRF9CVUlMRF9QUk9QX0ZJTEVTIDo9IFwKICAgJChJTlNUQUxMRURfQlVJTERfUFJPUF9UQVJHRVQpIFwKZGlmZiAtLWdpdCBhL3RhcmdldC9ib2FyZC9BbmRyb2lkLm1rIGIvdGFyZ2V0L2JvYXJkL2FuZHJvaWQtaW5mby5tawpzaW1pbGFyaXR5IGluZGV4IDEwMCUKcmVuYW1lIGZyb20gdGFyZ2V0L2JvYXJkL0FuZHJvaWQubWsKcmVuYW1lIHRvIHRhcmdldC9ib2FyZC9hbmRyb2lkLWluZm8ubWsKZGlmZiAtLWdpdCBhL3RhcmdldC9wcm9kdWN0L2Jhc2Vfc3lzdGVtLm1rIGIvdGFyZ2V0L3Byb2R1Y3QvYmFzZV9zeXN0ZW0ubWsKaW5kZXggOWQ2NDAyZS4uM2E3MjU2ZSAxMDA2NDQKLS0tIGEvdGFyZ2V0L3Byb2R1Y3QvYmFzZV9zeXN0ZW0ubWsKKysrIGIvdGFyZ2V0L3Byb2R1Y3QvYmFzZV9zeXN0ZW0ubWsKQEAgLTE4LDYgKzE4LDcgQEAKIFBST0RVQ1RfUEFDS0FHRVMgKz0gXAogICAgIGFieCBcCiAgICAgYWNvbmZpZ2QgXAorICAgIGFjb25maWdkLXN5c3RlbSBcCiAgICAgYWRiZF9zeXN0ZW1fYXBpIFwKICAgICBhZmxhZ3MgXAogICAgIGFtIFwKZGlmZiAtLWdpdCBhL3RhcmdldC9wcm9kdWN0L2dlbmVyaWMvQW5kcm9pZC5icCBiL3RhcmdldC9wcm9kdWN0L2dlbmVyaWMvQW5kcm9pZC5icAppbmRleCBjODFlNjZjLi5lYTQ5YWY0IDEwMDY0NAotLS0gYS90YXJnZXQvcHJvZHVjdC9nZW5lcmljL0FuZHJvaWQuYnAKKysrIGIvdGFyZ2V0L3Byb2R1Y3QvZ2VuZXJpYy9BbmRyb2lkLmJwCkBAIC0xLDQgKzEsNCBAQAotYW5kcm9pZF9yb290ZGlycyA9IFsKK2dlbmVyaWNfcm9vdGRpcnMgPSBbCiAgICAgImFjY3QiLAogICAgICJhcGV4IiwKICAgICAiYm9vdHN0cmFwLWFwZXgiLApAQCAtMTUsMTkgKzE1LDIyIEBACiAgICAgIm9lbSIsCiAgICAgInBvc3RpbnN0YWxsIiwKICAgICAicHJvYyIsCi0gICAgInByb2R1Y3QiLAogICAgICJzZWNvbmRfc3RhZ2VfcmVzb3VyY2VzIiwKICAgICAic3RvcmFnZSIsCiAgICAgInN5cyIsCiAgICAgInN5c3RlbSIsCiAgICAgInN5c3RlbV9kbGttIiwKLSAgICAic3lzdGVtX2V4dCIsCiAgICAgInRtcCIsCiAgICAgInZlbmRvciIsCiAgICAgInZlbmRvcl9kbGttIiwKIF0KIAotYW5kcm9pZF9zeW1saW5rcyA9IFsKK2FuZHJvaWRfcm9vdGRpcnMgPSBbCisgICAgInN5c3RlbV9leHQiLAorICAgICJwcm9kdWN0IiwKK10KKworZ2VuZXJpY19zeW1saW5rcyA9IFsKICAgICB7CiAgICAgICAgIHRhcmdldDogIi9zeXN0ZW0vYmluL2luaXQiLAogICAgICAgICBuYW1lOiAiaW5pdCIsCkBAIC00MSwxOCArNDQsMTAgQEAKICAgICAgICAgbmFtZTogImJpbiIsCiAgICAgfSwKICAgICB7Ci0gICAgICAgIHRhcmdldDogIi9wcm9kdWN0IiwKLSAgICAgICAgbmFtZTogInN5c3RlbS9wcm9kdWN0IiwKLSAgICB9LAotICAgIHsKICAgICAgICAgdGFyZ2V0OiAiL3ZlbmRvciIsCiAgICAgICAgIG5hbWU6ICJzeXN0ZW0vdmVuZG9yIiwKICAgICB9LAogICAgIHsKLSAgICAgICAgdGFyZ2V0OiAiL3N5c3RlbV9leHQiLAotICAgICAgICBuYW1lOiAic3lzdGVtL3N5c3RlbV9leHQiLAotICAgIH0sCi0gICAgewogICAgICAgICB0YXJnZXQ6ICIvc3lzdGVtX2Rsa20vbGliL21vZHVsZXMiLAogICAgICAgICBuYW1lOiAic3lzdGVtL2xpYi9tb2R1bGVzIiwKICAgICB9LApAQCAtMTIxLDYgKzExNiwxNyBAQAogICAgIH0sCiBdCiAKK2FuZHJvaWRfc3ltbGlua3MgPSBbCisgICAgeworICAgICAgICB0YXJnZXQ6ICIvcHJvZHVjdCIsCisgICAgICAgIG5hbWU6ICJzeXN0ZW0vcHJvZHVjdCIsCisgICAgfSwKKyAgICB7CisgICAgICAgIHRhcmdldDogIi9zeXN0ZW1fZXh0IiwKKyAgICAgICAgbmFtZTogInN5c3RlbS9zeXN0ZW1fZXh0IiwKKyAgICB9LAorXQorCiBmaWxlZ3JvdXAgewogICAgIG5hbWU6ICJnZW5lcmljX3N5c3RlbV9zaWduX2tleSIsCiAgICAgc3JjczogWyI6YXZiX3Rlc3RrZXlfcnNhNDA5NiJdLApAQCAtMzQwLDE1ICszNDYsMjIgQEAKICAgICBdLAogfQogCi1hbmRyb2lkX3N5c3RlbV9pbWFnZSB7Ci0gICAgbmFtZTogImdlbmVyaWNfc3lzdGVtX2ltYWdlIiwKK2ZpbGVncm91cCB7CisgICAgbmFtZTogInN5c3RlbV9pbWFnZV9lcm9mc19jb21wcmVzc19oaW50cy50eHQiLAorICAgIHNyY3M6IFsiZXJvZnNfY29tcHJlc3NfaGludHMudHh0Il0sCit9CiAKK2FuZHJvaWRfZmlsZXN5c3RlbV9kZWZhdWx0cyB7CisgICAgbmFtZTogInN5c3RlbV9pbWFnZV9kZWZhdWx0cyIsCiAgICAgcGFydGl0aW9uX25hbWU6ICJzeXN0ZW0iLAogICAgIGJhc2VfZGlyOiAic3lzdGVtIiwKLSAgICBkaXJzOiBhbmRyb2lkX3Jvb3RkaXJzLAotICAgIHN5bWxpbmtzOiBhbmRyb2lkX3N5bWxpbmtzLAorICAgIGRpcnM6IGdlbmVyaWNfcm9vdGRpcnMsCisgICAgc3ltbGlua3M6IGdlbmVyaWNfc3ltbGlua3MsCiAgICAgZmlsZV9jb250ZXh0czogIjpwbGF0X2ZpbGVfY29udGV4dHMiLAotICAgIGxpbmtlcl9jb25maWdfc3JjOiAiOnN5c3RlbV9saW5rZXJfY29uZmlnX2pzb25fZmlsZSIsCisgICAgbGlua2VyX2NvbmZpZzogeworICAgICAgICBnZW5fbGlua2VyX2NvbmZpZzogdHJ1ZSwKKyAgICAgICAgbGlua2VyX2NvbmZpZ19zcmNzOiBbIjpzeXN0ZW1fbGlua2VyX2NvbmZpZ19qc29uX2ZpbGUiXSwKKyAgICB9LAogICAgIGZzdmVyaXR5OiB7CiAgICAgICAgIGlucHV0czogWwogICAgICAgICAgICAgImV0Yy9ib290LWltYWdlLnByb2YiLApAQCAtMzY0LDcgKzM3Nyw3IEBACiAgICAgdHlwZTogImVyb2ZzIiwKICAgICBlcm9mczogewogICAgICAgICBjb21wcmVzc29yOiAibHo0aGMsOSIsCi0gICAgICAgIGNvbXByZXNzX2hpbnRzOiAiZXJvZnNfY29tcHJlc3NfaGludHMudHh0IiwKKyAgICAgICAgY29tcHJlc3NfaGludHM6ICI6c3lzdGVtX2ltYWdlX2Vyb2ZzX2NvbXByZXNzX2hpbnRzLnR4dCIsCiAgICAgfSwKICAgICBidWlsZF9sb2d0YWdzOiB0cnVlLAogICAgIGdlbl9hY29uZmlnX2ZsYWdzX3BiOiB0cnVlLApAQCAtMzc5LDYgKzM5Miw3IEBACiAgICAgZGVwczogWwogICAgICAgICAiYWJ4IiwKICAgICAgICAgImFjb25maWdkIiwKKyAgICAgICAgImFjb25maWdkLXN5c3RlbSIsCiAgICAgICAgICJhZmxhZ3MiLAogICAgICAgICAiYW0iLAogICAgICAgICAiYW5kcm9pZC5zb2Z0d2FyZS5jcmVkZW50aWFscy5wcmVidWlsdC54bWwiLCAvLyBnZW5lcmljX3N5c3RlbQpAQCAtODY5LDMgKzg4MywxMCBAQAogICAgICAgICB9LAogICAgIH0sCiB9CisKK2FuZHJvaWRfc3lzdGVtX2ltYWdlIHsKKyAgICBuYW1lOiAiZ2VuZXJpY19zeXN0ZW1faW1hZ2UiLAorICAgIGRlZmF1bHRzOiBbInN5c3RlbV9pbWFnZV9kZWZhdWx0cyJdLAorICAgIGRpcnM6IGFuZHJvaWRfcm9vdGRpcnMsCisgICAgc3ltbGlua3M6IGFuZHJvaWRfc3ltbGlua3MsCit9CmRpZmYgLS1naXQgYS90YXJnZXQvcHJvZHVjdC9nZW5lcmljX3JhbWRpc2subWsgYi90YXJnZXQvcHJvZHVjdC9nZW5lcmljX3JhbWRpc2subWsKaW5kZXggMzg4YjE4MC4uNWVjYjU1ZiAxMDA2NDQKLS0tIGEvdGFyZ2V0L3Byb2R1Y3QvZ2VuZXJpY19yYW1kaXNrLm1rCisrKyBiL3RhcmdldC9wcm9kdWN0L2dlbmVyaWNfcmFtZGlzay5tawpAQCAtMjMsNiArMjMsNyBAQAogUFJPRFVDVF9QQUNLQUdFUyArPSBcCiAgICAgaW5pdF9maXJzdF9zdGFnZSBcCiAgICAgc25hcHVzZXJkX3JhbWRpc2sgXAorICAgIHJhbWRpc2stYnVpbGQucHJvcCBcCiAKICMgRGVidWcgcmFtZGlzawogUFJPRFVDVF9QQUNLQUdFUyArPSBcCmRpZmYgLS1naXQgYS90YXJnZXQvcHJvZHVjdC9nc2kvQW5kcm9pZC5icCBiL3RhcmdldC9wcm9kdWN0L2dzaS9BbmRyb2lkLmJwCmluZGV4IGYxOGYzNWEuLjFiOGYyZDcgMTAwNjQ0Ci0tLSBhL3RhcmdldC9wcm9kdWN0L2dzaS9BbmRyb2lkLmJwCisrKyBiL3RhcmdldC9wcm9kdWN0L2dzaS9BbmRyb2lkLmJwCkBAIC02MSwzICs2MSwxMzkgQEAKICAgICBzeXN0ZW1fZXh0X3NwZWNpZmljOiB0cnVlLAogICAgIHJlbGF0aXZlX2luc3RhbGxfcGF0aDogImdzaSIsCiB9CisKK2dzaV9zeW1saW5rcyA9IFsKKyAgICB7CisgICAgICAgIHRhcmdldDogIi9zeXN0ZW0vc3lzdGVtX2V4dCIsCisgICAgICAgIG5hbWU6ICJzeXN0ZW1fZXh0IiwKKyAgICB9LAorICAgIHsKKyAgICAgICAgdGFyZ2V0OiAiL3N5c3RlbS9wcm9kdWN0IiwKKyAgICAgICAgbmFtZTogInByb2R1Y3QiLAorICAgIH0sCitdCisKK2FuZHJvaWRfc3lzdGVtX2ltYWdlIHsKKyAgICBuYW1lOiAiYW5kcm9pZF9nc2kiLAorICAgIGRlZmF1bHRzOiBbInN5c3RlbV9pbWFnZV9kZWZhdWx0cyJdLAorICAgIHN5bWxpbmtzOiBnc2lfc3ltbGlua3MsCisgICAgZGVwczogWworICAgICAgICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisgICAgICAgIC8vIGdzaV9zeXN0ZW1fZXh0CisgICAgICAgIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KKworICAgICAgICAvLyBoYW5kaGVsZCBwYWNrYWdlcworICAgICAgICAiTGF1bmNoZXIzUXVpY2tTdGVwIiwKKyAgICAgICAgIlByb3Zpc2lvbiIsCisgICAgICAgICJTZXR0aW5ncyIsCisgICAgICAgICJTdG9yYWdlTWFuYWdlciIsCisgICAgICAgICJTeXN0ZW1VSSIsCisKKyAgICAgICAgLy8gdGVsZXBob255IHBhY2thZ2VzCisgICAgICAgICJDYXJyaWVyQ29uZmlnIiwKKworICAgICAgICAvLyBJbnN0YWxsIGEgY29weSBvZiB0aGUgZGVidWcgcG9saWN5IHRvIHRoZSBzeXN0ZW1fZXh0IHBhcnRpdGlvbiwgYW5kIGFsbG93CisgICAgICAgIC8vIGluaXQtc2Vjb25kLXN0YWdlIHRvIGxvYWQgZGVidWcgcG9saWN5IGZyb20gc3lzdGVtX2V4dC4KKyAgICAgICAgLy8gVGhpcyBvcHRpb24gaXMgb25seSBtZWFudCB0byBiZSBzZXQgYnkgY29tcGxpYW5jZSBHU0kgdGFyZ2V0cy4KKyAgICAgICAgInN5c3RlbV9leHRfdXNlcmRlYnVnX3BsYXRfc2Vwb2xpY3kuY2lsIiwKKworICAgICAgICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisgICAgICAgIC8vIGJhc2Vfc3lzdGVtX2V4dAorICAgICAgICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisgICAgICAgICJidWlsZF9mbGFnX3N5c3RlbV9leHQiLAorICAgICAgICAiZnNfY29uZmlnX2RpcnNfc3lzdGVtX2V4dCIsCisgICAgICAgICJmc19jb25maWdfZmlsZXNfc3lzdGVtX2V4dCIsCisgICAgICAgICJncm91cF9zeXN0ZW1fZXh0IiwKKyAgICAgICAgInBhc3N3ZF9zeXN0ZW1fZXh0IiwKKyAgICAgICAgIlNhdGVsbGl0ZUNsaWVudCIsCisgICAgICAgICJzZWxpbnV4X3BvbGljeV9zeXN0ZW1fZXh0IiwKKyAgICAgICAgInN5c3RlbV9leHRfbWFuaWZlc3QueG1sIiwKKyAgICAgICAgInN5c3RlbV9leHQtYnVpbGQucHJvcCIsCisgICAgICAgIC8vIEJhc2UgbW9kdWxlcyB3aGVuIHNoaXBwaW5nIGFwaSBsZXZlbCBpcyBsZXNzIHRoYW4gb3IgZXF1YWwgdG8gMzQKKyAgICAgICAgImh3c2VydmljZW1hbmFnZXIiLAorICAgICAgICAiYW5kcm9pZC5oaWRsLmFsbG9jYXRvckAxLjAtc2VydmljZSIsCisKKyAgICAgICAgLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLworICAgICAgICAvLyB3aW5kb3dfZXh0ZW5zaW9uc19iYXNlCisgICAgICAgIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KKyAgICAgICAgImFuZHJvaWR4LndpbmRvdy5leHRlbnNpb25zIiwKKyAgICAgICAgImFuZHJvaWR4LndpbmRvdy5zaWRlY2FyIiwKKworICAgICAgICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisgICAgICAgIC8vIGdzaV9yZWxlYXNlCisgICAgICAgIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KKyAgICAgICAgImdzaV9za2lwX21vdW50LmNmZyIsCisgICAgICAgICJpbml0LmdzaS5yYyIsCisgICAgICAgICJpbml0LnZuZGstbm9kZWYucmMiLAorICAgICAgICAvLyBPdmVybGF5IHRoZSBHU0kgc3BlY2lmaWMgc2V0dGluZyBmb3IgZnJhbWV3b3JrIGFuZCBTeXN0ZW1VSQorICAgICAgICAiZ3NpX292ZXJsYXlfZnJhbWV3b3JrIiwKKyAgICAgICAgImdzaV9vdmVybGF5X3N5c3RlbXVpIiwKKworICAgICAgICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisgICAgICAgIC8vIFZOREsKKyAgICAgICAgLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLworICAgICAgICAiY29tLmFuZHJvaWQudm5kay52MzAiLAorICAgICAgICAiY29tLmFuZHJvaWQudm5kay52MzEiLAorICAgICAgICAiY29tLmFuZHJvaWQudm5kay52MzIiLAorICAgICAgICAiY29tLmFuZHJvaWQudm5kay52MzMiLAorICAgICAgICAiY29tLmFuZHJvaWQudm5kay52MzQiLAorCisgICAgICAgIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KKyAgICAgICAgLy8gQVZGCisgICAgICAgIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KKyAgICAgICAgImNvbS5hbmRyb2lkLmNvbXBvcyIsCisgICAgICAgICJmZWF0dXJlc19jb20uYW5kcm9pZC52aXJ0LnhtbCIsCisKKyAgICAgICAgLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLworICAgICAgICAvLyBnc2lfcHJvZHVjdAorICAgICAgICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisgICAgICAgICJCcm93c2VyMiIsCisgICAgICAgICJDYW1lcmEyIiwKKyAgICAgICAgIkRpYWxlciIsCisgICAgICAgICJMYXRpbklNRSIsCisgICAgICAgICJhcG5zLWZ1bGwtY29uZi54bWwiLAorCisgICAgICAgIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KKyAgICAgICAgLy8gbWVkaWFfcHJvZHVjdAorICAgICAgICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisgICAgICAgICJ3ZWJ2aWV3IiwKKworICAgICAgICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisgICAgICAgIC8vIGJhc2VfcHJvZHVjdAorICAgICAgICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisKKyAgICAgICAgLy8gQmFzZSBtb2R1bGVzIGFuZCBzZXR0aW5ncyBmb3IgdGhlIHByb2R1Y3QgcGFydGl0aW9uLgorICAgICAgICAiYnVpbGRfZmxhZ19wcm9kdWN0IiwKKyAgICAgICAgImZzX2NvbmZpZ19kaXJzX3Byb2R1Y3QiLAorICAgICAgICAiZnNfY29uZmlnX2ZpbGVzX3Byb2R1Y3QiLAorICAgICAgICAiZ3JvdXBfcHJvZHVjdCIsCisgICAgICAgICJNb2R1bGVNZXRhZGF0YSIsCisgICAgICAgICJwYXNzd2RfcHJvZHVjdCIsCisgICAgICAgICJwcm9kdWN0X2NvbXBhdGliaWxpdHlfbWF0cml4LnhtbCIsCisgICAgICAgICJwcm9kdWN0X21hbmlmZXN0LnhtbCIsCisgICAgICAgICJzZWxpbnV4X3BvbGljeV9wcm9kdWN0IiwKKyAgICAgICAgInByb2R1Y3QtYnVpbGQucHJvcCIsCisKKyAgICAgICAgLy8gQVVESU8KKyAgICAgICAgImZyYW1ld29ya3Nfc291bmRzIiwKKworICAgICAgICAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisgICAgICAgIC8vIGJhc2Vfc3lzdGVtCisgICAgICAgIC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KKyAgICAgICAgImNoYXJnZXIiLAorICAgIF0gKyBzZWxlY3QocHJvZHVjdF92YXJpYWJsZSgiZGVidWdnYWJsZSIpLCB7CisgICAgICAgIC8vIFBhY2thZ2VzIGluY2x1ZGVkIG9ubHkgZm9yIGVuZyBvciB1c2VyZGVidWcgYnVpbGRzLCBwcmV2aW91c2x5IGRlYnVnIHRhZ2dlZAorICAgICAgICB0cnVlOiBbImFkYl9rZXlzIl0sCisgICAgICAgIGRlZmF1bHQ6IFtdLAorICAgIH0pLAorICAgIG11bHRpbGliOiB7CisgICAgICAgIGJvdGg6IHsKKyAgICAgICAgICAgIC8vIFBST0RVQ1RfUEFDS0FHRVNfU0hJUFBJTkdfQVBJX0xFVkVMXzM0CisgICAgICAgICAgICBkZXBzOiBbImFuZHJvaWQuaGlkbC5tZW1vcnlAMS4wLWltcGwiXSwKKyAgICAgICAgfSwKKyAgICB9LAorICAgIGVuYWJsZWQ6IHNlbGVjdChzb29uZ19jb25maWdfdmFyaWFibGUoIkFORFJPSUQiLCAiUFJPRFVDVF9JTlNUQUxMX0RFQlVHX1BPTElDWV9UT19TWVNURU1fRVhUIiksIHsKKyAgICAgICAgInRydWUiOiB0cnVlLAorICAgICAgICBkZWZhdWx0OiBmYWxzZSwKKyAgICB9KSwKK30KZGlmZiAtLWdpdCBhL3RlYW1zL0FuZHJvaWQuYnAgYi90ZWFtcy9BbmRyb2lkLmJwCmluZGV4IDIxZjUyMjIuLjYzMDdmNWMgMTAwNjQ0Ci0tLSBhL3RlYW1zL0FuZHJvaWQuYnAKKysrIGIvdGVhbXMvQW5kcm9pZC5icApAQCAtNzAsMTMgKzcwLDYgQEAKIH0KIAogdGVhbSB7Ci0gICAgbmFtZTogInRyZW5keV90ZWFtX3dlYXJfd2Vhcl9jbG91ZF9wbGF0Zm9ybSIsCi0KLSAgICAvLyBnby90cmVuZHkvbWFuYWdlL2VuZ2luZWVycy81OTE3NzYyNTI2MjgxNzI4Ci0gICAgdHJlbmR5X3RlYW1faWQ6ICI1OTE3NzYyNTI2MjgxNzI4IiwKLX0KLQotdGVhbSB7CiAgICAgbmFtZTogInRyZW5keV90ZWFtX3BpeGVsX3N5c3RlbV9zb2Z0d2FyZSIsCiAKICAgICAvLyBnby90cmVuZHkvbWFuYWdlL2VuZ2luZWVycy80ODU2MDA1MTIwNjIyNTkyCkBAIC01MTgsMTMgKzUxMSw2IEBACiB9CiAKIHRlYW0gewotICAgIG5hbWU6ICJ0cmVuZHlfdGVhbV93ZWFyX3dlYXJfbm90aWZpY2F0aW9uc19hbGVydHNfYXR0ZW50aW9uX21hbmFnZW1lbnQiLAotCi0gICAgLy8gZ28vdHJlbmR5L21hbmFnZS9lbmdpbmVlcnMvNjI2NzY0MzY4MTk5NjgwMAotICAgIHRyZW5keV90ZWFtX2lkOiAiNjI2NzY0MzY4MTk5NjgwMCIsCi19Ci0KLXRlYW0gewogICAgIG5hbWU6ICJ0cmVuZHlfdGVhbV9md2tfbmZjIiwKIAogICAgIC8vIGdvL3RyZW5keS9tYW5hZ2UvZW5naW5lZXJzLzU5NjIzMTI1MTI4NjQyNTYKQEAgLTUzMiwxMyArNTE4LDYgQEAKIH0KIAogdGVhbSB7Ci0gICAgbmFtZTogInRyZW5keV90ZWFtX3dlYXJfcGVyc29uYWxpemF0aW9uX2RldmVsb3Blcl9zdXJmYWNlcyIsCi0KLSAgICAvLyBnby90cmVuZHkvbWFuYWdlL2VuZ2luZWVycy80ODE5ODkwOTg4ODEwMjQwCi0gICAgdHJlbmR5X3RlYW1faWQ6ICI0ODE5ODkwOTg4ODEwMjQwIiwKLX0KLQotdGVhbSB7CiAgICAgbmFtZTogInRyZW5keV90ZWFtX3NyYWprdW1hcl90ZWFtIiwKIAogICAgIC8vIGdvL3RyZW5keS9tYW5hZ2UvZW5naW5lZXJzLzUxNzAwNTM4OTQwMTI5MjgKQEAgLTY5MywxMyArNjcyLDYgQEAKIH0KIAogdGVhbSB7Ci0gICAgbmFtZTogInRyZW5keV90ZWFtX3Rlc3RfZW5nX2FuZHJvaWRfd2VhciIsCi0KLSAgICAvLyBnby90cmVuZHkvbWFuYWdlL2VuZ2luZWVycy80OTc5MTUwNDIyOTMzNTA0Ci0gICAgdHJlbmR5X3RlYW1faWQ6ICI0OTc5MTUwNDIyOTMzNTA0IiwKLX0KLQotdGVhbSB7CiAgICAgbmFtZTogInRyZW5keV90ZWFtX21lc2NoX3RlYW0iLAogCiAgICAgLy8gZ28vdHJlbmR5L21hbmFnZS9lbmdpbmVlcnMvNTIwNTQ2NTg5OTM2ODQ0OApAQCAtNzIxLDEzICs2OTMsNiBAQAogfQogCiB0ZWFtIHsKLSAgICBuYW1lOiAidHJlbmR5X3RlYW1fd2Vhcl93ZWFyX2RldmVsb3Blcl9kZXZ4IiwKLQotICAgIC8vIGdvL3RyZW5keS9tYW5hZ2UvZW5naW5lZXJzLzQ4OTQ4OTA3NjQ2OTc2MDAKLSAgICB0cmVuZHlfdGVhbV9pZDogIjQ4OTQ4OTA3NjQ2OTc2MDAiLAotfQotCi10ZWFtIHsKICAgICBuYW1lOiAidHJlbmR5X3RlYW1fYW5kcm9pZF9ydXN0IiwKIAogICAgIC8vIGdvL3RyZW5keS9tYW5hZ2UvZW5naW5lZXJzLzQ4NDQ2MDA1ODYzMDU1MzYKQEAgLTkzMSwxMyArODk2LDYgQEAKIH0KIAogdGVhbSB7Ci0gICAgbmFtZTogInRyZW5keV90ZWFtX3dlYXJfd2FsbGV0X29uX3dlYXIiLAotCi0gICAgLy8gZ28vdHJlbmR5L21hbmFnZS9lbmdpbmVlcnMvNTcyNDk2MDQzNzczMTMyOAotICAgIHRyZW5keV90ZWFtX2lkOiAiNTcyNDk2MDQzNzczMTMyOCIsCi19Ci0KLXRlYW0gewogICAgIG5hbWU6ICJ0cmVuZHlfdGVhbV9nbGFuY2VhYmxlcyIsCiAKICAgICAvLyBnby90cmVuZHkvbWFuYWdlL2VuZ2luZWVycy80NjU4MjIyMDA0NjAwODMyCkBAIC0xMDcxLDEzICsxMDI5LDYgQEAKIH0KIAogdGVhbSB7Ci0gICAgbmFtZTogInRyZW5keV90ZWFtX3dlYXJfM3hwIiwKLQotICAgIC8vIGdvL3RyZW5keS9tYW5hZ2UvZW5naW5lZXJzLzU2OTIzMTc2MTI1Mzk5MDQKLSAgICB0cmVuZHlfdGVhbV9pZDogIjU2OTIzMTc2MTI1Mzk5MDQiLAotfQotCi10ZWFtIHsKICAgICBuYW1lOiAidHJlbmR5X3RlYW1fY2xvY2t3b3JrIiwKIAogICAgIC8vIGdvL3RyZW5keS9tYW5hZ2UvZW5naW5lZXJzLzQ5MDg3ODE2Nzg3NTU4NDAKQEAgLTEyMTEsMTMgKzExNjIsNiBAQAogfQogCiB0ZWFtIHsKLSAgICBuYW1lOiAidHJlbmR5X3RlYW1fd2Vhcl9zb2Z0d2FyZV9udGkiLAotCi0gICAgLy8gZ28vdHJlbmR5L21hbmFnZS9lbmdpbmVlcnMvNTE2NDk3MzU1ODc1OTQyNAotICAgIHRyZW5keV90ZWFtX2lkOiAiNTE2NDk3MzU1ODc1OTQyNCIsCi19Ci0KLXRlYW0gewogICAgIG5hbWU6ICJ0cmVuZHlfdGVhbV9tYWNoaW5lX2xlYXJuaW5nIiwKIAogICAgIC8vIGdvL3RyZW5keS9tYW5hZ2UvZW5naW5lZXJzLzUyNzY1NjgzMTgyNDY5MTIKQEAgLTEzMDksMTMgKzEyNTMsNiBAQAogfQogCiB0ZWFtIHsKLSAgICBuYW1lOiAidHJlbmR5X3RlYW1fd2Vhcl93ZWFyX3Bvd2VyX2VtdWxhdG9yIiwKLQotICAgIC8vIGdvL3RyZW5keS9tYW5hZ2UvZW5naW5lZXJzLzUxNjAzMzg5MzY3MjU1MDQKLSAgICB0cmVuZHlfdGVhbV9pZDogIjUxNjAzMzg5MzY3MjU1MDQiLAotfQotCi10ZWFtIHsKICAgICBuYW1lOiAidHJlbmR5X3RlYW1fZGVwcmVjYXRlZF9mcmFtZXdvcmtfc3ZldG9zbGF2Z2Fub3YiLAogCiAgICAgLy8gZ28vdHJlbmR5L21hbmFnZS9lbmdpbmVlcnMvNjQwNDExNzQ5MjUzMTIwMApAQCAtMTMzMCwxMyArMTI2Nyw2IEBACiB9CiAKIHRlYW0gewotICAgIG5hbWU6ICJ0cmVuZHlfdGVhbV93ZWFyX29wdXMiLAotCi0gICAgLy8gZ28vdHJlbmR5L21hbmFnZS9lbmdpbmVlcnMvNTA5ODM1MTYzNjY3NjYwOAotICAgIHRyZW5keV90ZWFtX2lkOiAiNTA5ODM1MTYzNjY3NjYwOCIsCi19Ci0KLXRlYW0gewogICAgIG5hbWU6ICJ0cmVuZHlfdGVhbV90ZXh0X3RvX3NwZWVjaCIsCiAKICAgICAvLyBnby90cmVuZHkvbWFuYWdlL2VuZ2luZWVycy82MzY4OTMzMTIwNDQyMzY4CkBAIC0xNDQyLDEzICsxMzcyLDYgQEAKIH0KIAogdGVhbSB7Ci0gICAgbmFtZTogInRyZW5keV90ZWFtX3dlYXJfZGV2ZWxvcGVyX2ZvdW5kYXRpb24iLAotCi0gICAgLy8gZ28vdHJlbmR5L21hbmFnZS9lbmdpbmVlcnMvNTIzOTEyNzEwODY0ODk2MAotICAgIHRyZW5keV90ZWFtX2lkOiAiNTIzOTEyNzEwODY0ODk2MCIsCi19Ci0KLXRlYW0gewogICAgIG5hbWU6ICJ0cmVuZHlfdGVhbV90cG1fdHZjIiwKIAogICAgIC8vIGdvL3RyZW5keS9tYW5hZ2UvZW5naW5lZXJzLzUzOTA2ODMzMzMyMzA1OTIKQEAgLTE0NTYsMTMgKzEzNzksNiBAQAogfQogCiB0ZWFtIHsKLSAgICBuYW1lOiAidHJlbmR5X3RlYW1fd2Vhcl93ZWFyX3V4IiwKLQotICAgIC8vIGdvL3RyZW5keS9tYW5hZ2UvZW5naW5lZXJzLzU3ODIwOTc0MTEwODAxOTIKLSAgICB0cmVuZHlfdGVhbV9pZDogIjU3ODIwOTc0MTEwODAxOTIiLAotfQotCi10ZWFtIHsKICAgICBuYW1lOiAidHJlbmR5X3RlYW1fbHNlX2Rlc2t0b3Bfb3NfZXhwZXJpZW5jZSIsCiAKICAgICAvLyBnby90cmVuZHkvbWFuYWdlL2VuZ2luZWVycy81MTI1MjM0OTAwNDM0OTQ0CkBAIC0xNjczLDEzICsxNTg5LDYgQEAKIH0KIAogdGVhbSB7Ci0gICAgbmFtZTogInRyZW5keV90ZWFtX3dlYXJfd2Vhcl9hc3Npc3RhbnQiLAotCi0gICAgLy8gZ28vdHJlbmR5L21hbmFnZS9lbmdpbmVlcnMvNTg0ODA3NTMwNjE3MjQxNgotICAgIHRyZW5keV90ZWFtX2lkOiAiNTg0ODA3NTMwNjE3MjQxNiIsCi19Ci0KLXRlYW0gewogICAgIG5hbWU6ICJ0cmVuZHlfdGVhbV9hbmRyb2lkX3Bvd2VyX2FuZF9jb21tc19pbmZyYSIsCiAKICAgICAvLyBnby90cmVuZHkvbWFuYWdlL2VuZ2luZWVycy81MzI1NTQ3NjUzMzMyOTkyCmRpZmYgLS1naXQgYS90b29scy9hY29uZmlnL2Fjb25maWcvc3JjL3N0b3JhZ2UvZmxhZ19pbmZvLnJzIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnL3NyYy9zdG9yYWdlL2ZsYWdfaW5mby5ycwppbmRleCAyNTMyNjA5Li41ZDU2NWU4IDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWcvc3JjL3N0b3JhZ2UvZmxhZ19pbmZvLnJzCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZy9zcmMvc3RvcmFnZS9mbGFnX2luZm8ucnMKQEAgLTgzLDcgKzgzLDcgQEAKICAgICAgICAgbGV0IGZsYWdfaW5mb19saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ19pbmZvX2xpc3RfZnJvbV9zb3VyY2UoKTsKICAgICAgICAgYXNzZXJ0IShmbGFnX2luZm9fbGlzdC5pc19vaygpKTsKICAgICAgICAgbGV0IGV4cGVjdGVkX2ZsYWdfaW5mb19saXN0ID0KLSAgICAgICAgICAgIGFjb25maWdfc3RvcmFnZV9maWxlOjp0ZXN0X3V0aWxzOjpjcmVhdGVfdGVzdF9mbGFnX2luZm9fbGlzdCgpOworICAgICAgICAgICAgYWNvbmZpZ19zdG9yYWdlX2ZpbGU6OnRlc3RfdXRpbHM6OmNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0KERFRkFVTFRfRklMRV9WRVJTSU9OKTsKICAgICAgICAgYXNzZXJ0X2VxIShmbGFnX2luZm9fbGlzdC51bndyYXAoKSwgZXhwZWN0ZWRfZmxhZ19pbmZvX2xpc3QpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZy9zcmMvc3RvcmFnZS9mbGFnX3RhYmxlLnJzIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnL3NyYy9zdG9yYWdlL2ZsYWdfdGFibGUucnMKaW5kZXggNjA0NmQ3ZS4uODg1NmViNiAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnL3NyYy9zdG9yYWdlL2ZsYWdfdGFibGUucnMKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnL3NyYy9zdG9yYWdlL2ZsYWdfdGFibGUucnMKQEAgLTE1Nyw3ICsxNTcsOCBAQAogICAgIGZuIHRlc3RfdGFibGVfY29udGVudHMoKSB7CiAgICAgICAgIGxldCBmbGFnX3RhYmxlID0gY3JlYXRlX3Rlc3RfZmxhZ190YWJsZV9mcm9tX3NvdXJjZSgpOwogICAgICAgICBhc3NlcnQhKGZsYWdfdGFibGUuaXNfb2soKSk7Ci0gICAgICAgIGxldCBleHBlY3RlZF9mbGFnX3RhYmxlID0gYWNvbmZpZ19zdG9yYWdlX2ZpbGU6OnRlc3RfdXRpbHM6OmNyZWF0ZV90ZXN0X2ZsYWdfdGFibGUoKTsKKyAgICAgICAgbGV0IGV4cGVjdGVkX2ZsYWdfdGFibGUgPQorICAgICAgICAgICAgYWNvbmZpZ19zdG9yYWdlX2ZpbGU6OnRlc3RfdXRpbHM6OmNyZWF0ZV90ZXN0X2ZsYWdfdGFibGUoREVGQVVMVF9GSUxFX1ZFUlNJT04pOwogICAgICAgICBhc3NlcnRfZXEhKGZsYWdfdGFibGUudW53cmFwKCksIGV4cGVjdGVkX2ZsYWdfdGFibGUpOwogICAgIH0KIH0KZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZy9zcmMvc3RvcmFnZS9mbGFnX3ZhbHVlLnJzIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnL3NyYy9zdG9yYWdlL2ZsYWdfdmFsdWUucnMKaW5kZXggNmE2NTViOS4uMGRkNWE5ZCAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnL3NyYy9zdG9yYWdlL2ZsYWdfdmFsdWUucnMKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnL3NyYy9zdG9yYWdlL2ZsYWdfdmFsdWUucnMKQEAgLTgyLDcgKzgyLDcgQEAKICAgICAgICAgbGV0IGZsYWdfdmFsdWVfbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfdmFsdWVfbGlzdF9mcm9tX3NvdXJjZSgpOwogICAgICAgICBhc3NlcnQhKGZsYWdfdmFsdWVfbGlzdC5pc19vaygpKTsKICAgICAgICAgbGV0IGV4cGVjdGVkX2ZsYWdfdmFsdWVfbGlzdCA9Ci0gICAgICAgICAgICBhY29uZmlnX3N0b3JhZ2VfZmlsZTo6dGVzdF91dGlsczo6Y3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0KCk7CisgICAgICAgICAgICBhY29uZmlnX3N0b3JhZ2VfZmlsZTo6dGVzdF91dGlsczo6Y3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0KERFRkFVTFRfRklMRV9WRVJTSU9OKTsKICAgICAgICAgYXNzZXJ0X2VxIShmbGFnX3ZhbHVlX2xpc3QudW53cmFwKCksIGV4cGVjdGVkX2ZsYWdfdmFsdWVfbGlzdCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnL3NyYy9zdG9yYWdlL21vZC5ycyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZy9zcmMvc3RvcmFnZS9tb2QucnMKaW5kZXggOWU1ZGFkNS4uYzdmZDU1YSAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnL3NyYy9zdG9yYWdlL21vZC5ycworKysgYi90b29scy9hY29uZmlnL2Fjb25maWcvc3JjL3N0b3JhZ2UvbW9kLnJzCkBAIC0zMiw2ICszMiw3IEBACiBwdWIgc3RydWN0IEZsYWdQYWNrYWdlPCdhPiB7CiAgICAgcHViIHBhY2thZ2VfbmFtZTogJidhIHN0ciwKICAgICBwdWIgcGFja2FnZV9pZDogdTMyLAorICAgIHB1YiBmaW5nZXJwcmludDogdTY0LAogICAgIHB1YiBmbGFnX25hbWVzOiBIYXNoU2V0PCYnYSBzdHI+LAogICAgIHB1YiBib29sZWFuX2ZsYWdzOiBWZWM8JidhIFByb3RvUGFyc2VkRmxhZz4sCiAgICAgLy8gVGhlIGluZGV4IG9mIHRoZSBmaXJzdCBib29sZWFuIGZsYWcgaW4gdGhpcyBhY29uZmlnIHBhY2thZ2UgYW1vbmcgYWxsIGJvb2xlYW4KQEAgLTQ0LDYgKzQ1LDcgQEAKICAgICAgICAgRmxhZ1BhY2thZ2UgewogICAgICAgICAgICAgcGFja2FnZV9uYW1lLAogICAgICAgICAgICAgcGFja2FnZV9pZCwKKyAgICAgICAgICAgIGZpbmdlcnByaW50OiAwLAogICAgICAgICAgICAgZmxhZ19uYW1lczogSGFzaFNldDo6bmV3KCksCiAgICAgICAgICAgICBib29sZWFuX2ZsYWdzOiB2ZWMhW10sCiAgICAgICAgICAgICBib29sZWFuX3N0YXJ0X2luZGV4OiAwLApAQCAtNzksNiArODEsOCBAQAogICAgIGZvciBwIGluIHBhY2thZ2VzLml0ZXJfbXV0KCkgewogICAgICAgICBwLmJvb2xlYW5fc3RhcnRfaW5kZXggPSBib29sZWFuX3N0YXJ0X2luZGV4OwogICAgICAgICBib29sZWFuX3N0YXJ0X2luZGV4ICs9IHAuYm9vbGVhbl9mbGFncy5sZW4oKSBhcyB1MzI7CisKKyAgICAgICAgLy8gVE9ETzogYi8zMTYzNTc2ODYgLSBDYWxjdWxhdGUgZmluZ2VycHJpbnQgYW5kIGFkZCB0byBwYWNrYWdlLgogICAgIH0KIAogICAgIHBhY2thZ2VzCmRpZmYgLS1naXQgYS90b29scy9hY29uZmlnL2Fjb25maWcvc3JjL3N0b3JhZ2UvcGFja2FnZV90YWJsZS5ycyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZy9zcmMvc3RvcmFnZS9wYWNrYWdlX3RhYmxlLnJzCmluZGV4IDU2NTU5ZjguLmU0NjYwN2IgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZy9zcmMvc3RvcmFnZS9wYWNrYWdlX3RhYmxlLnJzCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZy9zcmMvc3RvcmFnZS9wYWNrYWdlX3RhYmxlLnJzCkBAIC00Nyw2ICs0Nyw3IEBACiAgICAgICAgIGxldCBub2RlID0gUGFja2FnZVRhYmxlTm9kZSB7CiAgICAgICAgICAgICBwYWNrYWdlX25hbWU6IFN0cmluZzo6ZnJvbShwYWNrYWdlLnBhY2thZ2VfbmFtZSksCiAgICAgICAgICAgICBwYWNrYWdlX2lkOiBwYWNrYWdlLnBhY2thZ2VfaWQsCisgICAgICAgICAgICBmaW5nZXJwcmludDogcGFja2FnZS5maW5nZXJwcmludCwKICAgICAgICAgICAgIGJvb2xlYW5fc3RhcnRfaW5kZXg6IHBhY2thZ2UuYm9vbGVhbl9zdGFydF9pbmRleCwKICAgICAgICAgICAgIG5leHRfb2Zmc2V0OiBOb25lLAogICAgICAgICB9OwpAQCAtMTI3LDcgKzEyOCw4IEBACiAgICAgZm4gdGVzdF90YWJsZV9jb250ZW50cygpIHsKICAgICAgICAgbGV0IHBhY2thZ2VfdGFibGUgPSBjcmVhdGVfdGVzdF9wYWNrYWdlX3RhYmxlX2Zyb21fc291cmNlKCk7CiAgICAgICAgIGFzc2VydCEocGFja2FnZV90YWJsZS5pc19vaygpKTsKLSAgICAgICAgbGV0IGV4cGVjdGVkX3BhY2thZ2VfdGFibGUgPSBhY29uZmlnX3N0b3JhZ2VfZmlsZTo6dGVzdF91dGlsczo6Y3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZSgpOworICAgICAgICBsZXQgZXhwZWN0ZWRfcGFja2FnZV90YWJsZSA9CisgICAgICAgICAgICBhY29uZmlnX3N0b3JhZ2VfZmlsZTo6dGVzdF91dGlsczo6Y3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZShERUZBVUxUX0ZJTEVfVkVSU0lPTik7CiAgICAgICAgIGFzc2VydF9lcSEocGFja2FnZV90YWJsZS51bndyYXAoKSwgZXhwZWN0ZWRfcGFja2FnZV90YWJsZSk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX2ZsYWdzL2ZsYWdzLmFjb25maWcgYi90b29scy9hY29uZmlnL2Fjb25maWdfZmxhZ3MvZmxhZ3MuYWNvbmZpZwppbmRleCAwYTAwNGNhLi5iNjZkMjgyIDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWdfZmxhZ3MvZmxhZ3MuYWNvbmZpZworKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfZmxhZ3MvZmxhZ3MuYWNvbmZpZwpAQCAtMTQsMyArMTQsMTEgQEAKICAgYnVnOiAiMzY5ODA4ODA1IgogICBkZXNjcmlwdGlvbjogIldoZW4gZW5hYmxlZCwgbGF1bmNoIGFjb25maWdkIGZyb20gY29uZmlnIGluZnJhIG1vZHVsZS4iCiB9CisKK2ZsYWcgeworICBuYW1lOiAiZW5hYmxlX3N5c3RlbV9hY29uZmlnZF9ydXN0IgorICBuYW1lc3BhY2U6ICJjb3JlX2V4cGVyaW1lbnRzX3RlYW1faW50ZXJuYWwiCisgIGJ1ZzogIjM3ODA3OTUzOSIKKyAgZGVzY3JpcHRpb246ICJXaGVuIGVuYWJsZWQsIHRoZSBhY29uZmlnZCBjY19iaW5hcnkgdGFyZ2V0IGJlY29tZXMgYSBuby1vcCwgYW5kIHRoZSBydXN0X2JpbmFyeSBhY29uZmlnZC1zeXN0ZW0gdGFyZ2V0IHN0YXJ0cyB1cC4iCisgIGlzX2ZpeGVkX3JlYWRfb25seTogdHJ1ZQorfQpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX2ZsYWdzL3NyYy9saWIucnMgYi90b29scy9hY29uZmlnL2Fjb25maWdfZmxhZ3Mvc3JjL2xpYi5ycwppbmRleCAyZTg5MTI3Li5iNDEzYzYyIDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWdfZmxhZ3Mvc3JjL2xpYi5ycworKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfZmxhZ3Mvc3JjL2xpYi5ycwpAQCAtMzksNiArMzksMTEgQEAKICAgICBwdWIgZm4gZW5hYmxlX2Fjb25maWdkX2Zyb21fbWFpbmxpbmUoKSAtPiBib29sIHsKICAgICAgICAgYWNvbmZpZ19mbGFnc19ydXN0OjplbmFibGVfb25seV9uZXdfc3RvcmFnZSgpCiAgICAgfQorCisgICAgLy8vIFJldHVybnMgdGhlIHZhbHVlIGZvciB0aGUgZW5hYmxlX3N5c3RlbV9hY29uZmlnZF9ydXN0IGZsYWcuCisgICAgcHViIGZuIGVuYWJsZV9zeXN0ZW1fYWNvbmZpZ2RfcnVzdCgpIC0+IGJvb2wgeworICAgICAgICBhY29uZmlnX2ZsYWdzX3J1c3Q6OmVuYWJsZV9zeXN0ZW1fYWNvbmZpZ2RfcnVzdCgpCisgICAgfQogfQogCiAvLy8gTW9kdWxlIHVzZWQgd2hlbiBidWlsZGluZyB3aXRoIGNhcmdvCkBAIC01NSw0ICs2MCwxMCBAQAogICAgICAgICAvLyBVc2VkIG9ubHkgdG8gZW5hYmxlIHR5cGVjaGVja2luZyBhbmQgdGVzdGluZyB3aXRoIGNhcmdvCiAgICAgICAgIHRydWUKICAgICB9CisKKyAgICAvLy8gUmV0dXJucyBhIHBsYWNlaG9sZGVyIHZhbHVlIGZvciB0aGUgZW5hYmxlX3N5c3RlbV9hY29uZmlnZF9ydXN0IGZsYWcuCisgICAgcHViIGZuIGVuYWJsZV9zeXN0ZW1fYWNvbmZpZ2RfcnVzdCgpIC0+IGJvb2wgeworICAgICAgICAvLyBVc2VkIG9ubHkgdG8gZW5hYmxlIHR5cGVjaGVja2luZyBhbmQgdGVzdGluZyB3aXRoIGNhcmdvCisgICAgICAgIHRydWUKKyAgICB9CiB9CmRpZmYgLS1naXQgYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3NyYy9mbGFnX2luZm8ucnMgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3NyYy9mbGFnX2luZm8ucnMKaW5kZXggZjA5MDM5Ni4uY2YxNjgzNCAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS9zcmMvZmxhZ19pbmZvLnJzCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvc3JjL2ZsYWdfaW5mby5ycwpAQCAtMTk0LDEyICsxOTQsMTUgQEAKICNbY2ZnKHRlc3QpXQogbW9kIHRlc3RzIHsKICAgICB1c2Ugc3VwZXI6Oio7Ci0gICAgdXNlIGNyYXRlOjp0ZXN0X3V0aWxzOjpjcmVhdGVfdGVzdF9mbGFnX2luZm9fbGlzdDsKKyAgICB1c2UgY3JhdGU6OnsKKyAgICAgICAgdGVzdF91dGlsczo6Y3JlYXRlX3Rlc3RfZmxhZ19pbmZvX2xpc3QsIERFRkFVTFRfRklMRV9WRVJTSU9OLCBNQVhfU1VQUE9SVEVEX0ZJTEVfVkVSU0lPTiwKKyAgICB9OwogCi0gICAgI1t0ZXN0XQogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIHRoZSB2YWx1ZSBsaXN0IHNlcmlhbGl6YXRpb24KLSAgICBmbiB0ZXN0X3NlcmlhbGl6YXRpb24oKSB7Ci0gICAgICAgIGxldCBmbGFnX2luZm9fbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0KCk7CisgICAgLy8gVE9ETzogYi8zNzYxMDgyNjggLSBVc2UgcGFyYW1ldGVyaXplZCB0ZXN0cy4KKyAgICAjW3Rlc3RdCisgICAgZm4gdGVzdF9zZXJpYWxpemF0aW9uX2RlZmF1bHQoKSB7CisgICAgICAgIGxldCBmbGFnX2luZm9fbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0KERFRkFVTFRfRklMRV9WRVJTSU9OKTsKIAogICAgICAgICBsZXQgaGVhZGVyOiAmRmxhZ0luZm9IZWFkZXIgPSAmZmxhZ19pbmZvX2xpc3QuaGVhZGVyOwogICAgICAgICBsZXQgcmVpbnRlcnByZXRlZF9oZWFkZXIgPSBGbGFnSW5mb0hlYWRlcjo6ZnJvbV9ieXRlcygmaGVhZGVyLmludG9fYnl0ZXMoKSk7CkBAIC0yMjAsMjAgKzIyMyw0MiBAQAogICAgIH0KIAogICAgICNbdGVzdF0KLSAgICAvLyB0aGlzIHRlc3QgcG9pbnQgbG9ja3MgZG93biB0aGF0IHZlcnNpb24gbnVtYmVyIHNob3VsZCBiZSBhdCB0aGUgdG9wIG9mIHNlcmlhbGl6ZWQKLSAgICAvLyBieXRlcwotICAgIGZuIHRlc3RfdmVyc2lvbl9udW1iZXIoKSB7Ci0gICAgICAgIGxldCBmbGFnX2luZm9fbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0KCk7Ci0gICAgICAgIGxldCBieXRlcyA9ICZmbGFnX2luZm9fbGlzdC5pbnRvX2J5dGVzKCk7Ci0gICAgICAgIGxldCBtdXQgaGVhZCA9IDA7Ci0gICAgICAgIGxldCB2ZXJzaW9uID0gcmVhZF91MzJfZnJvbV9ieXRlcyhieXRlcywgJm11dCBoZWFkKS51bndyYXAoKTsKLSAgICAgICAgYXNzZXJ0X2VxISh2ZXJzaW9uLCAxKTsKKyAgICBmbiB0ZXN0X3NlcmlhbGl6YXRpb25fbWF4KCkgeworICAgICAgICBsZXQgZmxhZ19pbmZvX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX2luZm9fbGlzdChNQVhfU1VQUE9SVEVEX0ZJTEVfVkVSU0lPTik7CisKKyAgICAgICAgbGV0IGhlYWRlcjogJkZsYWdJbmZvSGVhZGVyID0gJmZsYWdfaW5mb19saXN0LmhlYWRlcjsKKyAgICAgICAgbGV0IHJlaW50ZXJwcmV0ZWRfaGVhZGVyID0gRmxhZ0luZm9IZWFkZXI6OmZyb21fYnl0ZXMoJmhlYWRlci5pbnRvX2J5dGVzKCkpOworICAgICAgICBhc3NlcnQhKHJlaW50ZXJwcmV0ZWRfaGVhZGVyLmlzX29rKCkpOworICAgICAgICBhc3NlcnRfZXEhKGhlYWRlciwgJnJlaW50ZXJwcmV0ZWRfaGVhZGVyLnVud3JhcCgpKTsKKworICAgICAgICBsZXQgbm9kZXM6ICZWZWM8RmxhZ0luZm9Ob2RlPiA9ICZmbGFnX2luZm9fbGlzdC5ub2RlczsKKyAgICAgICAgZm9yIG5vZGUgaW4gbm9kZXMuaXRlcigpIHsKKyAgICAgICAgICAgIGxldCByZWludGVycHJldGVkX25vZGUgPSBGbGFnSW5mb05vZGU6OmZyb21fYnl0ZXMoJm5vZGUuaW50b19ieXRlcygpKS51bndyYXAoKTsKKyAgICAgICAgICAgIGFzc2VydF9lcSEobm9kZSwgJnJlaW50ZXJwcmV0ZWRfbm9kZSk7CisgICAgICAgIH0KKworICAgICAgICBsZXQgZmxhZ19pbmZvX2J5dGVzID0gZmxhZ19pbmZvX2xpc3QuaW50b19ieXRlcygpOworICAgICAgICBsZXQgcmVpbnRlcnByZXRlZF9pbmZvX2xpc3QgPSBGbGFnSW5mb0xpc3Q6OmZyb21fYnl0ZXMoJmZsYWdfaW5mb19ieXRlcyk7CisgICAgICAgIGFzc2VydCEocmVpbnRlcnByZXRlZF9pbmZvX2xpc3QuaXNfb2soKSk7CisgICAgICAgIGFzc2VydF9lcSEoJmZsYWdfaW5mb19saXN0LCAmcmVpbnRlcnByZXRlZF9pbmZvX2xpc3QudW53cmFwKCkpOworICAgICAgICBhc3NlcnRfZXEhKGZsYWdfaW5mb19ieXRlcy5sZW4oKSBhcyB1MzIsIGhlYWRlci5maWxlX3NpemUpOwogICAgIH0KIAorICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIHRoYXQgdmVyc2lvbiBudW1iZXIgc2hvdWxkIGJlIGF0IHRoZSB0b3Agb2Ygc2VyaWFsaXplZAorICAgIC8vIGJ5dGVzCiAgICAgI1t0ZXN0XQorICAgIGZuIHRlc3RfdmVyc2lvbl9udW1iZXIoKSB7CisgICAgICAgIGxldCBmbGFnX2luZm9fbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0KERFRkFVTFRfRklMRV9WRVJTSU9OKTsKKyAgICAgICAgbGV0IGJ5dGVzID0gJmZsYWdfaW5mb19saXN0LmludG9fYnl0ZXMoKTsKKyAgICAgICAgbGV0IG11dCBoZWFkID0gMDsKKyAgICAgICAgbGV0IHZlcnNpb25fZnJvbV9maWxlID0gcmVhZF91MzJfZnJvbV9ieXRlcyhieXRlcywgJm11dCBoZWFkKS51bndyYXAoKTsKKyAgICAgICAgYXNzZXJ0X2VxISh2ZXJzaW9uX2Zyb21fZmlsZSwgREVGQVVMVF9GSUxFX1ZFUlNJT04pOworICAgIH0KKwogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIGZpbGUgdHlwZSBjaGVjaworICAgICNbdGVzdF0KICAgICBmbiB0ZXN0X2ZpbGVfdHlwZV9jaGVjaygpIHsKLSAgICAgICAgbGV0IG11dCBmbGFnX2luZm9fbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0KCk7CisgICAgICAgIGxldCBtdXQgZmxhZ19pbmZvX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX2luZm9fbGlzdChERUZBVUxUX0ZJTEVfVkVSU0lPTik7CiAgICAgICAgIGZsYWdfaW5mb19saXN0LmhlYWRlci5maWxlX3R5cGUgPSAxMjN1ODsKICAgICAgICAgbGV0IGVycm9yID0gRmxhZ0luZm9MaXN0Ojpmcm9tX2J5dGVzKCZmbGFnX2luZm9fbGlzdC5pbnRvX2J5dGVzKCkpLnVud3JhcF9lcnIoKTsKICAgICAgICAgYXNzZXJ0X2VxISgKZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvc3JjL2ZsYWdfdGFibGUucnMgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3NyYy9mbGFnX3RhYmxlLnJzCmluZGV4IDA1ODhmZTUuLjZmYmVlMDIgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvc3JjL2ZsYWdfdGFibGUucnMKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS9zcmMvZmxhZ190YWJsZS5ycwpAQCAtMjIwLDEyICsyMjAsMTUgQEAKICNbY2ZnKHRlc3QpXQogbW9kIHRlc3RzIHsKICAgICB1c2Ugc3VwZXI6Oio7Ci0gICAgdXNlIGNyYXRlOjp0ZXN0X3V0aWxzOjpjcmVhdGVfdGVzdF9mbGFnX3RhYmxlOworICAgIHVzZSBjcmF0ZTo6eworICAgICAgICB0ZXN0X3V0aWxzOjpjcmVhdGVfdGVzdF9mbGFnX3RhYmxlLCBERUZBVUxUX0ZJTEVfVkVSU0lPTiwgTUFYX1NVUFBPUlRFRF9GSUxFX1ZFUlNJT04sCisgICAgfTsKIAotICAgICNbdGVzdF0KICAgICAvLyB0aGlzIHRlc3QgcG9pbnQgbG9ja3MgZG93biB0aGUgdGFibGUgc2VyaWFsaXphdGlvbgotICAgIGZuIHRlc3Rfc2VyaWFsaXphdGlvbigpIHsKLSAgICAgICAgbGV0IGZsYWdfdGFibGUgPSBjcmVhdGVfdGVzdF9mbGFnX3RhYmxlKCk7CisgICAgLy8gVE9ETzogYi8zNzYxMDgyNjggLSBVc2UgcGFyYW1ldGVyaXplZCB0ZXN0cy4KKyAgICAjW3Rlc3RdCisgICAgZm4gdGVzdF9zZXJpYWxpemF0aW9uX2RlZmF1bHQoKSB7CisgICAgICAgIGxldCBmbGFnX3RhYmxlID0gY3JlYXRlX3Rlc3RfZmxhZ190YWJsZShERUZBVUxUX0ZJTEVfVkVSU0lPTik7CiAKICAgICAgICAgbGV0IGhlYWRlcjogJkZsYWdUYWJsZUhlYWRlciA9ICZmbGFnX3RhYmxlLmhlYWRlcjsKICAgICAgICAgbGV0IHJlaW50ZXJwcmV0ZWRfaGVhZGVyID0gRmxhZ1RhYmxlSGVhZGVyOjpmcm9tX2J5dGVzKCZoZWFkZXIuaW50b19ieXRlcygpKTsKQEAgLTI0NiwyMCArMjQ5LDQyIEBACiAgICAgfQogCiAgICAgI1t0ZXN0XQotICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIHRoYXQgdmVyc2lvbiBudW1iZXIgc2hvdWxkIGJlIGF0IHRoZSB0b3Agb2Ygc2VyaWFsaXplZAotICAgIC8vIGJ5dGVzCi0gICAgZm4gdGVzdF92ZXJzaW9uX251bWJlcigpIHsKLSAgICAgICAgbGV0IGZsYWdfdGFibGUgPSBjcmVhdGVfdGVzdF9mbGFnX3RhYmxlKCk7Ci0gICAgICAgIGxldCBieXRlcyA9ICZmbGFnX3RhYmxlLmludG9fYnl0ZXMoKTsKLSAgICAgICAgbGV0IG11dCBoZWFkID0gMDsKLSAgICAgICAgbGV0IHZlcnNpb24gPSByZWFkX3UzMl9mcm9tX2J5dGVzKGJ5dGVzLCAmbXV0IGhlYWQpLnVud3JhcCgpOwotICAgICAgICBhc3NlcnRfZXEhKHZlcnNpb24sIDEpOworICAgIGZuIHRlc3Rfc2VyaWFsaXphdGlvbl9tYXgoKSB7CisgICAgICAgIGxldCBmbGFnX3RhYmxlID0gY3JlYXRlX3Rlc3RfZmxhZ190YWJsZShNQVhfU1VQUE9SVEVEX0ZJTEVfVkVSU0lPTik7CisKKyAgICAgICAgbGV0IGhlYWRlcjogJkZsYWdUYWJsZUhlYWRlciA9ICZmbGFnX3RhYmxlLmhlYWRlcjsKKyAgICAgICAgbGV0IHJlaW50ZXJwcmV0ZWRfaGVhZGVyID0gRmxhZ1RhYmxlSGVhZGVyOjpmcm9tX2J5dGVzKCZoZWFkZXIuaW50b19ieXRlcygpKTsKKyAgICAgICAgYXNzZXJ0IShyZWludGVycHJldGVkX2hlYWRlci5pc19vaygpKTsKKyAgICAgICAgYXNzZXJ0X2VxIShoZWFkZXIsICZyZWludGVycHJldGVkX2hlYWRlci51bndyYXAoKSk7CisKKyAgICAgICAgbGV0IG5vZGVzOiAmVmVjPEZsYWdUYWJsZU5vZGU+ID0gJmZsYWdfdGFibGUubm9kZXM7CisgICAgICAgIGZvciBub2RlIGluIG5vZGVzLml0ZXIoKSB7CisgICAgICAgICAgICBsZXQgcmVpbnRlcnByZXRlZF9ub2RlID0gRmxhZ1RhYmxlTm9kZTo6ZnJvbV9ieXRlcygmbm9kZS5pbnRvX2J5dGVzKCkpLnVud3JhcCgpOworICAgICAgICAgICAgYXNzZXJ0X2VxIShub2RlLCAmcmVpbnRlcnByZXRlZF9ub2RlKTsKKyAgICAgICAgfQorCisgICAgICAgIGxldCBmbGFnX3RhYmxlX2J5dGVzID0gZmxhZ190YWJsZS5pbnRvX2J5dGVzKCk7CisgICAgICAgIGxldCByZWludGVycHJldGVkX3RhYmxlID0gRmxhZ1RhYmxlOjpmcm9tX2J5dGVzKCZmbGFnX3RhYmxlX2J5dGVzKTsKKyAgICAgICAgYXNzZXJ0IShyZWludGVycHJldGVkX3RhYmxlLmlzX29rKCkpOworICAgICAgICBhc3NlcnRfZXEhKCZmbGFnX3RhYmxlLCAmcmVpbnRlcnByZXRlZF90YWJsZS51bndyYXAoKSk7CisgICAgICAgIGFzc2VydF9lcSEoZmxhZ190YWJsZV9ieXRlcy5sZW4oKSBhcyB1MzIsIGhlYWRlci5maWxlX3NpemUpOwogICAgIH0KIAorICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIHRoYXQgdmVyc2lvbiBudW1iZXIgc2hvdWxkIGJlIGF0IHRoZSB0b3Agb2Ygc2VyaWFsaXplZAorICAgIC8vIGJ5dGVzCiAgICAgI1t0ZXN0XQorICAgIGZuIHRlc3RfdmVyc2lvbl9udW1iZXIoKSB7CisgICAgICAgIGxldCBmbGFnX3RhYmxlID0gY3JlYXRlX3Rlc3RfZmxhZ190YWJsZShERUZBVUxUX0ZJTEVfVkVSU0lPTik7CisgICAgICAgIGxldCBieXRlcyA9ICZmbGFnX3RhYmxlLmludG9fYnl0ZXMoKTsKKyAgICAgICAgbGV0IG11dCBoZWFkID0gMDsKKyAgICAgICAgbGV0IHZlcnNpb25fZnJvbV9maWxlID0gcmVhZF91MzJfZnJvbV9ieXRlcyhieXRlcywgJm11dCBoZWFkKS51bndyYXAoKTsKKyAgICAgICAgYXNzZXJ0X2VxISh2ZXJzaW9uX2Zyb21fZmlsZSwgREVGQVVMVF9GSUxFX1ZFUlNJT04pOworICAgIH0KKwogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIGZpbGUgdHlwZSBjaGVjaworICAgICNbdGVzdF0KICAgICBmbiB0ZXN0X2ZpbGVfdHlwZV9jaGVjaygpIHsKLSAgICAgICAgbGV0IG11dCBmbGFnX3RhYmxlID0gY3JlYXRlX3Rlc3RfZmxhZ190YWJsZSgpOworICAgICAgICBsZXQgbXV0IGZsYWdfdGFibGUgPSBjcmVhdGVfdGVzdF9mbGFnX3RhYmxlKERFRkFVTFRfRklMRV9WRVJTSU9OKTsKICAgICAgICAgZmxhZ190YWJsZS5oZWFkZXIuZmlsZV90eXBlID0gMTIzdTg7CiAgICAgICAgIGxldCBlcnJvciA9IEZsYWdUYWJsZTo6ZnJvbV9ieXRlcygmZmxhZ190YWJsZS5pbnRvX2J5dGVzKCkpLnVud3JhcF9lcnIoKTsKICAgICAgICAgYXNzZXJ0X2VxISgKZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvc3JjL2ZsYWdfdmFsdWUucnMgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3NyYy9mbGFnX3ZhbHVlLnJzCmluZGV4IGI2NGMxMGUuLjlhMTRiZWMgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvc3JjL2ZsYWdfdmFsdWUucnMKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS9zcmMvZmxhZ192YWx1ZS5ycwpAQCAtMTMyLDEyICsxMzIsMzIgQEAKICNbY2ZnKHRlc3QpXQogbW9kIHRlc3RzIHsKICAgICB1c2Ugc3VwZXI6Oio7Ci0gICAgdXNlIGNyYXRlOjp0ZXN0X3V0aWxzOjpjcmVhdGVfdGVzdF9mbGFnX3ZhbHVlX2xpc3Q7CisgICAgdXNlIGNyYXRlOjp7CisgICAgICAgIHRlc3RfdXRpbHM6OmNyZWF0ZV90ZXN0X2ZsYWdfdmFsdWVfbGlzdCwgREVGQVVMVF9GSUxFX1ZFUlNJT04sIE1BWF9TVVBQT1JURURfRklMRV9WRVJTSU9OLAorICAgIH07CiAKICAgICAjW3Rlc3RdCiAgICAgLy8gdGhpcyB0ZXN0IHBvaW50IGxvY2tzIGRvd24gdGhlIHZhbHVlIGxpc3Qgc2VyaWFsaXphdGlvbgotICAgIGZuIHRlc3Rfc2VyaWFsaXphdGlvbigpIHsKLSAgICAgICAgbGV0IGZsYWdfdmFsdWVfbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfdmFsdWVfbGlzdCgpOworICAgIC8vIFRPRE86IGIvMzc2MTA4MjY4IC0gVXNlIHBhcmFtZXRlcml6ZWQgdGVzdHMuCisgICAgZm4gdGVzdF9zZXJpYWxpemF0aW9uX2RlZmF1bHQoKSB7CisgICAgICAgIGxldCBmbGFnX3ZhbHVlX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX3ZhbHVlX2xpc3QoREVGQVVMVF9GSUxFX1ZFUlNJT04pOworCisgICAgICAgIGxldCBoZWFkZXI6ICZGbGFnVmFsdWVIZWFkZXIgPSAmZmxhZ192YWx1ZV9saXN0LmhlYWRlcjsKKyAgICAgICAgbGV0IHJlaW50ZXJwcmV0ZWRfaGVhZGVyID0gRmxhZ1ZhbHVlSGVhZGVyOjpmcm9tX2J5dGVzKCZoZWFkZXIuaW50b19ieXRlcygpKTsKKyAgICAgICAgYXNzZXJ0IShyZWludGVycHJldGVkX2hlYWRlci5pc19vaygpKTsKKyAgICAgICAgYXNzZXJ0X2VxIShoZWFkZXIsICZyZWludGVycHJldGVkX2hlYWRlci51bndyYXAoKSk7CisKKyAgICAgICAgbGV0IGZsYWdfdmFsdWVfYnl0ZXMgPSBmbGFnX3ZhbHVlX2xpc3QuaW50b19ieXRlcygpOworICAgICAgICBsZXQgcmVpbnRlcnByZXRlZF92YWx1ZV9saXN0ID0gRmxhZ1ZhbHVlTGlzdDo6ZnJvbV9ieXRlcygmZmxhZ192YWx1ZV9ieXRlcyk7CisgICAgICAgIGFzc2VydCEocmVpbnRlcnByZXRlZF92YWx1ZV9saXN0LmlzX29rKCkpOworICAgICAgICBhc3NlcnRfZXEhKCZmbGFnX3ZhbHVlX2xpc3QsICZyZWludGVycHJldGVkX3ZhbHVlX2xpc3QudW53cmFwKCkpOworICAgICAgICBhc3NlcnRfZXEhKGZsYWdfdmFsdWVfYnl0ZXMubGVuKCkgYXMgdTMyLCBoZWFkZXIuZmlsZV9zaXplKTsKKyAgICB9CisKKyAgICAjW3Rlc3RdCisgICAgLy8gdGhpcyB0ZXN0IHBvaW50IGxvY2tzIGRvd24gdGhlIHZhbHVlIGxpc3Qgc2VyaWFsaXphdGlvbgorICAgIGZuIHRlc3Rfc2VyaWFsaXphdGlvbl9tYXgoKSB7CisgICAgICAgIGxldCBmbGFnX3ZhbHVlX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX3ZhbHVlX2xpc3QoTUFYX1NVUFBPUlRFRF9GSUxFX1ZFUlNJT04pOwogCiAgICAgICAgIGxldCBoZWFkZXI6ICZGbGFnVmFsdWVIZWFkZXIgPSAmZmxhZ192YWx1ZV9saXN0LmhlYWRlcjsKICAgICAgICAgbGV0IHJlaW50ZXJwcmV0ZWRfaGVhZGVyID0gRmxhZ1ZhbHVlSGVhZGVyOjpmcm9tX2J5dGVzKCZoZWFkZXIuaW50b19ieXRlcygpKTsKQEAgLTE1NSwxNyArMTc1LDE3IEBACiAgICAgLy8gdGhpcyB0ZXN0IHBvaW50IGxvY2tzIGRvd24gdGhhdCB2ZXJzaW9uIG51bWJlciBzaG91bGQgYmUgYXQgdGhlIHRvcCBvZiBzZXJpYWxpemVkCiAgICAgLy8gYnl0ZXMKICAgICBmbiB0ZXN0X3ZlcnNpb25fbnVtYmVyKCkgewotICAgICAgICBsZXQgZmxhZ192YWx1ZV9saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0KCk7CisgICAgICAgIGxldCBmbGFnX3ZhbHVlX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX3ZhbHVlX2xpc3QoREVGQVVMVF9GSUxFX1ZFUlNJT04pOwogICAgICAgICBsZXQgYnl0ZXMgPSAmZmxhZ192YWx1ZV9saXN0LmludG9fYnl0ZXMoKTsKICAgICAgICAgbGV0IG11dCBoZWFkID0gMDsKLSAgICAgICAgbGV0IHZlcnNpb24gPSByZWFkX3UzMl9mcm9tX2J5dGVzKGJ5dGVzLCAmbXV0IGhlYWQpLnVud3JhcCgpOwotICAgICAgICBhc3NlcnRfZXEhKHZlcnNpb24sIDEpOworICAgICAgICBsZXQgdmVyc2lvbl9mcm9tX2ZpbGUgPSByZWFkX3UzMl9mcm9tX2J5dGVzKGJ5dGVzLCAmbXV0IGhlYWQpLnVud3JhcCgpOworICAgICAgICBhc3NlcnRfZXEhKHZlcnNpb25fZnJvbV9maWxlLCBERUZBVUxUX0ZJTEVfVkVSU0lPTik7CiAgICAgfQogCiAgICAgI1t0ZXN0XQogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIGZpbGUgdHlwZSBjaGVjawogICAgIGZuIHRlc3RfZmlsZV90eXBlX2NoZWNrKCkgewotICAgICAgICBsZXQgbXV0IGZsYWdfdmFsdWVfbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfdmFsdWVfbGlzdCgpOworICAgICAgICBsZXQgbXV0IGZsYWdfdmFsdWVfbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfdmFsdWVfbGlzdChERUZBVUxUX0ZJTEVfVkVSU0lPTik7CiAgICAgICAgIGZsYWdfdmFsdWVfbGlzdC5oZWFkZXIuZmlsZV90eXBlID0gMTIzdTg7CiAgICAgICAgIGxldCBlcnJvciA9IEZsYWdWYWx1ZUxpc3Q6OmZyb21fYnl0ZXMoJmZsYWdfdmFsdWVfbGlzdC5pbnRvX2J5dGVzKCkpLnVud3JhcF9lcnIoKTsKICAgICAgICAgYXNzZXJ0X2VxISgKZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvc3JjL2xpYi5ycyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvc3JjL2xpYi5ycwppbmRleCA1ZGM1ZWY3Li5lOTkxMzIwIDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3NyYy9saWIucnMKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS9zcmMvbGliLnJzCkBAIC0yMjgsMTQgKzIyOCwxMCBAQAogCiAvLy8gUmVhZCBhbmQgcGFyc2UgYnl0ZXMgYXMgdTgKIHB1YiBmbiByZWFkX3U4X2Zyb21fYnl0ZXMoYnVmOiAmW3U4XSwgaGVhZDogJm11dCB1c2l6ZSkgLT4gUmVzdWx0PHU4LCBBY29uZmlnU3RvcmFnZUVycm9yPiB7Ci0gICAgbGV0IHZhbCA9IHU4Ojpmcm9tX2xlX2J5dGVzKAotICAgICAgICBidWYuZ2V0KCpoZWFkLi4qaGVhZCArIDEpCi0gICAgICAgICAgICAub2tfb3IoQWNvbmZpZ1N0b3JhZ2VFcnJvcjo6Qnl0ZXNQYXJzZUZhaWwoYW55aG93ISgKLSAgICAgICAgICAgICAgICAiZmFpbCB0byBwYXJzZSB1OCBmcm9tIGJ5dGVzOiBhY2Nlc3Mgb3V0IG9mIGJvdW5kcyIKLSAgICAgICAgICAgICkpKT8KLSAgICAgICAgICAgIC50cnlfaW50bygpCi0gICAgICAgICAgICAubWFwX2Vycih8ZXJybXNnfCBCeXRlc1BhcnNlRmFpbChhbnlob3chKCJmYWlsIHRvIHBhcnNlIHU4IGZyb20gYnl0ZXM6IHt9IiwgZXJybXNnKSkpPywKLSAgICApOworICAgIGxldCB2YWwgPQorICAgICAgICB1ODo6ZnJvbV9sZV9ieXRlcyhidWZbKmhlYWQuLipoZWFkICsgMV0udHJ5X2ludG8oKS5tYXBfZXJyKHxlcnJtc2d8IHsKKyAgICAgICAgICAgIEJ5dGVzUGFyc2VGYWlsKGFueWhvdyEoImZhaWwgdG8gcGFyc2UgdTggZnJvbSBieXRlczoge30iLCBlcnJtc2cpKQorICAgICAgICB9KT8pOwogICAgICpoZWFkICs9IDE7CiAgICAgT2sodmFsKQogfQpAQCAtMjQ1LDE2ICsyNDEsMTAgQEAKICAgICBidWY6ICZbdThdLAogICAgIGhlYWQ6ICZtdXQgdXNpemUsCiApIC0+IFJlc3VsdDx1MTYsIEFjb25maWdTdG9yYWdlRXJyb3I+IHsKLSAgICBsZXQgdmFsID0gdTE2Ojpmcm9tX2xlX2J5dGVzKAotICAgICAgICBidWYuZ2V0KCpoZWFkLi4qaGVhZCArIDIpCi0gICAgICAgICAgICAub2tfb3IoQWNvbmZpZ1N0b3JhZ2VFcnJvcjo6Qnl0ZXNQYXJzZUZhaWwoYW55aG93ISgKLSAgICAgICAgICAgICAgICAiZmFpbCB0byBwYXJzZSB1MTYgZnJvbSBieXRlczogYWNjZXNzIG91dCBvZiBib3VuZHMiCi0gICAgICAgICAgICApKSk/Ci0gICAgICAgICAgICAudHJ5X2ludG8oKQotICAgICAgICAgICAgLm1hcF9lcnIofGVycm1zZ3wgewotICAgICAgICAgICAgICAgIEJ5dGVzUGFyc2VGYWlsKGFueWhvdyEoImZhaWwgdG8gcGFyc2UgdTE2IGZyb20gYnl0ZXM6IHt9IiwgZXJybXNnKSkKLSAgICAgICAgICAgIH0pPywKLSAgICApOworICAgIGxldCB2YWwgPQorICAgICAgICB1MTY6OmZyb21fbGVfYnl0ZXMoYnVmWypoZWFkLi4qaGVhZCArIDJdLnRyeV9pbnRvKCkubWFwX2Vycih8ZXJybXNnfCB7CisgICAgICAgICAgICBCeXRlc1BhcnNlRmFpbChhbnlob3chKCJmYWlsIHRvIHBhcnNlIHUxNiBmcm9tIGJ5dGVzOiB7fSIsIGVycm1zZykpCisgICAgICAgIH0pPyk7CiAgICAgKmhlYWQgKz0gMjsKICAgICBPayh2YWwpCiB9CkBAIC0yNjYsMzIgKzI1NiwyMCBAQAogCiAvLy8gUmVhZCBhbmQgcGFyc2UgYnl0ZXMgYXMgdTMyCiBwdWIgZm4gcmVhZF91MzJfZnJvbV9ieXRlcyhidWY6ICZbdThdLCBoZWFkOiAmbXV0IHVzaXplKSAtPiBSZXN1bHQ8dTMyLCBBY29uZmlnU3RvcmFnZUVycm9yPiB7Ci0gICAgbGV0IHZhbCA9IHUzMjo6ZnJvbV9sZV9ieXRlcygKLSAgICAgICAgYnVmLmdldCgqaGVhZC4uKmhlYWQgKyA0KQotICAgICAgICAgICAgLm9rX29yKEFjb25maWdTdG9yYWdlRXJyb3I6OkJ5dGVzUGFyc2VGYWlsKGFueWhvdyEoCi0gICAgICAgICAgICAgICAgImZhaWwgdG8gcGFyc2UgdTMyIGZyb20gYnl0ZXM6IGFjY2VzcyBvdXQgb2YgYm91bmRzIgotICAgICAgICAgICAgKSkpPwotICAgICAgICAgICAgLnRyeV9pbnRvKCkKLSAgICAgICAgICAgIC5tYXBfZXJyKHxlcnJtc2d8IHsKLSAgICAgICAgICAgICAgICBCeXRlc1BhcnNlRmFpbChhbnlob3chKCJmYWlsIHRvIHBhcnNlIHUzMiBmcm9tIGJ5dGVzOiB7fSIsIGVycm1zZykpCi0gICAgICAgICAgICB9KT8sCi0gICAgKTsKKyAgICBsZXQgdmFsID0KKyAgICAgICAgdTMyOjpmcm9tX2xlX2J5dGVzKGJ1ZlsqaGVhZC4uKmhlYWQgKyA0XS50cnlfaW50bygpLm1hcF9lcnIofGVycm1zZ3wgeworICAgICAgICAgICAgQnl0ZXNQYXJzZUZhaWwoYW55aG93ISgiZmFpbCB0byBwYXJzZSB1MzIgZnJvbSBieXRlczoge30iLCBlcnJtc2cpKQorICAgICAgICB9KT8pOwogICAgICpoZWFkICs9IDQ7CiAgICAgT2sodmFsKQogfQogCiAvLyBSZWFkIGFuZCBwYXJzZSBieXRlcyBhcyB1NjQKIHB1YiBmbiByZWFkX3U2NF9mcm9tX2J5dGVzKGJ1ZjogJlt1OF0sIGhlYWQ6ICZtdXQgdXNpemUpIC0+IFJlc3VsdDx1NjQsIEFjb25maWdTdG9yYWdlRXJyb3I+IHsKLSAgICBsZXQgdmFsID0gdTY0Ojpmcm9tX2xlX2J5dGVzKAotICAgICAgICBidWYuZ2V0KCpoZWFkLi4qaGVhZCArIDgpCi0gICAgICAgICAgICAub2tfb3IoQWNvbmZpZ1N0b3JhZ2VFcnJvcjo6Qnl0ZXNQYXJzZUZhaWwoYW55aG93ISgKLSAgICAgICAgICAgICAgICAiZmFpbCB0byBwYXJzZSB1NjQgZnJvbSBieXRlczogYWNjZXNzIG91dCBvZiBib3VuZHMiCi0gICAgICAgICAgICApKSk/Ci0gICAgICAgICAgICAudHJ5X2ludG8oKQotICAgICAgICAgICAgLm1hcF9lcnIofGVycm1zZ3wgewotICAgICAgICAgICAgICAgIEJ5dGVzUGFyc2VGYWlsKGFueWhvdyEoImZhaWwgdG8gcGFyc2UgdTY0IGZyb20gYnl0ZXM6IHt9IiwgZXJybXNnKSkKLSAgICAgICAgICAgIH0pPywKLSAgICApOworICAgIGxldCB2YWwgPQorICAgICAgICB1NjQ6OmZyb21fbGVfYnl0ZXMoYnVmWypoZWFkLi4qaGVhZCArIDhdLnRyeV9pbnRvKCkubWFwX2Vycih8ZXJybXNnfCB7CisgICAgICAgICAgICBCeXRlc1BhcnNlRmFpbChhbnlob3chKCJmYWlsIHRvIHBhcnNlIHU2NCBmcm9tIGJ5dGVzOiB7fSIsIGVycm1zZykpCisgICAgICAgIH0pPyk7CiAgICAgKmhlYWQgKz0gODsKICAgICBPayh2YWwpCiB9CkBAIC0zMDIsMjEgKzI4MCw4IEBACiAgICAgaGVhZDogJm11dCB1c2l6ZSwKICkgLT4gUmVzdWx0PFN0cmluZywgQWNvbmZpZ1N0b3JhZ2VFcnJvcj4gewogICAgIGxldCBudW1fYnl0ZXMgPSByZWFkX3UzMl9mcm9tX2J5dGVzKGJ1ZiwgaGVhZCk/IGFzIHVzaXplOwotICAgIC8vIFRPRE8ob3BnKTogRG9jdW1lbnQgdGhpcyBsaW1pdGF0aW9uIGFuZCBjaGVjayBpdCB3aGVuIGNyZWF0aW5nIGZpbGVzLgotICAgIGlmIG51bV9ieXRlcyA+IDEwMjQgewotICAgICAgICByZXR1cm4gRXJyKEFjb25maWdTdG9yYWdlRXJyb3I6OkJ5dGVzUGFyc2VGYWlsKGFueWhvdyEoCi0gICAgICAgICAgICAiZmFpbCB0byBwYXJzZSBzdHJpbmcgZnJvbSBieXRlcywgc3RyaW5nIGlzIHRvbyBsb25nIChmb3VuZCB7fSwgbWF4IGlzIDEwMjQpIiwKLSAgICAgICAgICAgIG51bV9ieXRlcwotICAgICAgICApKSk7Ci0gICAgfQotICAgIGxldCB2YWwgPSBTdHJpbmc6OmZyb21fdXRmOCgKLSAgICAgICAgYnVmLmdldCgqaGVhZC4uKmhlYWQgKyBudW1fYnl0ZXMpCi0gICAgICAgICAgICAub2tfb3IoQWNvbmZpZ1N0b3JhZ2VFcnJvcjo6Qnl0ZXNQYXJzZUZhaWwoYW55aG93ISgKLSAgICAgICAgICAgICAgICAiZmFpbCB0byBwYXJzZSBzdHJpbmcgZnJvbSBieXRlczogYWNjZXNzIG91dCBvZiBib3VuZHMiCi0gICAgICAgICAgICApKSk/Ci0gICAgICAgICAgICAudG9fdmVjKCksCi0gICAgKQotICAgIC5tYXBfZXJyKHxlcnJtc2d8IEJ5dGVzUGFyc2VGYWlsKGFueWhvdyEoImZhaWwgdG8gcGFyc2Ugc3RyaW5nIGZyb20gYnl0ZXM6IHt9IiwgZXJybXNnKSkpPzsKKyAgICBsZXQgdmFsID0gU3RyaW5nOjpmcm9tX3V0ZjgoYnVmWypoZWFkLi4qaGVhZCArIG51bV9ieXRlc10udG9fdmVjKCkpCisgICAgICAgIC5tYXBfZXJyKHxlcnJtc2d8IEJ5dGVzUGFyc2VGYWlsKGFueWhvdyEoImZhaWwgdG8gcGFyc2Ugc3RyaW5nIGZyb20gYnl0ZXM6IHt9IiwgZXJybXNnKSkpPzsKICAgICAqaGVhZCArPSBudW1fYnl0ZXM7CiAgICAgT2sodmFsKQogfQpAQCAtNTY4LDQxICs1MzMsMTggQEAKICAgICB9OwogCiAgICAgI1t0ZXN0XQotICAgIGZuIHRlc3RfbGlzdF9mbGFnc193aXRoX21pc3NpbmdfZmlsZXNfZXJyb3IoKSB7Ci0gICAgICAgIGxldCBmbGFnX2xpc3RfZXJyb3IgPSBsaXN0X2ZsYWdzKCJkb2VzIiwgIm5vdCIsICJleGlzdCIpLnVud3JhcF9lcnIoKTsKLSAgICAgICAgYXNzZXJ0X2VxISgKLSAgICAgICAgICAgIGZvcm1hdCEoIns6P30iLCBmbGFnX2xpc3RfZXJyb3IpLAotICAgICAgICAgICAgZm9ybWF0ISgKLSAgICAgICAgICAgICAgICAiRmlsZVJlYWRGYWlsKEZhaWxlZCB0byBvcGVuIGZpbGUgZG9lczogTm8gc3VjaCBmaWxlIG9yIGRpcmVjdG9yeSAob3MgZXJyb3IgMikpIgotICAgICAgICAgICAgKQotICAgICAgICApOwotICAgIH0KLQotICAgICNbdGVzdF0KLSAgICBmbiB0ZXN0X2xpc3RfZmxhZ3Nfd2l0aF9pbnZhbGlkX2ZpbGVzX2Vycm9yKCkgewotICAgICAgICBsZXQgaW52YWxpZF9ieXRlczogW3U4OyAzXSA9IFswOyAzXTsKLSAgICAgICAgbGV0IHBhY2thZ2VfdGFibGUgPSB3cml0ZV9ieXRlc190b190ZW1wX2ZpbGUoJmludmFsaWRfYnl0ZXMpLnVud3JhcCgpOwotICAgICAgICBsZXQgZmxhZ190YWJsZSA9IHdyaXRlX2J5dGVzX3RvX3RlbXBfZmlsZSgmaW52YWxpZF9ieXRlcykudW53cmFwKCk7Ci0gICAgICAgIGxldCBmbGFnX3ZhbHVlX2xpc3QgPSB3cml0ZV9ieXRlc190b190ZW1wX2ZpbGUoJmludmFsaWRfYnl0ZXMpLnVud3JhcCgpOwotICAgICAgICBsZXQgcGFja2FnZV90YWJsZV9wYXRoID0gcGFja2FnZV90YWJsZS5wYXRoKCkuZGlzcGxheSgpLnRvX3N0cmluZygpOwotICAgICAgICBsZXQgZmxhZ190YWJsZV9wYXRoID0gZmxhZ190YWJsZS5wYXRoKCkuZGlzcGxheSgpLnRvX3N0cmluZygpOwotICAgICAgICBsZXQgZmxhZ192YWx1ZV9saXN0X3BhdGggPSBmbGFnX3ZhbHVlX2xpc3QucGF0aCgpLmRpc3BsYXkoKS50b19zdHJpbmcoKTsKLSAgICAgICAgbGV0IGZsYWdfbGlzdF9lcnJvciA9Ci0gICAgICAgICAgICBsaXN0X2ZsYWdzKCZwYWNrYWdlX3RhYmxlX3BhdGgsICZmbGFnX3RhYmxlX3BhdGgsICZmbGFnX3ZhbHVlX2xpc3RfcGF0aCkudW53cmFwX2VycigpOwotICAgICAgICBhc3NlcnRfZXEhKAotICAgICAgICAgICAgZm9ybWF0ISgiezo/fSIsIGZsYWdfbGlzdF9lcnJvciksCi0gICAgICAgICAgICBmb3JtYXQhKCJCeXRlc1BhcnNlRmFpbChmYWlsIHRvIHBhcnNlIHUzMiBmcm9tIGJ5dGVzOiBhY2Nlc3Mgb3V0IG9mIGJvdW5kcykiKQotICAgICAgICApOwotICAgIH0KLQotICAgICNbdGVzdF0KICAgICAvLyB0aGlzIHRlc3QgcG9pbnQgbG9ja3MgZG93biB0aGUgZmxhZyBsaXN0IGFwaQogICAgIGZuIHRlc3RfbGlzdF9mbGFnKCkgewogICAgICAgICBsZXQgcGFja2FnZV90YWJsZSA9Ci0gICAgICAgICAgICB3cml0ZV9ieXRlc190b190ZW1wX2ZpbGUoJmNyZWF0ZV90ZXN0X3BhY2thZ2VfdGFibGUoKS5pbnRvX2J5dGVzKCkpLnVud3JhcCgpOwotICAgICAgICBsZXQgZmxhZ190YWJsZSA9IHdyaXRlX2J5dGVzX3RvX3RlbXBfZmlsZSgmY3JlYXRlX3Rlc3RfZmxhZ190YWJsZSgpLmludG9fYnl0ZXMoKSkudW53cmFwKCk7Ci0gICAgICAgIGxldCBmbGFnX3ZhbHVlX2xpc3QgPQotICAgICAgICAgICAgd3JpdGVfYnl0ZXNfdG9fdGVtcF9maWxlKCZjcmVhdGVfdGVzdF9mbGFnX3ZhbHVlX2xpc3QoKS5pbnRvX2J5dGVzKCkpLnVud3JhcCgpOworICAgICAgICAgICAgd3JpdGVfYnl0ZXNfdG9fdGVtcF9maWxlKCZjcmVhdGVfdGVzdF9wYWNrYWdlX3RhYmxlKERFRkFVTFRfRklMRV9WRVJTSU9OKS5pbnRvX2J5dGVzKCkpCisgICAgICAgICAgICAgICAgLnVud3JhcCgpOworICAgICAgICBsZXQgZmxhZ190YWJsZSA9CisgICAgICAgICAgICB3cml0ZV9ieXRlc190b190ZW1wX2ZpbGUoJmNyZWF0ZV90ZXN0X2ZsYWdfdGFibGUoREVGQVVMVF9GSUxFX1ZFUlNJT04pLmludG9fYnl0ZXMoKSkKKyAgICAgICAgICAgICAgICAudW53cmFwKCk7CisgICAgICAgIGxldCBmbGFnX3ZhbHVlX2xpc3QgPSB3cml0ZV9ieXRlc190b190ZW1wX2ZpbGUoCisgICAgICAgICAgICAmY3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0KERFRkFVTFRfRklMRV9WRVJTSU9OKS5pbnRvX2J5dGVzKCksCisgICAgICAgICkKKyAgICAgICAgLnVud3JhcCgpOwogCiAgICAgICAgIGxldCBwYWNrYWdlX3RhYmxlX3BhdGggPSBwYWNrYWdlX3RhYmxlLnBhdGgoKS5kaXNwbGF5KCkudG9fc3RyaW5nKCk7CiAgICAgICAgIGxldCBmbGFnX3RhYmxlX3BhdGggPSBmbGFnX3RhYmxlLnBhdGgoKS5kaXNwbGF5KCkudG9fc3RyaW5nKCk7CkBAIC02NjcsMTIgKzYwOSwxOSBAQAogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIHRoZSBmbGFnIGxpc3Qgd2l0aCBpbmZvIGFwaQogICAgIGZuIHRlc3RfbGlzdF9mbGFnX3dpdGhfaW5mbygpIHsKICAgICAgICAgbGV0IHBhY2thZ2VfdGFibGUgPQotICAgICAgICAgICAgd3JpdGVfYnl0ZXNfdG9fdGVtcF9maWxlKCZjcmVhdGVfdGVzdF9wYWNrYWdlX3RhYmxlKCkuaW50b19ieXRlcygpKS51bndyYXAoKTsKLSAgICAgICAgbGV0IGZsYWdfdGFibGUgPSB3cml0ZV9ieXRlc190b190ZW1wX2ZpbGUoJmNyZWF0ZV90ZXN0X2ZsYWdfdGFibGUoKS5pbnRvX2J5dGVzKCkpLnVud3JhcCgpOwotICAgICAgICBsZXQgZmxhZ192YWx1ZV9saXN0ID0KLSAgICAgICAgICAgIHdyaXRlX2J5dGVzX3RvX3RlbXBfZmlsZSgmY3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0KCkuaW50b19ieXRlcygpKS51bndyYXAoKTsKLSAgICAgICAgbGV0IGZsYWdfaW5mb19saXN0ID0KLSAgICAgICAgICAgIHdyaXRlX2J5dGVzX3RvX3RlbXBfZmlsZSgmY3JlYXRlX3Rlc3RfZmxhZ19pbmZvX2xpc3QoKS5pbnRvX2J5dGVzKCkpLnVud3JhcCgpOworICAgICAgICAgICAgd3JpdGVfYnl0ZXNfdG9fdGVtcF9maWxlKCZjcmVhdGVfdGVzdF9wYWNrYWdlX3RhYmxlKERFRkFVTFRfRklMRV9WRVJTSU9OKS5pbnRvX2J5dGVzKCkpCisgICAgICAgICAgICAgICAgLnVud3JhcCgpOworICAgICAgICBsZXQgZmxhZ190YWJsZSA9CisgICAgICAgICAgICB3cml0ZV9ieXRlc190b190ZW1wX2ZpbGUoJmNyZWF0ZV90ZXN0X2ZsYWdfdGFibGUoREVGQVVMVF9GSUxFX1ZFUlNJT04pLmludG9fYnl0ZXMoKSkKKyAgICAgICAgICAgICAgICAudW53cmFwKCk7CisgICAgICAgIGxldCBmbGFnX3ZhbHVlX2xpc3QgPSB3cml0ZV9ieXRlc190b190ZW1wX2ZpbGUoCisgICAgICAgICAgICAmY3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0KERFRkFVTFRfRklMRV9WRVJTSU9OKS5pbnRvX2J5dGVzKCksCisgICAgICAgICkKKyAgICAgICAgLnVud3JhcCgpOworICAgICAgICBsZXQgZmxhZ19pbmZvX2xpc3QgPSB3cml0ZV9ieXRlc190b190ZW1wX2ZpbGUoCisgICAgICAgICAgICAmY3JlYXRlX3Rlc3RfZmxhZ19pbmZvX2xpc3QoREVGQVVMVF9GSUxFX1ZFUlNJT04pLmludG9fYnl0ZXMoKSwKKyAgICAgICAgKQorICAgICAgICAudW53cmFwKCk7CiAKICAgICAgICAgbGV0IHBhY2thZ2VfdGFibGVfcGF0aCA9IHBhY2thZ2VfdGFibGUucGF0aCgpLmRpc3BsYXkoKS50b19zdHJpbmcoKTsKICAgICAgICAgbGV0IGZsYWdfdGFibGVfcGF0aCA9IGZsYWdfdGFibGUucGF0aCgpLmRpc3BsYXkoKS50b19zdHJpbmcoKTsKZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvc3JjL3BhY2thZ2VfdGFibGUucnMgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3NyYy9wYWNrYWdlX3RhYmxlLnJzCmluZGV4IGFmMzlmYmMuLjIxMzU3YzcgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvc3JjL3BhY2thZ2VfdGFibGUucnMKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS9zcmMvcGFja2FnZV90YWJsZS5ycwpAQCAtMTAwLDYgKzEwMCw3IEBACiBwdWIgc3RydWN0IFBhY2thZ2VUYWJsZU5vZGUgewogICAgIHB1YiBwYWNrYWdlX25hbWU6IFN0cmluZywKICAgICBwdWIgcGFja2FnZV9pZDogdTMyLAorICAgIHB1YiBmaW5nZXJwcmludDogdTY0LAogICAgIC8vIFRoZSBpbmRleCBvZiB0aGUgZmlyc3QgYm9vbGVhbiBmbGFnIGluIHRoaXMgYWNvbmZpZyBwYWNrYWdlIGFtb25nIGFsbCBib29sZWFuCiAgICAgLy8gZmxhZ3MgaW4gdGhpcyBjb250YWluZXIuCiAgICAgcHViIGJvb2xlYW5fc3RhcnRfaW5kZXg6IHUzMiwKQEAgLTExMSw4ICsxMTIsMTIgQEAKICAgICBmbiBmbXQoJnNlbGYsIGY6ICZtdXQgZm10OjpGb3JtYXR0ZXIpIC0+IGZtdDo6UmVzdWx0IHsKICAgICAgICAgd3JpdGVsbiEoCiAgICAgICAgICAgICBmLAotICAgICAgICAgICAgIlBhY2thZ2U6IHt9LCBJZDoge30sIEJvb2xlYW4gZmxhZyBzdGFydCBpbmRleDoge30sIE5leHQ6IHs6P30iLAotICAgICAgICAgICAgc2VsZi5wYWNrYWdlX25hbWUsIHNlbGYucGFja2FnZV9pZCwgc2VsZi5ib29sZWFuX3N0YXJ0X2luZGV4LCBzZWxmLm5leHRfb2Zmc2V0CisgICAgICAgICAgICAiUGFja2FnZToge30sIElkOiB7fSwgRmluZ2VycHJpbnQ6IHt9LCBCb29sZWFuIGZsYWcgc3RhcnQgaW5kZXg6IHt9LCBOZXh0OiB7Oj99IiwKKyAgICAgICAgICAgIHNlbGYucGFja2FnZV9uYW1lLAorICAgICAgICAgICAgc2VsZi5wYWNrYWdlX2lkLAorICAgICAgICAgICAgc2VsZi5maW5nZXJwcmludCwKKyAgICAgICAgICAgIHNlbGYuYm9vbGVhbl9zdGFydF9pbmRleCwKKyAgICAgICAgICAgIHNlbGYubmV4dF9vZmZzZXQKICAgICAgICAgKT87CiAgICAgICAgIE9rKCgpKQogICAgIH0KQEAgLTE0Niw5ICsxNTEsNyBAQAogICAgICAgICByZXN1bHQuZXh0ZW5kX2Zyb21fc2xpY2UoJihuYW1lX2J5dGVzLmxlbigpIGFzIHUzMikudG9fbGVfYnl0ZXMoKSk7CiAgICAgICAgIHJlc3VsdC5leHRlbmRfZnJvbV9zbGljZShuYW1lX2J5dGVzKTsKICAgICAgICAgcmVzdWx0LmV4dGVuZF9mcm9tX3NsaWNlKCZzZWxmLnBhY2thZ2VfaWQudG9fbGVfYnl0ZXMoKSk7Ci0gICAgICAgIC8vIFYyIHN0b3JhZ2UgZmlsZXMgaGF2ZSBhIGZpbmdlcnByaW50LiBDdXJyZW50IHN0cnVjdCAodjEpIGRvZXMgbm90LCBzbwotICAgICAgICAvLyB3ZSB3cml0ZSAwLgotICAgICAgICByZXN1bHQuZXh0ZW5kX2Zyb21fc2xpY2UoJjB1NjQudG9fbGVfYnl0ZXMoKSk7CisgICAgICAgIHJlc3VsdC5leHRlbmRfZnJvbV9zbGljZSgmc2VsZi5maW5nZXJwcmludC50b19sZV9ieXRlcygpKTsKICAgICAgICAgcmVzdWx0LmV4dGVuZF9mcm9tX3NsaWNlKCZzZWxmLmJvb2xlYW5fc3RhcnRfaW5kZXgudG9fbGVfYnl0ZXMoKSk7CiAgICAgICAgIHJlc3VsdC5leHRlbmRfZnJvbV9zbGljZSgmc2VsZi5uZXh0X29mZnNldC51bndyYXBfb3IoMCkudG9fbGVfYnl0ZXMoKSk7CiAgICAgICAgIHJlc3VsdApAQCAtMTcyLDEzICsxNzUsMTUgQEAKICAgICAgICAgbGV0IG11dCBoZWFkID0gMDsKICAgICAgICAgbGV0IHBhY2thZ2VfbmFtZSA9IHJlYWRfc3RyX2Zyb21fYnl0ZXMoYnl0ZXMsICZtdXQgaGVhZCk/OwogICAgICAgICBsZXQgcGFja2FnZV9pZCA9IHJlYWRfdTMyX2Zyb21fYnl0ZXMoYnl0ZXMsICZtdXQgaGVhZCk/OworICAgICAgICAvLyB2MSBkb2VzIG5vdCBoYXZlIGZpbmdlcnByaW50LCBzbyBqdXN0IHNldCB0byAwLgorICAgICAgICBsZXQgZmluZ2VycHJpbnQ6IHU2NCA9IDA7CiAgICAgICAgIGxldCBib29sZWFuX3N0YXJ0X2luZGV4ID0gcmVhZF91MzJfZnJvbV9ieXRlcyhieXRlcywgJm11dCBoZWFkKT87CiAgICAgICAgIGxldCBuZXh0X29mZnNldCA9IG1hdGNoIHJlYWRfdTMyX2Zyb21fYnl0ZXMoYnl0ZXMsICZtdXQgaGVhZCk/IHsKICAgICAgICAgICAgIDAgPT4gTm9uZSwKICAgICAgICAgICAgIHZhbCA9PiBTb21lKHZhbCksCiAgICAgICAgIH07CiAKLSAgICAgICAgbGV0IG5vZGUgPSBTZWxmIHsgcGFja2FnZV9uYW1lLCBwYWNrYWdlX2lkLCBib29sZWFuX3N0YXJ0X2luZGV4LCBuZXh0X29mZnNldCB9OworICAgICAgICBsZXQgbm9kZSA9IFNlbGYgeyBwYWNrYWdlX25hbWUsIHBhY2thZ2VfaWQsIGZpbmdlcnByaW50LCBib29sZWFuX3N0YXJ0X2luZGV4LCBuZXh0X29mZnNldCB9OwogICAgICAgICBPayhub2RlKQogICAgIH0KIApAQCAtMTg2LDE4ICsxOTEsMTQgQEAKICAgICAgICAgbGV0IG11dCBoZWFkID0gMDsKICAgICAgICAgbGV0IHBhY2thZ2VfbmFtZSA9IHJlYWRfc3RyX2Zyb21fYnl0ZXMoYnl0ZXMsICZtdXQgaGVhZCk/OwogICAgICAgICBsZXQgcGFja2FnZV9pZCA9IHJlYWRfdTMyX2Zyb21fYnl0ZXMoYnl0ZXMsICZtdXQgaGVhZCk/OwotCi0gICAgICAgIC8vIEZpbmdlcnByaW50IGlzIHVudXNlZCBpbiB0aGUgY3VycmVudCBzdHJ1Y3QgKHYxKSwgYnV0IHdlIG5lZWQgdG8gcmVhZAotICAgICAgICAvLyB0aGUgYnl0ZXMgaWYgdGhlIHN0b3JhZ2UgZmlsZSB0eXBlIGlzIHYyIG9yIGVsc2UgdGhlIHN1YnNlcXVlbnQKLSAgICAgICAgLy8gZmllbGRzIHdpbGwgYmUgaW5hY2N1cmF0ZS4KLSAgICAgICAgbGV0IF9maW5nZXJwcmludCA9IHJlYWRfdTY0X2Zyb21fYnl0ZXMoYnl0ZXMsICZtdXQgaGVhZCk/OworICAgICAgICBsZXQgZmluZ2VycHJpbnQgPSByZWFkX3U2NF9mcm9tX2J5dGVzKGJ5dGVzLCAmbXV0IGhlYWQpPzsKICAgICAgICAgbGV0IGJvb2xlYW5fc3RhcnRfaW5kZXggPSByZWFkX3UzMl9mcm9tX2J5dGVzKGJ5dGVzLCAmbXV0IGhlYWQpPzsKICAgICAgICAgbGV0IG5leHRfb2Zmc2V0ID0gbWF0Y2ggcmVhZF91MzJfZnJvbV9ieXRlcyhieXRlcywgJm11dCBoZWFkKT8gewogICAgICAgICAgICAgMCA9PiBOb25lLAogICAgICAgICAgICAgdmFsID0+IFNvbWUodmFsKSwKICAgICAgICAgfTsKIAotICAgICAgICBsZXQgbm9kZSA9IFNlbGYgeyBwYWNrYWdlX25hbWUsIHBhY2thZ2VfaWQsIGJvb2xlYW5fc3RhcnRfaW5kZXgsIG5leHRfb2Zmc2V0IH07CisgICAgICAgIGxldCBub2RlID0gU2VsZiB7IHBhY2thZ2VfbmFtZSwgcGFja2FnZV9pZCwgZmluZ2VycHJpbnQsIGJvb2xlYW5fc3RhcnRfaW5kZXgsIG5leHRfb2Zmc2V0IH07CiAgICAgICAgIE9rKG5vZGUpCiAgICAgfQogCkBAIC0yODEsMTMgKzI4MiwzNyBAQAogI1tjZmcodGVzdCldCiBtb2QgdGVzdHMgewogICAgIHVzZSBzdXBlcjo6KjsKLSAgICB1c2UgY3JhdGU6OnJlYWRfdTMyX2Zyb21fc3RhcnRfb2ZfYnl0ZXM7Ci0gICAgdXNlIGNyYXRlOjp7dGVzdF91dGlsczo6Y3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZSwgREVGQVVMVF9GSUxFX1ZFUlNJT059OworICAgIHVzZSBjcmF0ZTo6dGVzdF91dGlsczo6Y3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZTsKKyAgICB1c2UgY3JhdGU6OntyZWFkX3UzMl9mcm9tX3N0YXJ0X29mX2J5dGVzLCBERUZBVUxUX0ZJTEVfVkVSU0lPTiwgTUFYX1NVUFBPUlRFRF9GSUxFX1ZFUlNJT059OwogCiAgICAgI1t0ZXN0XQogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIHRoZSB0YWJsZSBzZXJpYWxpemF0aW9uCi0gICAgZm4gdGVzdF9zZXJpYWxpemF0aW9uKCkgewotICAgICAgICBsZXQgcGFja2FnZV90YWJsZSA9IGNyZWF0ZV90ZXN0X3BhY2thZ2VfdGFibGUoKTsKKyAgICAvLyBUT0RPOiBiLzM3NjEwODI2OCAtIFVzZSBwYXJhbWV0ZXJpemVkIHRlc3RzLgorICAgIGZuIHRlc3Rfc2VyaWFsaXphdGlvbl9kZWZhdWx0KCkgeworICAgICAgICBsZXQgcGFja2FnZV90YWJsZSA9IGNyZWF0ZV90ZXN0X3BhY2thZ2VfdGFibGUoREVGQVVMVF9GSUxFX1ZFUlNJT04pOworICAgICAgICBsZXQgaGVhZGVyOiAmUGFja2FnZVRhYmxlSGVhZGVyID0gJnBhY2thZ2VfdGFibGUuaGVhZGVyOworICAgICAgICBsZXQgcmVpbnRlcnByZXRlZF9oZWFkZXIgPSBQYWNrYWdlVGFibGVIZWFkZXI6OmZyb21fYnl0ZXMoJmhlYWRlci5pbnRvX2J5dGVzKCkpOworICAgICAgICBhc3NlcnQhKHJlaW50ZXJwcmV0ZWRfaGVhZGVyLmlzX29rKCkpOworICAgICAgICBhc3NlcnRfZXEhKGhlYWRlciwgJnJlaW50ZXJwcmV0ZWRfaGVhZGVyLnVud3JhcCgpKTsKKworICAgICAgICBsZXQgbm9kZXM6ICZWZWM8UGFja2FnZVRhYmxlTm9kZT4gPSAmcGFja2FnZV90YWJsZS5ub2RlczsKKyAgICAgICAgZm9yIG5vZGUgaW4gbm9kZXMuaXRlcigpIHsKKyAgICAgICAgICAgIGxldCByZWludGVycHJldGVkX25vZGUgPQorICAgICAgICAgICAgICAgIFBhY2thZ2VUYWJsZU5vZGU6OmZyb21fYnl0ZXMoJm5vZGUuaW50b19ieXRlcyhoZWFkZXIudmVyc2lvbiksIGhlYWRlci52ZXJzaW9uKQorICAgICAgICAgICAgICAgICAgICAudW53cmFwKCk7CisgICAgICAgICAgICBhc3NlcnRfZXEhKG5vZGUsICZyZWludGVycHJldGVkX25vZGUpOworICAgICAgICB9CisKKyAgICAgICAgbGV0IHBhY2thZ2VfdGFibGVfYnl0ZXMgPSBwYWNrYWdlX3RhYmxlLmludG9fYnl0ZXMoKTsKKyAgICAgICAgbGV0IHJlaW50ZXJwcmV0ZWRfdGFibGUgPSBQYWNrYWdlVGFibGU6OmZyb21fYnl0ZXMoJnBhY2thZ2VfdGFibGVfYnl0ZXMpOworICAgICAgICBhc3NlcnQhKHJlaW50ZXJwcmV0ZWRfdGFibGUuaXNfb2soKSk7CisgICAgICAgIGFzc2VydF9lcSEoJnBhY2thZ2VfdGFibGUsICZyZWludGVycHJldGVkX3RhYmxlLnVud3JhcCgpKTsKKyAgICAgICAgYXNzZXJ0X2VxIShwYWNrYWdlX3RhYmxlX2J5dGVzLmxlbigpIGFzIHUzMiwgaGVhZGVyLmZpbGVfc2l6ZSk7CisgICAgfQorCisgICAgI1t0ZXN0XQorICAgIGZuIHRlc3Rfc2VyaWFsaXphdGlvbl9tYXgoKSB7CisgICAgICAgIGxldCBwYWNrYWdlX3RhYmxlID0gY3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZShNQVhfU1VQUE9SVEVEX0ZJTEVfVkVSU0lPTik7CiAgICAgICAgIGxldCBoZWFkZXI6ICZQYWNrYWdlVGFibGVIZWFkZXIgPSAmcGFja2FnZV90YWJsZS5oZWFkZXI7CiAgICAgICAgIGxldCByZWludGVycHJldGVkX2hlYWRlciA9IFBhY2thZ2VUYWJsZUhlYWRlcjo6ZnJvbV9ieXRlcygmaGVhZGVyLmludG9fYnl0ZXMoKSk7CiAgICAgICAgIGFzc2VydCEocmVpbnRlcnByZXRlZF9oZWFkZXIuaXNfb2soKSk7CkBAIC0zMTIsNDQgKzMzNywzNiBAQAogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIHRoYXQgdmVyc2lvbiBudW1iZXIgc2hvdWxkIGJlIGF0IHRoZSB0b3Agb2Ygc2VyaWFsaXplZAogICAgIC8vIGJ5dGVzCiAgICAgZm4gdGVzdF92ZXJzaW9uX251bWJlcigpIHsKLSAgICAgICAgbGV0IHBhY2thZ2VfdGFibGUgPSBjcmVhdGVfdGVzdF9wYWNrYWdlX3RhYmxlKCk7CisgICAgICAgIGxldCBwYWNrYWdlX3RhYmxlID0gY3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZShERUZBVUxUX0ZJTEVfVkVSU0lPTik7CiAgICAgICAgIGxldCBieXRlcyA9ICZwYWNrYWdlX3RhYmxlLmludG9fYnl0ZXMoKTsKLSAgICAgICAgbGV0IHZlcnNpb24gPSByZWFkX3UzMl9mcm9tX3N0YXJ0X29mX2J5dGVzKGJ5dGVzKS51bndyYXAoKTsKLSAgICAgICAgYXNzZXJ0X2VxISh2ZXJzaW9uLCBERUZBVUxUX0ZJTEVfVkVSU0lPTik7CisgICAgICAgIGxldCB1bnBhY2tlZF92ZXJzaW9uID0gcmVhZF91MzJfZnJvbV9zdGFydF9vZl9ieXRlcyhieXRlcykudW53cmFwKCk7CisgICAgICAgIGFzc2VydF9lcSEodW5wYWNrZWRfdmVyc2lvbiwgREVGQVVMVF9GSUxFX1ZFUlNJT04pOwogICAgIH0KIAogICAgICNbdGVzdF0KLSAgICBmbiB0ZXN0X3JvdW5kX3RyaXBfdjEoKSB7Ci0gICAgICAgIGxldCB0YWJsZV92MTogUGFja2FnZVRhYmxlID0gY3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZSgpOwotICAgICAgICBsZXQgdGFibGVfYnl0ZXNfdjEgPSB0YWJsZV92MS5pbnRvX2J5dGVzKCk7CisgICAgZm4gdGVzdF9yb3VuZF90cmlwX2RlZmF1bHQoKSB7CisgICAgICAgIGxldCB0YWJsZTogUGFja2FnZVRhYmxlID0gY3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZShERUZBVUxUX0ZJTEVfVkVSU0lPTik7CisgICAgICAgIGxldCB0YWJsZV9ieXRlcyA9IHRhYmxlLmludG9fYnl0ZXMoKTsKIAotICAgICAgICAvLyBXaWxsIGF1dG9tYXRpY2FsbHkgcmVhZCBmcm9tIHZlcnNpb24gMiBhcyB0aGUgdmVyc2lvbiBjb2RlIGlzIGVuY29kZWQKLSAgICAgICAgLy8gaW50byB0aGUgYnl0ZXMuCi0gICAgICAgIGxldCByZWludGVycHJldGVkX3RhYmxlID0gUGFja2FnZVRhYmxlOjpmcm9tX2J5dGVzKCZ0YWJsZV9ieXRlc192MSkudW53cmFwKCk7CisgICAgICAgIGxldCByZWludGVycHJldGVkX3RhYmxlID0gUGFja2FnZVRhYmxlOjpmcm9tX2J5dGVzKCZ0YWJsZV9ieXRlcykudW53cmFwKCk7CiAKLSAgICAgICAgYXNzZXJ0X2VxISh0YWJsZV92MSwgcmVpbnRlcnByZXRlZF90YWJsZSk7CisgICAgICAgIGFzc2VydF9lcSEodGFibGUsIHJlaW50ZXJwcmV0ZWRfdGFibGUpOwogICAgIH0KIAogICAgICNbdGVzdF0KLSAgICBmbiB0ZXN0X3JvdW5kX3RyaXBfdjIoKSB7Ci0gICAgICAgIC8vIEhhdmUgdG8gZmFrZSB2MiBiZWNhdXNlIHRob3VnaCB3ZSB3aWxsIHNldCB0aGUgdmVyc2lvbiB0byB2MgotICAgICAgICAvLyBhbmQgd3JpdGUgdGhlIGJ5dGVzIGFzIHYyLCB3ZSBkb24ndCBoYXZlIHRoZSBhYmlsaXR5IHRvIGFjdHVhbGx5IHNldAotICAgICAgICAvLyB0aGUgZmluZ2VycHJpbnQgeWV0LgotICAgICAgICBsZXQgbXV0IGZha2VfdGFibGVfdjIgPSBjcmVhdGVfdGVzdF9wYWNrYWdlX3RhYmxlKCk7Ci0gICAgICAgIGZha2VfdGFibGVfdjIuaGVhZGVyLnZlcnNpb24gPSAyOwotICAgICAgICBsZXQgdGFibGVfYnl0ZXNfdjIgPSBmYWtlX3RhYmxlX3YyLmludG9fYnl0ZXMoKTsKKyAgICBmbiB0ZXN0X3JvdW5kX3RyaXBfbWF4KCkgeworICAgICAgICBsZXQgdGFibGU6IFBhY2thZ2VUYWJsZSA9IGNyZWF0ZV90ZXN0X3BhY2thZ2VfdGFibGUoTUFYX1NVUFBPUlRFRF9GSUxFX1ZFUlNJT04pOworICAgICAgICBsZXQgdGFibGVfYnl0ZXMgPSB0YWJsZS5pbnRvX2J5dGVzKCk7CiAKLSAgICAgICAgLy8gV2lsbCBhdXRvbWF0aWNhbGx5IHJlYWQgZnJvbSB2ZXJzaW9uIDIgYXMgdGhlIHZlcnNpb24gY29kZSBpcyBlbmNvZGVkCi0gICAgICAgIC8vIGludG8gdGhlIGJ5dGVzLgotICAgICAgICBsZXQgcmVpbnRlcnByZXRlZF90YWJsZSA9IFBhY2thZ2VUYWJsZTo6ZnJvbV9ieXRlcygmdGFibGVfYnl0ZXNfdjIpLnVud3JhcCgpOworICAgICAgICBsZXQgcmVpbnRlcnByZXRlZF90YWJsZSA9IFBhY2thZ2VUYWJsZTo6ZnJvbV9ieXRlcygmdGFibGVfYnl0ZXMpLnVud3JhcCgpOwogCi0gICAgICAgIGFzc2VydF9lcSEoZmFrZV90YWJsZV92MiwgcmVpbnRlcnByZXRlZF90YWJsZSk7CisgICAgICAgIGFzc2VydF9lcSEodGFibGUsIHJlaW50ZXJwcmV0ZWRfdGFibGUpOwogICAgIH0KIAogICAgICNbdGVzdF0KICAgICAvLyB0aGlzIHRlc3QgcG9pbnQgbG9ja3MgZG93biBmaWxlIHR5cGUgY2hlY2sKICAgICBmbiB0ZXN0X2ZpbGVfdHlwZV9jaGVjaygpIHsKLSAgICAgICAgbGV0IG11dCBwYWNrYWdlX3RhYmxlID0gY3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZSgpOworICAgICAgICBsZXQgbXV0IHBhY2thZ2VfdGFibGUgPSBjcmVhdGVfdGVzdF9wYWNrYWdlX3RhYmxlKERFRkFVTFRfRklMRV9WRVJTSU9OKTsKICAgICAgICAgcGFja2FnZV90YWJsZS5oZWFkZXIuZmlsZV90eXBlID0gMTIzdTg7CiAgICAgICAgIGxldCBlcnJvciA9IFBhY2thZ2VUYWJsZTo6ZnJvbV9ieXRlcygmcGFja2FnZV90YWJsZS5pbnRvX2J5dGVzKCkpLnVud3JhcF9lcnIoKTsKICAgICAgICAgYXNzZXJ0X2VxISgKZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvc3JjL3Rlc3RfdXRpbHMucnMgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3NyYy90ZXN0X3V0aWxzLnJzCmluZGV4IDVjMzY0ZjYuLjU1NzgwZWQgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvc3JjL3Rlc3RfdXRpbHMucnMKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS9zcmMvdGVzdF91dGlscy5ycwpAQCAtMTgsMzggKzE4LDUzIEBACiB1c2UgY3JhdGU6OmZsYWdfdGFibGU6OntGbGFnVGFibGUsIEZsYWdUYWJsZUhlYWRlciwgRmxhZ1RhYmxlTm9kZX07CiB1c2UgY3JhdGU6OmZsYWdfdmFsdWU6OntGbGFnVmFsdWVIZWFkZXIsIEZsYWdWYWx1ZUxpc3R9OwogdXNlIGNyYXRlOjpwYWNrYWdlX3RhYmxlOjp7UGFja2FnZVRhYmxlLCBQYWNrYWdlVGFibGVIZWFkZXIsIFBhY2thZ2VUYWJsZU5vZGV9OwotdXNlIGNyYXRlOjp7QWNvbmZpZ1N0b3JhZ2VFcnJvciwgU3RvcmFnZUZpbGVUeXBlLCBTdG9yZWRGbGFnVHlwZSwgREVGQVVMVF9GSUxFX1ZFUlNJT059OwordXNlIGNyYXRlOjp7QWNvbmZpZ1N0b3JhZ2VFcnJvciwgU3RvcmFnZUZpbGVUeXBlLCBTdG9yZWRGbGFnVHlwZX07CiAKIHVzZSBhbnlob3c6OmFueWhvdzsKIHVzZSBzdGQ6OmlvOjpXcml0ZTsKIHVzZSB0ZW1wZmlsZTo6TmFtZWRUZW1wRmlsZTsKIAotcHViIGZuIGNyZWF0ZV90ZXN0X3BhY2thZ2VfdGFibGUoKSAtPiBQYWNrYWdlVGFibGUgeworcHViIGZuIGNyZWF0ZV90ZXN0X3BhY2thZ2VfdGFibGUodmVyc2lvbjogdTMyKSAtPiBQYWNrYWdlVGFibGUgewogICAgIGxldCBoZWFkZXIgPSBQYWNrYWdlVGFibGVIZWFkZXIgewotICAgICAgICB2ZXJzaW9uOiBERUZBVUxUX0ZJTEVfVkVSU0lPTiwKKyAgICAgICAgdmVyc2lvbjogdmVyc2lvbiwKICAgICAgICAgY29udGFpbmVyOiBTdHJpbmc6OmZyb20oIm1vY2t1cCIpLAogICAgICAgICBmaWxlX3R5cGU6IFN0b3JhZ2VGaWxlVHlwZTo6UGFja2FnZU1hcCBhcyB1OCwKLSAgICAgICAgZmlsZV9zaXplOiAyMDksCisgICAgICAgIGZpbGVfc2l6ZTogbWF0Y2ggdmVyc2lvbiB7CisgICAgICAgICAgICAxID0+IDIwOSwKKyAgICAgICAgICAgIDIgPT4gMjMzLAorICAgICAgICAgICAgXyA9PiBwYW5pYyEoIlVuc3VwcG9ydGVkIHZlcnNpb24uIiksCisgICAgICAgIH0sCiAgICAgICAgIG51bV9wYWNrYWdlczogMywKICAgICAgICAgYnVja2V0X29mZnNldDogMzEsCiAgICAgICAgIG5vZGVfb2Zmc2V0OiA1OSwKICAgICB9OwotICAgIGxldCBidWNrZXRzOiBWZWM8T3B0aW9uPHUzMj4+ID0gdmVjIVtTb21lKDU5KSwgTm9uZSwgTm9uZSwgU29tZSgxMDkpLCBOb25lLCBOb25lLCBOb25lXTsKKyAgICBsZXQgYnVja2V0czogVmVjPE9wdGlvbjx1MzI+PiA9IG1hdGNoIHZlcnNpb24geworICAgICAgICAxID0+IHZlYyFbU29tZSg1OSksIE5vbmUsIE5vbmUsIFNvbWUoMTA5KSwgTm9uZSwgTm9uZSwgTm9uZV0sCisgICAgICAgIDIgPT4gdmVjIVtTb21lKDU5KSwgTm9uZSwgTm9uZSwgU29tZSgxMTcpLCBOb25lLCBOb25lLCBOb25lXSwKKyAgICAgICAgXyA9PiBwYW5pYyEoIlVuc3VwcG9ydGVkIHZlcnNpb24uIiksCisgICAgfTsKICAgICBsZXQgZmlyc3Rfbm9kZSA9IFBhY2thZ2VUYWJsZU5vZGUgewogICAgICAgICBwYWNrYWdlX25hbWU6IFN0cmluZzo6ZnJvbSgiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMiIpLAogICAgICAgICBwYWNrYWdlX2lkOiAxLAorICAgICAgICBmaW5nZXJwcmludDogMCwKICAgICAgICAgYm9vbGVhbl9zdGFydF9pbmRleDogMywKICAgICAgICAgbmV4dF9vZmZzZXQ6IE5vbmUsCiAgICAgfTsKICAgICBsZXQgc2Vjb25kX25vZGUgPSBQYWNrYWdlVGFibGVOb2RlIHsKICAgICAgICAgcGFja2FnZV9uYW1lOiBTdHJpbmc6OmZyb20oImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzEiKSwKICAgICAgICAgcGFja2FnZV9pZDogMCwKKyAgICAgICAgZmluZ2VycHJpbnQ6IDAsCiAgICAgICAgIGJvb2xlYW5fc3RhcnRfaW5kZXg6IDAsCi0gICAgICAgIG5leHRfb2Zmc2V0OiBTb21lKDE1OSksCisgICAgICAgIG5leHRfb2Zmc2V0OiBtYXRjaCB2ZXJzaW9uIHsKKyAgICAgICAgICAgIDEgPT4gU29tZSgxNTkpLAorICAgICAgICAgICAgMiA9PiBTb21lKDE3NSksCisgICAgICAgICAgICBfID0+IHBhbmljISgiVW5zdXBwb3J0ZWQgdmVyc2lvbi4iKSwKKyAgICAgICAgfSwKICAgICB9OwogICAgIGxldCB0aGlyZF9ub2RlID0gUGFja2FnZVRhYmxlTm9kZSB7CiAgICAgICAgIHBhY2thZ2VfbmFtZTogU3RyaW5nOjpmcm9tKCJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF80IiksCiAgICAgICAgIHBhY2thZ2VfaWQ6IDIsCisgICAgICAgIGZpbmdlcnByaW50OiAwLAogICAgICAgICBib29sZWFuX3N0YXJ0X2luZGV4OiA2LAogICAgICAgICBuZXh0X29mZnNldDogTm9uZSwKICAgICB9OwpAQCAtNzYsOSArOTEsOSBAQAogICAgIH0KIH0KIAotcHViIGZuIGNyZWF0ZV90ZXN0X2ZsYWdfdGFibGUoKSAtPiBGbGFnVGFibGUgeworcHViIGZuIGNyZWF0ZV90ZXN0X2ZsYWdfdGFibGUodmVyc2lvbjogdTMyKSAtPiBGbGFnVGFibGUgewogICAgIGxldCBoZWFkZXIgPSBGbGFnVGFibGVIZWFkZXIgewotICAgICAgICB2ZXJzaW9uOiBERUZBVUxUX0ZJTEVfVkVSU0lPTiwKKyAgICAgICAgdmVyc2lvbjogdmVyc2lvbiwKICAgICAgICAgY29udGFpbmVyOiBTdHJpbmc6OmZyb20oIm1vY2t1cCIpLAogICAgICAgICBmaWxlX3R5cGU6IFN0b3JhZ2VGaWxlVHlwZTo6RmxhZ01hcCBhcyB1OCwKICAgICAgICAgZmlsZV9zaXplOiAzMjEsCkBAIC0xMTgsOSArMTMzLDkgQEAKICAgICBGbGFnVGFibGUgeyBoZWFkZXIsIGJ1Y2tldHMsIG5vZGVzIH0KIH0KIAotcHViIGZuIGNyZWF0ZV90ZXN0X2ZsYWdfdmFsdWVfbGlzdCgpIC0+IEZsYWdWYWx1ZUxpc3QgeworcHViIGZuIGNyZWF0ZV90ZXN0X2ZsYWdfdmFsdWVfbGlzdCh2ZXJzaW9uOiB1MzIpIC0+IEZsYWdWYWx1ZUxpc3QgewogICAgIGxldCBoZWFkZXIgPSBGbGFnVmFsdWVIZWFkZXIgewotICAgICAgICB2ZXJzaW9uOiBERUZBVUxUX0ZJTEVfVkVSU0lPTiwKKyAgICAgICAgdmVyc2lvbjogdmVyc2lvbiwKICAgICAgICAgY29udGFpbmVyOiBTdHJpbmc6OmZyb20oIm1vY2t1cCIpLAogICAgICAgICBmaWxlX3R5cGU6IFN0b3JhZ2VGaWxlVHlwZTo6RmxhZ1ZhbCBhcyB1OCwKICAgICAgICAgZmlsZV9zaXplOiAzNSwKQEAgLTEzMSw5ICsxNDYsOSBAQAogICAgIEZsYWdWYWx1ZUxpc3QgeyBoZWFkZXIsIGJvb2xlYW5zIH0KIH0KIAotcHViIGZuIGNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0KCkgLT4gRmxhZ0luZm9MaXN0IHsKK3B1YiBmbiBjcmVhdGVfdGVzdF9mbGFnX2luZm9fbGlzdCh2ZXJzaW9uOiB1MzIpIC0+IEZsYWdJbmZvTGlzdCB7CiAgICAgbGV0IGhlYWRlciA9IEZsYWdJbmZvSGVhZGVyIHsKLSAgICAgICAgdmVyc2lvbjogREVGQVVMVF9GSUxFX1ZFUlNJT04sCisgICAgICAgIHZlcnNpb246IHZlcnNpb24sCiAgICAgICAgIGNvbnRhaW5lcjogU3RyaW5nOjpmcm9tKCJtb2NrdXAiKSwKICAgICAgICAgZmlsZV90eXBlOiBTdG9yYWdlRmlsZVR5cGU6OkZsYWdJbmZvIGFzIHU4LAogICAgICAgICBmaWxlX3NpemU6IDM1LApkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvc3Jjcy9hbmRyb2lkL2Fjb25maWcvc3RvcmFnZS9TdG9yYWdlRmlsZVByb3ZpZGVyLmphdmEgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3NyY3MvYW5kcm9pZC9hY29uZmlnL3N0b3JhZ2UvU3RvcmFnZUZpbGVQcm92aWRlci5qYXZhCnNpbWlsYXJpdHkgaW5kZXggOTIlCnJlbmFtZSBmcm9tIHRvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3NyY3MvYW5kcm9pZC9hY29uZmlnL3N0b3JhZ2UvU3RvcmFnZUZpbGVQcm92aWRlci5qYXZhCnJlbmFtZSB0byB0b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3NyY3MvYW5kcm9pZC9hY29uZmlnL3N0b3JhZ2UvU3RvcmFnZUZpbGVQcm92aWRlci5qYXZhCmluZGV4IGIyODM0MWUuLjgzMDZjYzYgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3NyY3MvYW5kcm9pZC9hY29uZmlnL3N0b3JhZ2UvU3RvcmFnZUZpbGVQcm92aWRlci5qYXZhCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvc3Jjcy9hbmRyb2lkL2Fjb25maWcvc3RvcmFnZS9TdG9yYWdlRmlsZVByb3ZpZGVyLmphdmEKQEAgLTIxLDYgKzIxLDcgQEAKIGltcG9ydCBqYXZhLm5pby5jaGFubmVscy5GaWxlQ2hhbm5lbDsKIGltcG9ydCBqYXZhLm5pby5maWxlLkRpcmVjdG9yeVN0cmVhbTsKIGltcG9ydCBqYXZhLm5pby5maWxlLkZpbGVzOworaW1wb3J0IGphdmEubmlvLmZpbGUuTm9TdWNoRmlsZUV4Y2VwdGlvbjsKIGltcG9ydCBqYXZhLm5pby5maWxlLlBhdGg7CiBpbXBvcnQgamF2YS5uaW8uZmlsZS5QYXRoczsKIGltcG9ydCBqYXZhLm5pby5maWxlLlN0YW5kYXJkT3Blbk9wdGlvbjsKQEAgLTUxLDE0ICs1Miw2IEBACiAgICAgfQogCiAgICAgLyoqIEBoaWRlICovCi0gICAgcHVibGljIGJvb2xlYW4gY29udGFpbmVyRmlsZUV4aXN0cyhTdHJpbmcgY29udGFpbmVyKSB7Ci0gICAgICAgIGlmIChjb250YWluZXIgPT0gbnVsbCkgewotICAgICAgICAgICAgcmV0dXJuIEZpbGVzLmV4aXN0cyhQYXRocy5nZXQobU1hcFBhdGgpKTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gRmlsZXMuZXhpc3RzKFBhdGhzLmdldChtTWFwUGF0aCwgY29udGFpbmVyICsgUE1BUF9GSUxFX0VYVCkpOwotICAgIH0KLQotICAgIC8qKiBAaGlkZSAqLwogICAgIHB1YmxpYyBMaXN0PFBhdGg+IGxpc3RQYWNrYWdlTWFwRmlsZXMoKSB7CiAgICAgICAgIExpc3Q8UGF0aD4gcmVzdWx0ID0gbmV3IEFycmF5TGlzdDw+KCk7CiAgICAgICAgIHRyeSB7CkBAIC02Niw4ICs1OSw5IEBACiAgICAgICAgICAgICAgICAgICAgIEZpbGVzLm5ld0RpcmVjdG9yeVN0cmVhbShQYXRocy5nZXQobU1hcFBhdGgpLCAiKiIgKyBQTUFQX0ZJTEVfRVhUKTsKICAgICAgICAgICAgIGZvciAoUGF0aCBlbnRyeSA6IHN0cmVhbSkgewogICAgICAgICAgICAgICAgIHJlc3VsdC5hZGQoZW50cnkpOwotICAgICAgICAgICAgICAgIC8vIHNiLmFwcGVuZChlbnRyeS4gdG9TdHJpbmcoKSk7CiAgICAgICAgICAgICB9CisgICAgICAgIH0gY2F0Y2ggKE5vU3VjaEZpbGVFeGNlcHRpb24gZSkgeworICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICAgICAgfSBjYXRjaCAoRXhjZXB0aW9uIGUpIHsKICAgICAgICAgICAgIHRocm93IG5ldyBBY29uZmlnU3RvcmFnZUV4Y2VwdGlvbigKICAgICAgICAgICAgICAgICAgICAgU3RyaW5nLmZvcm1hdCgiRmFpbCB0byBsaXN0IG1hcCBmaWxlcyBpbiBwYXRoICVzIiwgbU1hcFBhdGgpLCBlKTsKZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvQW5kcm9pZC5icCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvQW5kcm9pZC5icAppbmRleCAxM2QzMjE0Li5iZDQ2ZDVmIDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL0FuZHJvaWQuYnAKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9BbmRyb2lkLmJwCkBAIC0xMCwxMCArMTAsMTQgQEAKICAgICAgICAgImxpYmJhc2UiLAogICAgIF0sCiAgICAgZGF0YTogWwotICAgICAgICAiZGF0YS92MS9wYWNrYWdlLm1hcCIsCi0gICAgICAgICJkYXRhL3YxL2ZsYWcubWFwIiwKLSAgICAgICAgImRhdGEvdjEvZmxhZy52YWwiLAotICAgICAgICAiZGF0YS92MS9mbGFnLmluZm8iLAorICAgICAgICAiZGF0YS92MS9wYWNrYWdlX3YxLm1hcCIsCisgICAgICAgICJkYXRhL3YxL2ZsYWdfdjEubWFwIiwKKyAgICAgICAgImRhdGEvdjEvZmxhZ192MS52YWwiLAorICAgICAgICAiZGF0YS92MS9mbGFnX3YxLmluZm8iLAorICAgICAgICAiZGF0YS92Mi9wYWNrYWdlX3YyLm1hcCIsCisgICAgICAgICJkYXRhL3YyL2ZsYWdfdjIubWFwIiwKKyAgICAgICAgImRhdGEvdjIvZmxhZ192Mi52YWwiLAorICAgICAgICAiZGF0YS92Mi9mbGFnX3YyLmluZm8iLAogICAgIF0sCiAgICAgdGVzdF9zdWl0ZXM6IFsKICAgICAgICAgImRldmljZS10ZXN0cyIsCkBAIC0zNSwxMCArMzksMTQgQEAKICAgICB0ZXN0X2NvbmZpZzogIkFuZHJvaWRTdG9yYWdlSmF2ZVRlc3QueG1sIiwKICAgICBzZGtfdmVyc2lvbjogInRlc3RfY3VycmVudCIsCiAgICAgZGF0YTogWwotICAgICAgICAiZGF0YS92MS9wYWNrYWdlLm1hcCIsCi0gICAgICAgICJkYXRhL3YxL2ZsYWcubWFwIiwKLSAgICAgICAgImRhdGEvdjEvZmxhZy52YWwiLAotICAgICAgICAiZGF0YS92MS9mbGFnLmluZm8iLAorICAgICAgICAiZGF0YS92MS9wYWNrYWdlX3YxLm1hcCIsCisgICAgICAgICJkYXRhL3YxL2ZsYWdfdjEubWFwIiwKKyAgICAgICAgImRhdGEvdjEvZmxhZ192MS52YWwiLAorICAgICAgICAiZGF0YS92MS9mbGFnX3YxLmluZm8iLAorICAgICAgICAiZGF0YS92Mi9wYWNrYWdlX3YyLm1hcCIsCisgICAgICAgICJkYXRhL3YyL2ZsYWdfdjIubWFwIiwKKyAgICAgICAgImRhdGEvdjIvZmxhZ192Mi52YWwiLAorICAgICAgICAiZGF0YS92Mi9mbGFnX3YyLmluZm8iLAogICAgIF0sCiAgICAgdGVzdF9zdWl0ZXM6IFsKICAgICAgICAgImdlbmVyYWwtdGVzdHMiLApkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9BbmRyb2lkU3RvcmFnZUphdmVUZXN0LnhtbCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvQW5kcm9pZFN0b3JhZ2VKYXZlVGVzdC54bWwKaW5kZXggMmQ1MmQ0NC4uYmZjMjM4ZSAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9BbmRyb2lkU3RvcmFnZUphdmVUZXN0LnhtbAorKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL0FuZHJvaWRTdG9yYWdlSmF2ZVRlc3QueG1sCkBAIC0yMSwxMyArMjEsMTggQEAKICAgICA8L3RhcmdldF9wcmVwYXJlcj4KICAgICA8dGFyZ2V0X3ByZXBhcmVyIGNsYXNzPSJjb20uYW5kcm9pZC5jb21wYXRpYmlsaXR5LmNvbW1vbi50cmFkZWZlZC50YXJnZXRwcmVwLkZpbGVQdXNoZXIiPgogICAgICAgICA8b3B0aW9uIG5hbWU9ImNsZWFudXAiIHZhbHVlPSJ0cnVlIiAvPgotICAgICAgICA8b3B0aW9uIG5hbWU9InB1c2giIHZhbHVlPSJwYWNrYWdlLm1hcC0+L2RhdGEvbG9jYWwvdG1wL2Fjb25maWdfc3RvcmFnZV9maWxlX3Rlc3RfamF2YS90ZXN0ZGF0YS9wYWNrYWdlLm1hcCIgLz4KLSAgICAgICAgPG9wdGlvbiBuYW1lPSJwdXNoIiB2YWx1ZT0iZmxhZy5tYXAtPi9kYXRhL2xvY2FsL3RtcC9hY29uZmlnX3N0b3JhZ2VfZmlsZV90ZXN0X2phdmEvdGVzdGRhdGEvZmxhZy5tYXAiIC8+Ci0gICAgICAgIDxvcHRpb24gbmFtZT0icHVzaCIgdmFsdWU9ImZsYWcudmFsLT4vZGF0YS9sb2NhbC90bXAvYWNvbmZpZ19zdG9yYWdlX2ZpbGVfdGVzdF9qYXZhL3Rlc3RkYXRhL2ZsYWcudmFsIiAvPgotICAgICAgICA8b3B0aW9uIG5hbWU9InB1c2giIHZhbHVlPSJmbGFnLmluZm8tPi9kYXRhL2xvY2FsL3RtcC9hY29uZmlnX3N0b3JhZ2VfZmlsZV90ZXN0X2phdmEvdGVzdGRhdGEvZmxhZy5pbmZvIiAvPgorICAgICAgICA8b3B0aW9uIG5hbWU9InB1c2giIHZhbHVlPSJwYWNrYWdlX3YxLm1hcC0+L2RhdGEvbG9jYWwvdG1wL2Fjb25maWdfc3RvcmFnZV9maWxlX3Rlc3RfamF2YS90ZXN0ZGF0YS9tb2NrLnYxLnBhY2thZ2UubWFwIiAvPgorICAgICAgICA8b3B0aW9uIG5hbWU9InB1c2giIHZhbHVlPSJmbGFnX3YxLm1hcC0+L2RhdGEvbG9jYWwvdG1wL2Fjb25maWdfc3RvcmFnZV9maWxlX3Rlc3RfamF2YS90ZXN0ZGF0YS9tb2NrLnYxLmZsYWcubWFwIiAvPgorICAgICAgICA8b3B0aW9uIG5hbWU9InB1c2giIHZhbHVlPSJmbGFnX3YxLnZhbC0+L2RhdGEvbG9jYWwvdG1wL2Fjb25maWdfc3RvcmFnZV9maWxlX3Rlc3RfamF2YS90ZXN0ZGF0YS9tb2NrLnYxLnZhbCIgLz4KKyAgICAgICAgPG9wdGlvbiBuYW1lPSJwdXNoIiB2YWx1ZT0iZmxhZ192MS5pbmZvLT4vZGF0YS9sb2NhbC90bXAvYWNvbmZpZ19zdG9yYWdlX2ZpbGVfdGVzdF9qYXZhL3Rlc3RkYXRhL21vY2sudjEuaW5mbyIgLz4KKyAgICAgICAgPG9wdGlvbiBuYW1lPSJwdXNoIiB2YWx1ZT0icGFja2FnZV92Mi5tYXAtPi9kYXRhL2xvY2FsL3RtcC9hY29uZmlnX3N0b3JhZ2VfZmlsZV90ZXN0X2phdmEvdGVzdGRhdGEvbW9jay52Mi5wYWNrYWdlLm1hcCIgLz4KKyAgICAgICAgPG9wdGlvbiBuYW1lPSJwdXNoIiB2YWx1ZT0iZmxhZ192Mi5tYXAtPi9kYXRhL2xvY2FsL3RtcC9hY29uZmlnX3N0b3JhZ2VfZmlsZV90ZXN0X2phdmEvdGVzdGRhdGEvbW9jay52Mi5mbGFnLm1hcCIgLz4KKyAgICAgICAgPG9wdGlvbiBuYW1lPSJwdXNoIiB2YWx1ZT0iZmxhZ192Mi52YWwtPi9kYXRhL2xvY2FsL3RtcC9hY29uZmlnX3N0b3JhZ2VfZmlsZV90ZXN0X2phdmEvdGVzdGRhdGEvbW9jay52Mi52YWwiIC8+CisgICAgICAgIDxvcHRpb24gbmFtZT0icHVzaCIgdmFsdWU9ImZsYWdfdjIuaW5mby0+L2RhdGEvbG9jYWwvdG1wL2Fjb25maWdfc3RvcmFnZV9maWxlX3Rlc3RfamF2YS90ZXN0ZGF0YS9tb2NrLnYyLmluZm8iIC8+CisgICAgICAgIDxvcHRpb24gbmFtZT0icG9zdC1wdXNoIiB2YWx1ZT0iY2htb2QgK3IgL2RhdGEvbG9jYWwvdG1wL2Fjb25maWdfc3RvcmFnZV9maWxlX3Rlc3RfamF2YS90ZXN0ZGF0YS8iIC8+CiAgICAgPC90YXJnZXRfcHJlcGFyZXI+CiAgICAgPHRlc3QgY2xhc3M9ImNvbS5hbmRyb2lkLnRyYWRlZmVkLnRlc3R0eXBlLkFuZHJvaWRKVW5pdFRlc3QiID4KICAgICAgICAgPG9wdGlvbiBuYW1lPSJwYWNrYWdlIiB2YWx1ZT0iYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdCIgLz4KICAgICAgICAgPG9wdGlvbiBuYW1lPSJydW50aW1lLWhpbnQiIHZhbHVlPSIxbSIgLz4KICAgICA8L3Rlc3Q+Ci08L2NvbmZpZ3VyYXRpb24+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorPC9jb25maWd1cmF0aW9uPgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9kYXRhL3YxL2ZsYWcuaW5mbyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvZGF0YS92MS9mbGFnX3YxLmluZm8Kc2ltaWxhcml0eSBpbmRleCAxMDAlCnJlbmFtZSBmcm9tIHRvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvZGF0YS92MS9mbGFnLmluZm8KcmVuYW1lIHRvIHRvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvZGF0YS92MS9mbGFnX3YxLmluZm8KQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9kYXRhL3YxL2ZsYWcubWFwIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9kYXRhL3YxL2ZsYWdfdjEubWFwCnNpbWlsYXJpdHkgaW5kZXggMTAwJQpyZW5hbWUgZnJvbSB0b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL2RhdGEvdjEvZmxhZy5tYXAKcmVuYW1lIHRvIHRvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvZGF0YS92MS9mbGFnX3YxLm1hcApCaW5hcnkgZmlsZXMgZGlmZmVyCmRpZmYgLS1naXQgYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL2RhdGEvdjEvZmxhZy52YWwgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL2RhdGEvdjEvZmxhZ192MS52YWwKc2ltaWxhcml0eSBpbmRleCAxMDAlCnJlbmFtZSBmcm9tIHRvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvZGF0YS92MS9mbGFnLnZhbApyZW5hbWUgdG8gdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9kYXRhL3YxL2ZsYWdfdjEudmFsCkJpbmFyeSBmaWxlcyBkaWZmZXIKZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvZGF0YS92MS9wYWNrYWdlLm1hcCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvZGF0YS92MS9wYWNrYWdlX3YxLm1hcApzaW1pbGFyaXR5IGluZGV4IDEwMCUKcmVuYW1lIGZyb20gdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9kYXRhL3YxL3BhY2thZ2UubWFwCnJlbmFtZSB0byB0b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL2RhdGEvdjEvcGFja2FnZV92MS5tYXAKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9kYXRhL3YyL2ZsYWdfdjIuaW5mbyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvZGF0YS92Mi9mbGFnX3YyLmluZm8KbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uOWRiN2ZkZQotLS0gL2Rldi9udWxsCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvZGF0YS92Mi9mbGFnX3YyLmluZm8KQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9kYXRhL3YyL2ZsYWdfdjIubWFwIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9kYXRhL3YyL2ZsYWdfdjIubWFwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmNmNDY4NWMKLS0tIC9kZXYvbnVsbAorKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL2RhdGEvdjIvZmxhZ192Mi5tYXAKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9kYXRhL3YyL2ZsYWdfdjIudmFsIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9kYXRhL3YyL2ZsYWdfdjIudmFsCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjM3ZDQ3NTAKLS0tIC9kZXYvbnVsbAorKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL2RhdGEvdjIvZmxhZ192Mi52YWwKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9kYXRhL3YyL3BhY2thZ2VfdjIubWFwIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9kYXRhL3YyL3BhY2thZ2VfdjIubWFwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjE2ZjQwNTQKLS0tIC9kZXYvbnVsbAorKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL2RhdGEvdjIvcGFja2FnZV92Mi5tYXAKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9qYXJqYXIudHh0IGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9qYXJqYXIudHh0CmluZGV4IGE2YzE3ZmEuLjI0OTUyZWMgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvamFyamFyLnR4dAorKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL2phcmphci50eHQKQEAgLTcsNiArNyw4IEBACiBydWxlIGFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLkZpbGVUeXBlIGFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3QuRmlsZVR5cGUKIHJ1bGUgYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UuRmxhZ1ZhbHVlTGlzdCBhbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0LkZsYWdWYWx1ZUxpc3QKIHJ1bGUgYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UuVGFibGVVdGlscyBhbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0LlRhYmxlVXRpbHMKK3J1bGUgYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UuQWNvbmZpZ1BhY2thZ2VJbXBsIGFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3QuQWNvbmZpZ1BhY2thZ2VJbXBsCitydWxlIGFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLlN0b3JhZ2VGaWxlUHJvdmlkZXIgYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdC5TdG9yYWdlRmlsZVByb3ZpZGVyCiAKIAogcnVsZSBhbmRyb2lkLmFjb25maWcuc3RvcmFnZS5GbGFnVGFibGUkKiBhbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0LkZsYWdUYWJsZSRAMQpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9zcmNzL0ZsYWdUYWJsZVRlc3QuamF2YSBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvc3Jjcy9GbGFnVGFibGVUZXN0LmphdmEKaW5kZXggZmQ0MGQ0Yy4uZGM0NjViNiAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9zcmNzL0ZsYWdUYWJsZVRlc3QuamF2YQorKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL3NyY3MvRmxhZ1RhYmxlVGVzdC5qYXZhCkBAIC0zMSw3ICszMSw3IEBACiAKICAgICBAVGVzdAogICAgIHB1YmxpYyB2b2lkIHRlc3RGbGFnVGFibGVfcmlnaHRIZWFkZXIoKSB0aHJvd3MgRXhjZXB0aW9uIHsKLSAgICAgICAgRmxhZ1RhYmxlIGZsYWdUYWJsZSA9IEZsYWdUYWJsZS5mcm9tQnl0ZXMoVGVzdERhdGFVdGlscy5nZXRUZXN0RmxhZ01hcEJ5dGVCdWZmZXIoKSk7CisgICAgICAgIEZsYWdUYWJsZSBmbGFnVGFibGUgPSBGbGFnVGFibGUuZnJvbUJ5dGVzKFRlc3REYXRhVXRpbHMuZ2V0VGVzdEZsYWdNYXBCeXRlQnVmZmVyKDEpKTsKICAgICAgICAgRmxhZ1RhYmxlLkhlYWRlciBoZWFkZXIgPSBmbGFnVGFibGUuZ2V0SGVhZGVyKCk7CiAgICAgICAgIGFzc2VydEVxdWFscygxLCBoZWFkZXIuZ2V0VmVyc2lvbigpKTsKICAgICAgICAgYXNzZXJ0RXF1YWxzKCJtb2NrdXAiLCBoZWFkZXIuZ2V0Q29udGFpbmVyKCkpOwpAQCAtNDQsNyArNDQsNyBAQAogCiAgICAgQFRlc3QKICAgICBwdWJsaWMgdm9pZCB0ZXN0RmxhZ1RhYmxlX3JpZ2h0Tm9kZSgpIHRocm93cyBFeGNlcHRpb24gewotICAgICAgICBGbGFnVGFibGUgZmxhZ1RhYmxlID0gRmxhZ1RhYmxlLmZyb21CeXRlcyhUZXN0RGF0YVV0aWxzLmdldFRlc3RGbGFnTWFwQnl0ZUJ1ZmZlcigpKTsKKyAgICAgICAgRmxhZ1RhYmxlIGZsYWdUYWJsZSA9IEZsYWdUYWJsZS5mcm9tQnl0ZXMoVGVzdERhdGFVdGlscy5nZXRUZXN0RmxhZ01hcEJ5dGVCdWZmZXIoMSkpOwogCiAgICAgICAgIEZsYWdUYWJsZS5Ob2RlIG5vZGUxID0gZmxhZ1RhYmxlLmdldCgwLCAiZW5hYmxlZF9ybyIpOwogICAgICAgICBGbGFnVGFibGUuTm9kZSBub2RlMiA9IGZsYWdUYWJsZS5nZXQoMCwgImVuYWJsZWRfcnciKTsKZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvc3Jjcy9GbGFnVmFsdWVMaXN0VGVzdC5qYXZhIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9zcmNzL0ZsYWdWYWx1ZUxpc3RUZXN0LmphdmEKaW5kZXggMWIwZGU2My4uMzA2ZGY3ZCAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9zcmNzL0ZsYWdWYWx1ZUxpc3RUZXN0LmphdmEKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9zcmNzL0ZsYWdWYWx1ZUxpc3RUZXN0LmphdmEKQEAgLTM0LDcgKzM0LDcgQEAKICAgICBAVGVzdAogICAgIHB1YmxpYyB2b2lkIHRlc3RGbGFnVmFsdWVMaXN0X3JpZ2h0SGVhZGVyKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CiAgICAgICAgIEZsYWdWYWx1ZUxpc3QgZmxhZ1ZhbHVlTGlzdCA9Ci0gICAgICAgICAgICAgICAgRmxhZ1ZhbHVlTGlzdC5mcm9tQnl0ZXMoVGVzdERhdGFVdGlscy5nZXRUZXN0RmxhZ1ZhbEJ5dGVCdWZmZXIoKSk7CisgICAgICAgICAgICAgICAgRmxhZ1ZhbHVlTGlzdC5mcm9tQnl0ZXMoVGVzdERhdGFVdGlscy5nZXRUZXN0RmxhZ1ZhbEJ5dGVCdWZmZXIoMSkpOwogICAgICAgICBGbGFnVmFsdWVMaXN0LkhlYWRlciBoZWFkZXIgPSBmbGFnVmFsdWVMaXN0LmdldEhlYWRlcigpOwogICAgICAgICBhc3NlcnRFcXVhbHMoMSwgaGVhZGVyLmdldFZlcnNpb24oKSk7CiAgICAgICAgIGFzc2VydEVxdWFscygibW9ja3VwIiwgaGVhZGVyLmdldENvbnRhaW5lcigpKTsKQEAgLTQ3LDcgKzQ3LDcgQEAKICAgICBAVGVzdAogICAgIHB1YmxpYyB2b2lkIHRlc3RGbGFnVmFsdWVMaXN0X3JpZ2h0Tm9kZSgpIHRocm93cyBFeGNlcHRpb24gewogICAgICAgICBGbGFnVmFsdWVMaXN0IGZsYWdWYWx1ZUxpc3QgPQotICAgICAgICAgICAgICAgIEZsYWdWYWx1ZUxpc3QuZnJvbUJ5dGVzKFRlc3REYXRhVXRpbHMuZ2V0VGVzdEZsYWdWYWxCeXRlQnVmZmVyKCkpOworICAgICAgICAgICAgICAgIEZsYWdWYWx1ZUxpc3QuZnJvbUJ5dGVzKFRlc3REYXRhVXRpbHMuZ2V0VGVzdEZsYWdWYWxCeXRlQnVmZmVyKDEpKTsKIAogICAgICAgICBib29sZWFuW10gZXhwZWN0ZWQgPSBuZXcgYm9vbGVhbltdIHtmYWxzZSwgdHJ1ZSwgdHJ1ZSwgZmFsc2UsIHRydWUsIHRydWUsIHRydWUsIHRydWV9OwogICAgICAgICBhc3NlcnRFcXVhbHMoZXhwZWN0ZWQubGVuZ3RoLCBmbGFnVmFsdWVMaXN0LnNpemUoKSk7CkBAIC02MCwxMSArNjAsMTEgQEAKICAgICBAVGVzdAogICAgIHB1YmxpYyB2b2lkIHRlc3RGbGFnVmFsdWVMaXN0X2dldFZhbHVlKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CiAgICAgICAgIFBhY2thZ2VUYWJsZSBwYWNrYWdlVGFibGUgPQotICAgICAgICAgICAgICAgIFBhY2thZ2VUYWJsZS5mcm9tQnl0ZXMoVGVzdERhdGFVdGlscy5nZXRUZXN0UGFja2FnZU1hcEJ5dGVCdWZmZXIoKSk7Ci0gICAgICAgIEZsYWdUYWJsZSBmbGFnVGFibGUgPSBGbGFnVGFibGUuZnJvbUJ5dGVzKFRlc3REYXRhVXRpbHMuZ2V0VGVzdEZsYWdNYXBCeXRlQnVmZmVyKCkpOworICAgICAgICAgICAgICAgIFBhY2thZ2VUYWJsZS5mcm9tQnl0ZXMoVGVzdERhdGFVdGlscy5nZXRUZXN0UGFja2FnZU1hcEJ5dGVCdWZmZXIoMSkpOworICAgICAgICBGbGFnVGFibGUgZmxhZ1RhYmxlID0gRmxhZ1RhYmxlLmZyb21CeXRlcyhUZXN0RGF0YVV0aWxzLmdldFRlc3RGbGFnTWFwQnl0ZUJ1ZmZlcigxKSk7CiAKICAgICAgICAgRmxhZ1ZhbHVlTGlzdCBmbGFnVmFsdWVMaXN0ID0KLSAgICAgICAgICAgICAgICBGbGFnVmFsdWVMaXN0LmZyb21CeXRlcyhUZXN0RGF0YVV0aWxzLmdldFRlc3RGbGFnVmFsQnl0ZUJ1ZmZlcigpKTsKKyAgICAgICAgICAgICAgICBGbGFnVmFsdWVMaXN0LmZyb21CeXRlcyhUZXN0RGF0YVV0aWxzLmdldFRlc3RGbGFnVmFsQnl0ZUJ1ZmZlcigxKSk7CiAKICAgICAgICAgUGFja2FnZVRhYmxlLk5vZGUgcE5vZGUgPSBwYWNrYWdlVGFibGUuZ2V0KCJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8xIik7CiAgICAgICAgIEZsYWdUYWJsZS5Ob2RlIGZOb2RlID0gZmxhZ1RhYmxlLmdldChwTm9kZS5nZXRQYWNrYWdlSWQoKSwgImVuYWJsZWRfcnciKTsKZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvc3Jjcy9QYWNrYWdlVGFibGVUZXN0LmphdmEgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL3NyY3MvUGFja2FnZVRhYmxlVGVzdC5qYXZhCmluZGV4IGRjMmFkOTIuLjRkN2FiMmEgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvc3Jjcy9QYWNrYWdlVGFibGVUZXN0LmphdmEKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9zcmNzL1BhY2thZ2VUYWJsZVRlc3QuamF2YQpAQCAtMTgsNiArMTgsNyBAQAogCiBpbXBvcnQgc3RhdGljIG9yZy5qdW5pdC5Bc3NlcnQuYXNzZXJ0RXF1YWxzOwogaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydEZhbHNlOworaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydFRydWU7CiAKIGltcG9ydCBhbmRyb2lkLmFjb25maWcuc3RvcmFnZS5GaWxlVHlwZTsKIGltcG9ydCBhbmRyb2lkLmFjb25maWcuc3RvcmFnZS5QYWNrYWdlVGFibGU7CkBAIC0zMiw3ICszMyw3IEBACiAgICAgQFRlc3QKICAgICBwdWJsaWMgdm9pZCB0ZXN0UGFja2FnZVRhYmxlX3JpZ2h0SGVhZGVyKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CiAgICAgICAgIFBhY2thZ2VUYWJsZSBwYWNrYWdlVGFibGUgPQotICAgICAgICAgICAgICAgIFBhY2thZ2VUYWJsZS5mcm9tQnl0ZXMoVGVzdERhdGFVdGlscy5nZXRUZXN0UGFja2FnZU1hcEJ5dGVCdWZmZXIoKSk7CisgICAgICAgICAgICAgICAgUGFja2FnZVRhYmxlLmZyb21CeXRlcyhUZXN0RGF0YVV0aWxzLmdldFRlc3RQYWNrYWdlTWFwQnl0ZUJ1ZmZlcigxKSk7CiAgICAgICAgIFBhY2thZ2VUYWJsZS5IZWFkZXIgaGVhZGVyID0gcGFja2FnZVRhYmxlLmdldEhlYWRlcigpOwogICAgICAgICBhc3NlcnRFcXVhbHMoMSwgaGVhZGVyLmdldFZlcnNpb24oKSk7CiAgICAgICAgIGFzc2VydEVxdWFscygibW9ja3VwIiwgaGVhZGVyLmdldENvbnRhaW5lcigpKTsKQEAgLTQ0LDkgKzQ1LDIzIEBACiAgICAgfQogCiAgICAgQFRlc3QKKyAgICBwdWJsaWMgdm9pZCB0ZXN0UGFja2FnZVRhYmxlX3JpZ2h0SGVhZGVyX3YyKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgICAgIFBhY2thZ2VUYWJsZSBwYWNrYWdlVGFibGUgPQorICAgICAgICAgICAgICAgIFBhY2thZ2VUYWJsZS5mcm9tQnl0ZXMoVGVzdERhdGFVdGlscy5nZXRUZXN0UGFja2FnZU1hcEJ5dGVCdWZmZXIoMikpOworICAgICAgICBQYWNrYWdlVGFibGUuSGVhZGVyIGhlYWRlciA9IHBhY2thZ2VUYWJsZS5nZXRIZWFkZXIoKTsKKyAgICAgICAgYXNzZXJ0RXF1YWxzKDIsIGhlYWRlci5nZXRWZXJzaW9uKCkpOworICAgICAgICBhc3NlcnRFcXVhbHMoIm1vY2t1cCIsIGhlYWRlci5nZXRDb250YWluZXIoKSk7CisgICAgICAgIGFzc2VydEVxdWFscyhGaWxlVHlwZS5QQUNLQUdFX01BUCwgaGVhZGVyLmdldEZpbGVUeXBlKCkpOworICAgICAgICBhc3NlcnRFcXVhbHMoMjMzLCBoZWFkZXIuZ2V0RmlsZVNpemUoKSk7CisgICAgICAgIGFzc2VydEVxdWFscygzLCBoZWFkZXIuZ2V0TnVtUGFja2FnZXMoKSk7CisgICAgICAgIGFzc2VydEVxdWFscygzMSwgaGVhZGVyLmdldEJ1Y2tldE9mZnNldCgpKTsKKyAgICAgICAgYXNzZXJ0RXF1YWxzKDU5LCBoZWFkZXIuZ2V0Tm9kZU9mZnNldCgpKTsKKyAgICB9CisKKyAgICBAVGVzdAogICAgIHB1YmxpYyB2b2lkIHRlc3RQYWNrYWdlVGFibGVfcmlnaHROb2RlKCkgdGhyb3dzIEV4Y2VwdGlvbiB7CiAgICAgICAgIFBhY2thZ2VUYWJsZSBwYWNrYWdlVGFibGUgPQotICAgICAgICAgICAgICAgIFBhY2thZ2VUYWJsZS5mcm9tQnl0ZXMoVGVzdERhdGFVdGlscy5nZXRUZXN0UGFja2FnZU1hcEJ5dGVCdWZmZXIoKSk7CisgICAgICAgICAgICAgICAgUGFja2FnZVRhYmxlLmZyb21CeXRlcyhUZXN0RGF0YVV0aWxzLmdldFRlc3RQYWNrYWdlTWFwQnl0ZUJ1ZmZlcigxKSk7CiAKICAgICAgICAgUGFja2FnZVRhYmxlLk5vZGUgbm9kZTEgPSBwYWNrYWdlVGFibGUuZ2V0KCJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8xIik7CiAgICAgICAgIFBhY2thZ2VUYWJsZS5Ob2RlIG5vZGUyID0gcGFja2FnZVRhYmxlLmdldCgiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMiIpOwpAQCAtNzIsNCArODcsMzQgQEAKICAgICAgICAgYXNzZXJ0RmFsc2Uobm9kZTIuaGFzUGFja2FnZUZpbmdlcnByaW50KCkpOwogICAgICAgICBhc3NlcnRGYWxzZShub2RlNC5oYXNQYWNrYWdlRmluZ2VycHJpbnQoKSk7CiAgICAgfQorCisgICAgQFRlc3QKKyAgICBwdWJsaWMgdm9pZCB0ZXN0UGFja2FnZVRhYmxlX3JpZ2h0Tm9kZV92MigpIHRocm93cyBFeGNlcHRpb24geworICAgICAgICBQYWNrYWdlVGFibGUgcGFja2FnZVRhYmxlID0KKyAgICAgICAgICAgICAgICBQYWNrYWdlVGFibGUuZnJvbUJ5dGVzKFRlc3REYXRhVXRpbHMuZ2V0VGVzdFBhY2thZ2VNYXBCeXRlQnVmZmVyKDIpKTsKKworICAgICAgICBQYWNrYWdlVGFibGUuTm9kZSBub2RlMSA9IHBhY2thZ2VUYWJsZS5nZXQoImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzEiKTsKKyAgICAgICAgUGFja2FnZVRhYmxlLk5vZGUgbm9kZTIgPSBwYWNrYWdlVGFibGUuZ2V0KCJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8yIik7CisgICAgICAgIFBhY2thZ2VUYWJsZS5Ob2RlIG5vZGU0ID0gcGFja2FnZVRhYmxlLmdldCgiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfNCIpOworCisgICAgICAgIGFzc2VydEVxdWFscygiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMSIsIG5vZGUxLmdldFBhY2thZ2VOYW1lKCkpOworICAgICAgICBhc3NlcnRFcXVhbHMoImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzIiLCBub2RlMi5nZXRQYWNrYWdlTmFtZSgpKTsKKyAgICAgICAgYXNzZXJ0RXF1YWxzKCJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF80Iiwgbm9kZTQuZ2V0UGFja2FnZU5hbWUoKSk7CisKKyAgICAgICAgYXNzZXJ0RXF1YWxzKDAsIG5vZGUxLmdldFBhY2thZ2VJZCgpKTsKKyAgICAgICAgYXNzZXJ0RXF1YWxzKDEsIG5vZGUyLmdldFBhY2thZ2VJZCgpKTsKKyAgICAgICAgYXNzZXJ0RXF1YWxzKDIsIG5vZGU0LmdldFBhY2thZ2VJZCgpKTsKKworICAgICAgICBhc3NlcnRFcXVhbHMoMCwgbm9kZTEuZ2V0Qm9vbGVhblN0YXJ0SW5kZXgoKSk7CisgICAgICAgIGFzc2VydEVxdWFscygzLCBub2RlMi5nZXRCb29sZWFuU3RhcnRJbmRleCgpKTsKKyAgICAgICAgYXNzZXJ0RXF1YWxzKDYsIG5vZGU0LmdldEJvb2xlYW5TdGFydEluZGV4KCkpOworCisgICAgICAgIGFzc2VydEVxdWFscygxNzUsIG5vZGUxLmdldE5leHRPZmZzZXQoKSk7CisgICAgICAgIGFzc2VydEVxdWFscygtMSwgbm9kZTIuZ2V0TmV4dE9mZnNldCgpKTsKKyAgICAgICAgYXNzZXJ0RXF1YWxzKC0xLCBub2RlNC5nZXROZXh0T2Zmc2V0KCkpOworCisgICAgICAgIGFzc2VydFRydWUobm9kZTEuaGFzUGFja2FnZUZpbmdlcnByaW50KCkpOworICAgICAgICBhc3NlcnRUcnVlKG5vZGUyLmhhc1BhY2thZ2VGaW5nZXJwcmludCgpKTsKKyAgICAgICAgYXNzZXJ0VHJ1ZShub2RlNC5oYXNQYWNrYWdlRmluZ2VycHJpbnQoKSk7CisgICAgfQogfQpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvamF2YS9TdG9yYWdlRmlsZVByb3ZpZGVyVGVzdC5qYXZhIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9zcmNzL1N0b3JhZ2VGaWxlUHJvdmlkZXJUZXN0LmphdmEKc2ltaWxhcml0eSBpbmRleCA2MyUKcmVuYW1lIGZyb20gdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvamF2YS9TdG9yYWdlRmlsZVByb3ZpZGVyVGVzdC5qYXZhCnJlbmFtZSB0byB0b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL3NyY3MvU3RvcmFnZUZpbGVQcm92aWRlclRlc3QuamF2YQppbmRleCBiYTFhZTllLi40ZTkwZTZjIDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9qYXZhL1N0b3JhZ2VGaWxlUHJvdmlkZXJUZXN0LmphdmEKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9zcmNzL1N0b3JhZ2VGaWxlUHJvdmlkZXJUZXN0LmphdmEKQEAgLTE3LDcgKzE3LDYgQEAKIHBhY2thZ2UgYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdDsKIAogaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydEVxdWFsczsKLWltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnRGYWxzZTsKIGltcG9ydCBzdGF0aWMgb3JnLmp1bml0LkFzc2VydC5hc3NlcnROb3ROdWxsOwogaW1wb3J0IHN0YXRpYyBvcmcuanVuaXQuQXNzZXJ0LmFzc2VydFRydWU7CiAKQEAgLTM4LDQzICszNywzMSBAQAogcHVibGljIGNsYXNzIFN0b3JhZ2VGaWxlUHJvdmlkZXJUZXN0IHsKIAogICAgIEBUZXN0Ci0gICAgcHVibGljIHZvaWQgdGVzdENvbnRhaW5lckZpbGVFeGlzdHMoKSB0aHJvd3MgRXhjZXB0aW9uIHsKLSAgICAgICAgU3RvcmFnZUZpbGVQcm92aWRlciBwID0KLSAgICAgICAgICAgICAgICBuZXcgU3RvcmFnZUZpbGVQcm92aWRlcihUZXN0RGF0YVV0aWxzLlRFU1REQVRBX1BBVEgsIFRlc3REYXRhVXRpbHMuVEVTVERBVEFfUEFUSCk7Ci0gICAgICAgIGFzc2VydFRydWUocC5jb250YWluZXJGaWxlRXhpc3RzKG51bGwpKTsKLSAgICAgICAgYXNzZXJ0VHJ1ZShwLmNvbnRhaW5lckZpbGVFeGlzdHMoIm1vY2t1cCIpKTsKLSAgICAgICAgYXNzZXJ0RmFsc2UocC5jb250YWluZXJGaWxlRXhpc3RzKCJmYWtlIikpOwotICAgIH0KLQotICAgIEBUZXN0CiAgICAgcHVibGljIHZvaWQgdGVzdExpc3RwYWNrYWdlTWFwRmlsZXMoKSB0aHJvd3MgRXhjZXB0aW9uIHsKICAgICAgICAgU3RvcmFnZUZpbGVQcm92aWRlciBwID0KICAgICAgICAgICAgICAgICBuZXcgU3RvcmFnZUZpbGVQcm92aWRlcihUZXN0RGF0YVV0aWxzLlRFU1REQVRBX1BBVEgsIFRlc3REYXRhVXRpbHMuVEVTVERBVEFfUEFUSCk7Ci0gICAgICAgIC8vIHRocm93IG5ldyBFeGNlcHRpb24oRW52aXJvbm1lbnQuZ2V0RXh0ZXJuYWxTdG9yYWdlRGlyZWN0b3J5KCkuZ2V0QWJzb2x1dGVQYXRoKCkpOwogICAgICAgICBMaXN0PFBhdGg+IGZpbGUgPSBwLmxpc3RQYWNrYWdlTWFwRmlsZXMoKTsKLSAgICAgICAgYXNzZXJ0RXF1YWxzKDEsIGZpbGUuc2l6ZSgpKTsKLSAgICAgICAgYXNzZXJ0VHJ1ZSgKLSAgICAgICAgICAgICAgICBmaWxlLmdldCgwKQotICAgICAgICAgICAgICAgICAgICAgICAgLmVxdWFscygKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUGF0aHMuZ2V0KAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRlc3REYXRhVXRpbHMuVEVTVERBVEFfUEFUSCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBUZXN0RGF0YVV0aWxzLlRFU1RfUEFDS0FHRV9NQVBfUEFUSCkpKTsKKyAgICAgICAgYXNzZXJ0RXF1YWxzKDIsIGZpbGUuc2l6ZSgpKTsKKworICAgICAgICBwID0gbmV3IFN0b3JhZ2VGaWxlUHJvdmlkZXIoImZha2UvcGF0aC8iLCAiZmFrZS9wYXRoLyIpOworICAgICAgICBmaWxlID0gcC5saXN0UGFja2FnZU1hcEZpbGVzKCk7CisgICAgICAgIGFzc2VydFRydWUoZmlsZS5pc0VtcHR5KCkpOwogICAgIH0KIAogICAgIEBUZXN0CiAgICAgcHVibGljIHZvaWQgdGVzdExvYWRGaWxlcygpIHRocm93cyBFeGNlcHRpb24gewogICAgICAgICBTdG9yYWdlRmlsZVByb3ZpZGVyIHAgPQogICAgICAgICAgICAgICAgIG5ldyBTdG9yYWdlRmlsZVByb3ZpZGVyKFRlc3REYXRhVXRpbHMuVEVTVERBVEFfUEFUSCwgVGVzdERhdGFVdGlscy5URVNUREFUQV9QQVRIKTsKLSAgICAgICAgUGFja2FnZVRhYmxlIHB0ID0gcC5nZXRQYWNrYWdlVGFibGUoIm1vY2t1cCIpOworICAgICAgICBQYWNrYWdlVGFibGUgcHQgPSBwLmdldFBhY2thZ2VUYWJsZSgibW9jay52MSIpOwogICAgICAgICBhc3NlcnROb3ROdWxsKHB0KTsKICAgICAgICAgcHQgPQogICAgICAgICAgICAgICAgIFN0b3JhZ2VGaWxlUHJvdmlkZXIuZ2V0UGFja2FnZVRhYmxlKAogICAgICAgICAgICAgICAgICAgICAgICAgUGF0aHMuZ2V0KAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBUZXN0RGF0YVV0aWxzLlRFU1REQVRBX1BBVEgsIFRlc3REYXRhVXRpbHMuVEVTVF9QQUNLQUdFX01BUF9QQVRIKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRlc3REYXRhVXRpbHMuVEVTVERBVEFfUEFUSCwgIm1vY2sudjEucGFja2FnZS5tYXAiKSk7CiAgICAgICAgIGFzc2VydE5vdE51bGwocHQpOwotICAgICAgICBGbGFnVGFibGUgZiA9IHAuZ2V0RmxhZ1RhYmxlKCJtb2NrdXAiKTsKKyAgICAgICAgRmxhZ1RhYmxlIGYgPSBwLmdldEZsYWdUYWJsZSgibW9jay52MSIpOwogICAgICAgICBhc3NlcnROb3ROdWxsKGYpOwotICAgICAgICBGbGFnVmFsdWVMaXN0IHYgPSBwLmdldEZsYWdWYWx1ZUxpc3QoIm1vY2t1cCIpOworICAgICAgICBGbGFnVmFsdWVMaXN0IHYgPSBwLmdldEZsYWdWYWx1ZUxpc3QoIm1vY2sudjEiKTsKICAgICAgICAgYXNzZXJ0Tm90TnVsbCh2KTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL3NyY3MvVGVzdERhdGFVdGlscy5qYXZhIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfZmlsZS90ZXN0cy9zcmNzL1Rlc3REYXRhVXRpbHMuamF2YQppbmRleCBmMzU5NTJkLi4zODg5NzFlIDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL3NyY3MvVGVzdERhdGFVdGlscy5qYXZhCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvc3Jjcy9UZXN0RGF0YVV0aWxzLmphdmEKQEAgLTIxLDI4ICsyMSwyNyBAQAogaW1wb3J0IGphdmEubmlvLkJ5dGVCdWZmZXI7CiAKIHB1YmxpYyBmaW5hbCBjbGFzcyBUZXN0RGF0YVV0aWxzIHsKLSAgICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgVEVTVF9QQUNLQUdFX01BUF9QQVRIID0gInBhY2thZ2UubWFwIjsKLSAgICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgVEVTVF9GTEFHX01BUF9QQVRIID0gImZsYWcubWFwIjsKLSAgICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgVEVTVF9GTEFHX1ZBTF9QQVRIID0gImZsYWcudmFsIjsKLSAgICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgVEVTVF9GTEFHX0lORk9fUEFUSCA9ICJmbGFnLmluZm8iOworICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBURVNUX1BBQ0tBR0VfTUFQX1BBVEggPSAibW9jay52JWQucGFja2FnZS5tYXAiOworICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBURVNUX0ZMQUdfTUFQX1BBVEggPSAibW9jay52JWQuZmxhZy5tYXAiOworICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBURVNUX0ZMQUdfVkFMX1BBVEggPSAibW9jay52JWQudmFsIjsKKyAgICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgVEVTVF9GTEFHX0lORk9fUEFUSCA9ICJtb2NrLnYlZC5pbmZvIjsKIAotICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBURVNUREFUQV9QQVRIID0KLSAgICAgICAgICAgICIvZGF0YS9sb2NhbC90bXAvYWNvbmZpZ19zdG9yYWdlX2ZpbGVfdGVzdF9qYXZhL3Rlc3RkYXRhLyI7CisgICAgcHVibGljIHN0YXRpYyBmaW5hbCBTdHJpbmcgVEVTVERBVEFfUEFUSCA9ICIvZGF0YS9sb2NhbC90bXAvYWNvbmZpZ19zdG9yYWdlX2ZpbGVfdGVzdF9qYXZhL3Rlc3RkYXRhLyI7CiAKLSAgICBwdWJsaWMgc3RhdGljIEJ5dGVCdWZmZXIgZ2V0VGVzdFBhY2thZ2VNYXBCeXRlQnVmZmVyKCkgdGhyb3dzIEV4Y2VwdGlvbiB7Ci0gICAgICAgIHJldHVybiByZWFkRmlsZShURVNUREFUQV9QQVRIICsgVEVTVF9QQUNLQUdFX01BUF9QQVRIKTsKKyAgICBwdWJsaWMgc3RhdGljIEJ5dGVCdWZmZXIgZ2V0VGVzdFBhY2thZ2VNYXBCeXRlQnVmZmVyKGludCB2ZXJzaW9uKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICAgICAgcmV0dXJuIHJlYWRGaWxlKFRFU1REQVRBX1BBVEggKyBTdHJpbmcuZm9ybWF0KFRFU1RfUEFDS0FHRV9NQVBfUEFUSCwgdmVyc2lvbikpOwogICAgIH0KIAotICAgIHB1YmxpYyBzdGF0aWMgQnl0ZUJ1ZmZlciBnZXRUZXN0RmxhZ01hcEJ5dGVCdWZmZXIoKSB0aHJvd3MgRXhjZXB0aW9uIHsKLSAgICAgICAgcmV0dXJuIHJlYWRGaWxlKFRFU1REQVRBX1BBVEggKyBURVNUX0ZMQUdfTUFQX1BBVEgpOworICAgIHB1YmxpYyBzdGF0aWMgQnl0ZUJ1ZmZlciBnZXRUZXN0RmxhZ01hcEJ5dGVCdWZmZXIoaW50IHZlcnNpb24pIHRocm93cyBFeGNlcHRpb24geworICAgICAgICByZXR1cm4gcmVhZEZpbGUoVEVTVERBVEFfUEFUSCArIFN0cmluZy5mb3JtYXQoVEVTVF9GTEFHX01BUF9QQVRILCB2ZXJzaW9uKSk7CiAgICAgfQogCi0gICAgcHVibGljIHN0YXRpYyBCeXRlQnVmZmVyIGdldFRlc3RGbGFnVmFsQnl0ZUJ1ZmZlcigpIHRocm93cyBFeGNlcHRpb24gewotICAgICAgICByZXR1cm4gcmVhZEZpbGUoVEVTVERBVEFfUEFUSCArIFRFU1RfRkxBR19WQUxfUEFUSCk7CisgICAgcHVibGljIHN0YXRpYyBCeXRlQnVmZmVyIGdldFRlc3RGbGFnVmFsQnl0ZUJ1ZmZlcihpbnQgdmVyc2lvbikgdGhyb3dzIEV4Y2VwdGlvbiB7CisgICAgICAgIHJldHVybiByZWFkRmlsZShURVNUREFUQV9QQVRIICsgU3RyaW5nLmZvcm1hdChURVNUX0ZMQUdfVkFMX1BBVEgsIHZlcnNpb24pKTsKICAgICB9CiAKLSAgICBwdWJsaWMgc3RhdGljIEJ5dGVCdWZmZXIgZ2V0VGVzdEZsYWdJbmZvQnl0ZUJ1ZmZlcigpIHRocm93cyBFeGNlcHRpb24gewotICAgICAgICByZXR1cm4gcmVhZEZpbGUoVEVTVERBVEFfUEFUSCArIFRFU1RfRkxBR19JTkZPX1BBVEgpOworICAgIHB1YmxpYyBzdGF0aWMgQnl0ZUJ1ZmZlciBnZXRUZXN0RmxhZ0luZm9CeXRlQnVmZmVyKGludCB2ZXJzaW9uKSB0aHJvd3MgRXhjZXB0aW9uIHsKKyAgICAgICAgcmV0dXJuIHJlYWRGaWxlKFRFU1REQVRBX1BBVEggKyBTdHJpbmcuZm9ybWF0KFRFU1RfRkxBR19JTkZPX1BBVEgsIHZlcnNpb24pKTsKICAgICB9CiAKICAgICBwcml2YXRlIHN0YXRpYyBCeXRlQnVmZmVyIHJlYWRGaWxlKFN0cmluZyBmaWxlTmFtZSkgdGhyb3dzIEV4Y2VwdGlvbiB7CmRpZmYgLS1naXQgYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9maWxlL3Rlc3RzL3N0b3JhZ2VfZmlsZV90ZXN0LmNwcCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvc3RvcmFnZV9maWxlX3Rlc3QuY3BwCmluZGV4IDM2MjZmNzIuLjVjMDA4YWYgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvc3RvcmFnZV9maWxlX3Rlc3QuY3BwCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX2ZpbGUvdGVzdHMvc3RvcmFnZV9maWxlX3Rlc3QuY3BwCkBAIC0yNCwxMCArMjQsOCBAQAogdXNpbmcgbmFtZXNwYWNlIGFuZHJvaWQ6OmJhc2U7CiB1c2luZyBuYW1lc3BhY2UgYWNvbmZpZ19zdG9yYWdlOwogCi12b2lkIHZlcmlmeV92YWx1ZShjb25zdCBGbGFnVmFsdWVTdW1tYXJ5JiBmbGFnLAotICAgICAgICAgICAgICAgICAgY29uc3Qgc3RkOjpzdHJpbmcmIHBhY2thZ2VfbmFtZSwKLSAgICAgICAgICAgICAgICAgIGNvbnN0IHN0ZDo6c3RyaW5nJiBmbGFnX25hbWUsCi0gICAgICAgICAgICAgICAgICBjb25zdCBzdGQ6OnN0cmluZyYgZmxhZ192YWwsCit2b2lkIHZlcmlmeV92YWx1ZShjb25zdCBGbGFnVmFsdWVTdW1tYXJ5JiBmbGFnLCBjb25zdCBzdGQ6OnN0cmluZyYgcGFja2FnZV9uYW1lLAorICAgICAgICAgICAgICAgICAgY29uc3Qgc3RkOjpzdHJpbmcmIGZsYWdfbmFtZSwgY29uc3Qgc3RkOjpzdHJpbmcmIGZsYWdfdmFsLAogICAgICAgICAgICAgICAgICAgY29uc3Qgc3RkOjpzdHJpbmcmIHZhbHVlX3R5cGUpIHsKICAgQVNTRVJUX0VRKGZsYWcucGFja2FnZV9uYW1lLCBwYWNrYWdlX25hbWUpOwogICBBU1NFUlRfRVEoZmxhZy5mbGFnX25hbWUsIGZsYWdfbmFtZSk7CkBAIC0zOSwxMCArMzcsOCBAQAogICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBzdGQ6OnN0cmluZyYgcGFja2FnZV9uYW1lLAogICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBzdGQ6OnN0cmluZyYgZmxhZ19uYW1lLAogICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBzdGQ6OnN0cmluZyYgZmxhZ192YWwsCi0gICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHN0ZDo6c3RyaW5nJiB2YWx1ZV90eXBlLAotICAgICAgICAgICAgICAgICAgICAgICBib29sIGlzX3JlYWR3cml0ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgYm9vbCBoYXNfc2VydmVyX292ZXJyaWRlLAotICAgICAgICAgICAgICAgICAgICAgICBib29sIGhhc19sb2NhbF9vdmVycmlkZSkgeworICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBzdGQ6OnN0cmluZyYgdmFsdWVfdHlwZSwgYm9vbCBpc19yZWFkd3JpdGUsCisgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgaGFzX3NlcnZlcl9vdmVycmlkZSwgYm9vbCBoYXNfbG9jYWxfb3ZlcnJpZGUpIHsKICAgQVNTRVJUX0VRKGZsYWcucGFja2FnZV9uYW1lLCBwYWNrYWdlX25hbWUpOwogICBBU1NFUlRfRVEoZmxhZy5mbGFnX25hbWUsIGZsYWdfbmFtZSk7CiAgIEFTU0VSVF9FUShmbGFnLmZsYWdfdmFsdWUsIGZsYWdfdmFsKTsKQEAgLTUyLDYzICs0OCwxMzcgQEAKICAgQVNTRVJUX0VRKGZsYWcuaGFzX2xvY2FsX292ZXJyaWRlLCBoYXNfbG9jYWxfb3ZlcnJpZGUpOwogfQogCi1URVNUKEFjb25maWdTdG9yYWdlRmlsZVRlc3QsIHRlc3RfbGlzdF9mbGFnKSB7CitSZXN1bHQ8c3RkOjp2ZWN0b3I8RmxhZ1ZhbHVlU3VtbWFyeT4+IGdldF9mbGFnX2xpc3RfcmVzdWx0KAorICAgIGNvbnN0IHN0ZDo6c3RyaW5nIHZlcnNpb24pIHsKICAgYXV0byBjb25zdCB0ZXN0X2Jhc2VfZGlyID0gR2V0RXhlY3V0YWJsZURpcmVjdG9yeSgpOwotICBhdXRvIGNvbnN0IHRlc3RfZGlyID0gdGVzdF9iYXNlX2RpciArICIvZGF0YS92MSI7Ci0gIGF1dG8gY29uc3QgcGFja2FnZV9tYXAgPSB0ZXN0X2RpciArICIvcGFja2FnZS5tYXAiOwotICBhdXRvIGNvbnN0IGZsYWdfbWFwID0gdGVzdF9kaXIgKyAiL2ZsYWcubWFwIjsKLSAgYXV0byBjb25zdCBmbGFnX3ZhbCA9IHRlc3RfZGlyICsgIi9mbGFnLnZhbCI7Ci0gIGF1dG8gZmxhZ19saXN0X3Jlc3VsdCA9IGFjb25maWdfc3RvcmFnZTo6bGlzdF9mbGFncygKLSAgICAgIHBhY2thZ2VfbWFwLCBmbGFnX21hcCwgZmxhZ192YWwpOworICBhdXRvIGNvbnN0IHRlc3RfZGlyID0gdGVzdF9iYXNlX2RpciArICIvZGF0YS92IiArIHZlcnNpb247CisgIGF1dG8gY29uc3QgcGFja2FnZV9tYXAgPSB0ZXN0X2RpciArICIvcGFja2FnZV92IiArIHZlcnNpb24gKyAiLm1hcCI7CisgIGF1dG8gY29uc3QgZmxhZ19tYXAgPSB0ZXN0X2RpciArICIvZmxhZ192IiArIHZlcnNpb24gKyAiLm1hcCI7CisgIGF1dG8gY29uc3QgZmxhZ192YWwgPSB0ZXN0X2RpciArICIvZmxhZ192IiArIHZlcnNpb24gKyAiLnZhbCI7CisgIHJldHVybiBhY29uZmlnX3N0b3JhZ2U6Omxpc3RfZmxhZ3MocGFja2FnZV9tYXAsIGZsYWdfbWFwLCBmbGFnX3ZhbCk7Cit9CisKK1Jlc3VsdDxzdGQ6OnZlY3RvcjxGbGFnVmFsdWVBbmRJbmZvU3VtbWFyeT4+IGdldF9mbGFnX2xpc3RfcmVzdWx0X3dpdGhfaW5mbygKKyAgICBjb25zdCBzdGQ6OnN0cmluZyB2ZXJzaW9uKSB7CisgIGF1dG8gY29uc3QgdGVzdF9iYXNlX2RpciA9IEdldEV4ZWN1dGFibGVEaXJlY3RvcnkoKTsKKyAgYXV0byBjb25zdCB0ZXN0X2RpciA9IHRlc3RfYmFzZV9kaXIgKyAiL2RhdGEvdiIgKyB2ZXJzaW9uOworICBhdXRvIGNvbnN0IHBhY2thZ2VfbWFwID0gdGVzdF9kaXIgKyAiL3BhY2thZ2VfdiIgKyB2ZXJzaW9uICsgIi5tYXAiOworICBhdXRvIGNvbnN0IGZsYWdfbWFwID0gdGVzdF9kaXIgKyAiL2ZsYWdfdiIgKyB2ZXJzaW9uICsgIi5tYXAiOworICBhdXRvIGNvbnN0IGZsYWdfdmFsID0gdGVzdF9kaXIgKyAiL2ZsYWdfdiIgKyB2ZXJzaW9uICsgIi52YWwiOworICBhdXRvIGNvbnN0IGZsYWdfaW5mbyA9IHRlc3RfZGlyICsgIi9mbGFnX3YiICsgdmVyc2lvbiArICIuaW5mbyI7CisgIHJldHVybiBhY29uZmlnX3N0b3JhZ2U6Omxpc3RfZmxhZ3Nfd2l0aF9pbmZvKHBhY2thZ2VfbWFwLCBmbGFnX21hcCwgZmxhZ192YWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsYWdfaW5mbyk7Cit9CisKK1RFU1QoQWNvbmZpZ1N0b3JhZ2VGaWxlVGVzdCwgdGVzdF9saXN0X2ZsYWcpIHsKKyAgYXV0byBmbGFnX2xpc3RfcmVzdWx0ID0gZ2V0X2ZsYWdfbGlzdF9yZXN1bHQoIjEiKTsKICAgQVNTRVJUX1RSVUUoZmxhZ19saXN0X3Jlc3VsdC5vaygpKTsKIAogICBhdXRvIGNvbnN0JiBmbGFnX2xpc3QgPSAqZmxhZ19saXN0X3Jlc3VsdDsKICAgQVNTRVJUX0VRKGZsYWdfbGlzdC5zaXplKCksIDgpOwotICB2ZXJpZnlfdmFsdWUoZmxhZ19saXN0WzBdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMSIsICJkaXNhYmxlZF9ydyIsCi0gICAgICAgICAgICAgICAiZmFsc2UiLCAiUmVhZFdyaXRlQm9vbGVhbiIpOworICB2ZXJpZnlfdmFsdWUoZmxhZ19saXN0WzBdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMSIsCisgICAgICAgICAgICAgICAiZGlzYWJsZWRfcnciLCAiZmFsc2UiLCAiUmVhZFdyaXRlQm9vbGVhbiIpOwogICB2ZXJpZnlfdmFsdWUoZmxhZ19saXN0WzFdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMSIsICJlbmFibGVkX3JvIiwKICAgICAgICAgICAgICAgICJ0cnVlIiwgIlJlYWRPbmx5Qm9vbGVhbiIpOwogICB2ZXJpZnlfdmFsdWUoZmxhZ19saXN0WzJdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMSIsICJlbmFibGVkX3J3IiwKICAgICAgICAgICAgICAgICJ0cnVlIiwgIlJlYWRXcml0ZUJvb2xlYW4iKTsKLSAgdmVyaWZ5X3ZhbHVlKGZsYWdfbGlzdFszXSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzIiLCAiZGlzYWJsZWRfcnciLAotICAgICAgICAgICAgICAgImZhbHNlIiwgIlJlYWRXcml0ZUJvb2xlYW4iKTsKLSAgdmVyaWZ5X3ZhbHVlKGZsYWdfbGlzdFs0XSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzIiLCAiZW5hYmxlZF9maXhlZF9ybyIsCi0gICAgICAgICAgICAgICAidHJ1ZSIsICJGaXhlZFJlYWRPbmx5Qm9vbGVhbiIpOworICB2ZXJpZnlfdmFsdWUoZmxhZ19saXN0WzNdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMiIsCisgICAgICAgICAgICAgICAiZGlzYWJsZWRfcnciLCAiZmFsc2UiLCAiUmVhZFdyaXRlQm9vbGVhbiIpOworICB2ZXJpZnlfdmFsdWUoZmxhZ19saXN0WzRdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMiIsCisgICAgICAgICAgICAgICAiZW5hYmxlZF9maXhlZF9ybyIsICJ0cnVlIiwgIkZpeGVkUmVhZE9ubHlCb29sZWFuIik7CiAgIHZlcmlmeV92YWx1ZShmbGFnX2xpc3RbNV0sICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8yIiwgImVuYWJsZWRfcm8iLAogICAgICAgICAgICAgICAgInRydWUiLCAiUmVhZE9ubHlCb29sZWFuIik7Ci0gIHZlcmlmeV92YWx1ZShmbGFnX2xpc3RbNl0sICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF80IiwgImVuYWJsZWRfZml4ZWRfcm8iLAotICAgICAgICAgICAgICAgInRydWUiLCAiRml4ZWRSZWFkT25seUJvb2xlYW4iKTsKKyAgdmVyaWZ5X3ZhbHVlKGZsYWdfbGlzdFs2XSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzQiLAorICAgICAgICAgICAgICAgImVuYWJsZWRfZml4ZWRfcm8iLCAidHJ1ZSIsICJGaXhlZFJlYWRPbmx5Qm9vbGVhbiIpOworICB2ZXJpZnlfdmFsdWUoZmxhZ19saXN0WzddLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfNCIsICJlbmFibGVkX3J3IiwKKyAgICAgICAgICAgICAgICJ0cnVlIiwgIlJlYWRXcml0ZUJvb2xlYW4iKTsKK30KKworLy8gVE9ETzogYi8zNzYyNTY0NzIgLSBVc2UgcGFyYW1ldGVyaXplZCB0ZXN0cy4KK1RFU1QoQWNvbmZpZ1N0b3JhZ2VGaWxlVGVzdCwgdGVzdF9saXN0X2ZsYWdfdjIpIHsKKyAgYXV0byBmbGFnX2xpc3RfcmVzdWx0ID0gZ2V0X2ZsYWdfbGlzdF9yZXN1bHQoIjIiKTsKKyAgQVNTRVJUX1RSVUUoZmxhZ19saXN0X3Jlc3VsdC5vaygpKTsKKworICBhdXRvIGNvbnN0JiBmbGFnX2xpc3QgPSAqZmxhZ19saXN0X3Jlc3VsdDsKKyAgQVNTRVJUX0VRKGZsYWdfbGlzdC5zaXplKCksIDgpOworICB2ZXJpZnlfdmFsdWUoZmxhZ19saXN0WzBdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMSIsCisgICAgICAgICAgICAgICAiZGlzYWJsZWRfcnciLCAiZmFsc2UiLCAiUmVhZFdyaXRlQm9vbGVhbiIpOworICB2ZXJpZnlfdmFsdWUoZmxhZ19saXN0WzFdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMSIsICJlbmFibGVkX3JvIiwKKyAgICAgICAgICAgICAgICJ0cnVlIiwgIlJlYWRPbmx5Qm9vbGVhbiIpOworICB2ZXJpZnlfdmFsdWUoZmxhZ19saXN0WzJdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMSIsICJlbmFibGVkX3J3IiwKKyAgICAgICAgICAgICAgICJ0cnVlIiwgIlJlYWRXcml0ZUJvb2xlYW4iKTsKKyAgdmVyaWZ5X3ZhbHVlKGZsYWdfbGlzdFszXSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzIiLAorICAgICAgICAgICAgICAgImRpc2FibGVkX3J3IiwgImZhbHNlIiwgIlJlYWRXcml0ZUJvb2xlYW4iKTsKKyAgdmVyaWZ5X3ZhbHVlKGZsYWdfbGlzdFs0XSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzIiLAorICAgICAgICAgICAgICAgImVuYWJsZWRfZml4ZWRfcm8iLCAidHJ1ZSIsICJGaXhlZFJlYWRPbmx5Qm9vbGVhbiIpOworICB2ZXJpZnlfdmFsdWUoZmxhZ19saXN0WzVdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMiIsICJlbmFibGVkX3JvIiwKKyAgICAgICAgICAgICAgICJ0cnVlIiwgIlJlYWRPbmx5Qm9vbGVhbiIpOworICB2ZXJpZnlfdmFsdWUoZmxhZ19saXN0WzZdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfNCIsCisgICAgICAgICAgICAgICAiZW5hYmxlZF9maXhlZF9ybyIsICJ0cnVlIiwgIkZpeGVkUmVhZE9ubHlCb29sZWFuIik7CiAgIHZlcmlmeV92YWx1ZShmbGFnX2xpc3RbN10sICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF80IiwgImVuYWJsZWRfcnciLAogICAgICAgICAgICAgICAgInRydWUiLCAiUmVhZFdyaXRlQm9vbGVhbiIpOwogfQogCiBURVNUKEFjb25maWdTdG9yYWdlRmlsZVRlc3QsIHRlc3RfbGlzdF9mbGFnX3dpdGhfaW5mbykgewotICBhdXRvIGNvbnN0IGJhc2VfdGVzdF9kaXIgPSBHZXRFeGVjdXRhYmxlRGlyZWN0b3J5KCk7Ci0gIGF1dG8gY29uc3QgdGVzdF9kaXIgPSBiYXNlX3Rlc3RfZGlyICsgIi9kYXRhL3YxIjsKLSAgYXV0byBjb25zdCBwYWNrYWdlX21hcCA9IHRlc3RfZGlyICsgIi9wYWNrYWdlLm1hcCI7Ci0gIGF1dG8gY29uc3QgZmxhZ19tYXAgPSB0ZXN0X2RpciArICIvZmxhZy5tYXAiOwotICBhdXRvIGNvbnN0IGZsYWdfdmFsID0gdGVzdF9kaXIgKyAiL2ZsYWcudmFsIjsKLSAgYXV0byBjb25zdCBmbGFnX2luZm8gPSB0ZXN0X2RpciArICIvZmxhZy5pbmZvIjsKLSAgYXV0byBmbGFnX2xpc3RfcmVzdWx0ID0gYWNvbmZpZ19zdG9yYWdlOjpsaXN0X2ZsYWdzX3dpdGhfaW5mbygKLSAgICAgIHBhY2thZ2VfbWFwLCBmbGFnX21hcCwgZmxhZ192YWwsIGZsYWdfaW5mbyk7CisgIGF1dG8gZmxhZ19saXN0X3Jlc3VsdCA9IGdldF9mbGFnX2xpc3RfcmVzdWx0X3dpdGhfaW5mbygiMSIpOwogICBBU1NFUlRfVFJVRShmbGFnX2xpc3RfcmVzdWx0Lm9rKCkpOwogCiAgIGF1dG8gY29uc3QmIGZsYWdfbGlzdCA9ICpmbGFnX2xpc3RfcmVzdWx0OwogICBBU1NFUlRfRVEoZmxhZ19saXN0LnNpemUoKSwgOCk7Ci0gIHZlcmlmeV92YWx1ZV9pbmZvKGZsYWdfbGlzdFswXSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzEiLCAiZGlzYWJsZWRfcnciLAotICAgICAgICAgICAgICAgICAgICAiZmFsc2UiLCAiUmVhZFdyaXRlQm9vbGVhbiIsIHRydWUsIGZhbHNlLCBmYWxzZSk7Ci0gIHZlcmlmeV92YWx1ZV9pbmZvKGZsYWdfbGlzdFsxXSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzEiLCAiZW5hYmxlZF9ybyIsCi0gICAgICAgICAgICAgICAgICAgICJ0cnVlIiwgIlJlYWRPbmx5Qm9vbGVhbiIsIGZhbHNlLCBmYWxzZSwgZmFsc2UpOwotICB2ZXJpZnlfdmFsdWVfaW5mbyhmbGFnX2xpc3RbMl0sICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8xIiwgImVuYWJsZWRfcnciLAotICAgICAgICAgICAgICAgICAgICAidHJ1ZSIsICJSZWFkV3JpdGVCb29sZWFuIiwgdHJ1ZSwgZmFsc2UsIGZhbHNlKTsKLSAgdmVyaWZ5X3ZhbHVlX2luZm8oZmxhZ19saXN0WzNdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMiIsICJkaXNhYmxlZF9ydyIsCi0gICAgICAgICAgICAgICAgICAgICJmYWxzZSIsICJSZWFkV3JpdGVCb29sZWFuIiwgdHJ1ZSwgZmFsc2UsIGZhbHNlKTsKLSAgdmVyaWZ5X3ZhbHVlX2luZm8oZmxhZ19saXN0WzRdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMiIsICJlbmFibGVkX2ZpeGVkX3JvIiwKLSAgICAgICAgICAgICAgICAgICAgInRydWUiLCAiRml4ZWRSZWFkT25seUJvb2xlYW4iLCBmYWxzZSwgZmFsc2UsIGZhbHNlKTsKLSAgdmVyaWZ5X3ZhbHVlX2luZm8oZmxhZ19saXN0WzVdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMiIsICJlbmFibGVkX3JvIiwKLSAgICAgICAgICAgICAgICAgICAgInRydWUiLCAiUmVhZE9ubHlCb29sZWFuIiwgZmFsc2UsIGZhbHNlLCBmYWxzZSk7Ci0gIHZlcmlmeV92YWx1ZV9pbmZvKGZsYWdfbGlzdFs2XSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzQiLCAiZW5hYmxlZF9maXhlZF9ybyIsCi0gICAgICAgICAgICAgICAgICAgICJ0cnVlIiwgIkZpeGVkUmVhZE9ubHlCb29sZWFuIiwgZmFsc2UsIGZhbHNlLCBmYWxzZSk7Ci0gIHZlcmlmeV92YWx1ZV9pbmZvKGZsYWdfbGlzdFs3XSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzQiLCAiZW5hYmxlZF9ydyIsCi0gICAgICAgICAgICAgICAgICAgICJ0cnVlIiwgIlJlYWRXcml0ZUJvb2xlYW4iLCB0cnVlLCBmYWxzZSwgZmFsc2UpOworICB2ZXJpZnlfdmFsdWVfaW5mbyhmbGFnX2xpc3RbMF0sICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8xIiwKKyAgICAgICAgICAgICAgICAgICAgImRpc2FibGVkX3J3IiwgImZhbHNlIiwgIlJlYWRXcml0ZUJvb2xlYW4iLCB0cnVlLCBmYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgZmFsc2UpOworICB2ZXJpZnlfdmFsdWVfaW5mbyhmbGFnX2xpc3RbMV0sICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8xIiwKKyAgICAgICAgICAgICAgICAgICAgImVuYWJsZWRfcm8iLCAidHJ1ZSIsICJSZWFkT25seUJvb2xlYW4iLCBmYWxzZSwgZmFsc2UsCisgICAgICAgICAgICAgICAgICAgIGZhbHNlKTsKKyAgdmVyaWZ5X3ZhbHVlX2luZm8oZmxhZ19saXN0WzJdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMSIsCisgICAgICAgICAgICAgICAgICAgICJlbmFibGVkX3J3IiwgInRydWUiLCAiUmVhZFdyaXRlQm9vbGVhbiIsIHRydWUsIGZhbHNlLAorICAgICAgICAgICAgICAgICAgICBmYWxzZSk7CisgIHZlcmlmeV92YWx1ZV9pbmZvKGZsYWdfbGlzdFszXSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzIiLAorICAgICAgICAgICAgICAgICAgICAiZGlzYWJsZWRfcnciLCAiZmFsc2UiLCAiUmVhZFdyaXRlQm9vbGVhbiIsIHRydWUsIGZhbHNlLAorICAgICAgICAgICAgICAgICAgICBmYWxzZSk7CisgIHZlcmlmeV92YWx1ZV9pbmZvKGZsYWdfbGlzdFs0XSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzIiLAorICAgICAgICAgICAgICAgICAgICAiZW5hYmxlZF9maXhlZF9ybyIsICJ0cnVlIiwgIkZpeGVkUmVhZE9ubHlCb29sZWFuIiwgZmFsc2UsCisgICAgICAgICAgICAgICAgICAgIGZhbHNlLCBmYWxzZSk7CisgIHZlcmlmeV92YWx1ZV9pbmZvKGZsYWdfbGlzdFs1XSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzIiLAorICAgICAgICAgICAgICAgICAgICAiZW5hYmxlZF9ybyIsICJ0cnVlIiwgIlJlYWRPbmx5Qm9vbGVhbiIsIGZhbHNlLCBmYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgZmFsc2UpOworICB2ZXJpZnlfdmFsdWVfaW5mbyhmbGFnX2xpc3RbNl0sICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF80IiwKKyAgICAgICAgICAgICAgICAgICAgImVuYWJsZWRfZml4ZWRfcm8iLCAidHJ1ZSIsICJGaXhlZFJlYWRPbmx5Qm9vbGVhbiIsIGZhbHNlLAorICAgICAgICAgICAgICAgICAgICBmYWxzZSwgZmFsc2UpOworICB2ZXJpZnlfdmFsdWVfaW5mbyhmbGFnX2xpc3RbN10sICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF80IiwKKyAgICAgICAgICAgICAgICAgICAgImVuYWJsZWRfcnciLCAidHJ1ZSIsICJSZWFkV3JpdGVCb29sZWFuIiwgdHJ1ZSwgZmFsc2UsCisgICAgICAgICAgICAgICAgICAgIGZhbHNlKTsKK30KKworVEVTVChBY29uZmlnU3RvcmFnZUZpbGVUZXN0LCB0ZXN0X2xpc3RfZmxhZ193aXRoX2luZm9fdjIpIHsKKyAgYXV0byBmbGFnX2xpc3RfcmVzdWx0ID0gZ2V0X2ZsYWdfbGlzdF9yZXN1bHRfd2l0aF9pbmZvKCIyIik7CisgIEFTU0VSVF9UUlVFKGZsYWdfbGlzdF9yZXN1bHQub2soKSk7CisKKyAgYXV0byBjb25zdCYgZmxhZ19saXN0ID0gKmZsYWdfbGlzdF9yZXN1bHQ7CisgIEFTU0VSVF9FUShmbGFnX2xpc3Quc2l6ZSgpLCA4KTsKKyAgdmVyaWZ5X3ZhbHVlX2luZm8oZmxhZ19saXN0WzBdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMSIsCisgICAgICAgICAgICAgICAgICAgICJkaXNhYmxlZF9ydyIsICJmYWxzZSIsICJSZWFkV3JpdGVCb29sZWFuIiwgdHJ1ZSwgZmFsc2UsCisgICAgICAgICAgICAgICAgICAgIGZhbHNlKTsKKyAgdmVyaWZ5X3ZhbHVlX2luZm8oZmxhZ19saXN0WzFdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMSIsCisgICAgICAgICAgICAgICAgICAgICJlbmFibGVkX3JvIiwgInRydWUiLCAiUmVhZE9ubHlCb29sZWFuIiwgZmFsc2UsIGZhbHNlLAorICAgICAgICAgICAgICAgICAgICBmYWxzZSk7CisgIHZlcmlmeV92YWx1ZV9pbmZvKGZsYWdfbGlzdFsyXSwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzEiLAorICAgICAgICAgICAgICAgICAgICAiZW5hYmxlZF9ydyIsICJ0cnVlIiwgIlJlYWRXcml0ZUJvb2xlYW4iLCB0cnVlLCBmYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgZmFsc2UpOworICB2ZXJpZnlfdmFsdWVfaW5mbyhmbGFnX2xpc3RbM10sICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8yIiwKKyAgICAgICAgICAgICAgICAgICAgImRpc2FibGVkX3J3IiwgImZhbHNlIiwgIlJlYWRXcml0ZUJvb2xlYW4iLCB0cnVlLCBmYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgZmFsc2UpOworICB2ZXJpZnlfdmFsdWVfaW5mbyhmbGFnX2xpc3RbNF0sICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8yIiwKKyAgICAgICAgICAgICAgICAgICAgImVuYWJsZWRfZml4ZWRfcm8iLCAidHJ1ZSIsICJGaXhlZFJlYWRPbmx5Qm9vbGVhbiIsIGZhbHNlLAorICAgICAgICAgICAgICAgICAgICBmYWxzZSwgZmFsc2UpOworICB2ZXJpZnlfdmFsdWVfaW5mbyhmbGFnX2xpc3RbNV0sICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8yIiwKKyAgICAgICAgICAgICAgICAgICAgImVuYWJsZWRfcm8iLCAidHJ1ZSIsICJSZWFkT25seUJvb2xlYW4iLCBmYWxzZSwgZmFsc2UsCisgICAgICAgICAgICAgICAgICAgIGZhbHNlKTsKKyAgdmVyaWZ5X3ZhbHVlX2luZm8oZmxhZ19saXN0WzZdLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfNCIsCisgICAgICAgICAgICAgICAgICAgICJlbmFibGVkX2ZpeGVkX3JvIiwgInRydWUiLCAiRml4ZWRSZWFkT25seUJvb2xlYW4iLCBmYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgZmFsc2UsIGZhbHNlKTsKKyAgdmVyaWZ5X3ZhbHVlX2luZm8oZmxhZ19saXN0WzddLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfNCIsCisgICAgICAgICAgICAgICAgICAgICJlbmFibGVkX3J3IiwgInRydWUiLCAiUmVhZFdyaXRlQm9vbGVhbiIsIHRydWUsIGZhbHNlLAorICAgICAgICAgICAgICAgICAgICBmYWxzZSk7CiB9CmRpZmYgLS1naXQgYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS9BbmRyb2lkLmJwIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvQW5kcm9pZC5icAppbmRleCA2NjZjNWJhLi4zMjM4ZDc5IDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS9BbmRyb2lkLmJwCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL0FuZHJvaWQuYnAKQEAgLTM2LDEwICszNiwxMCBAQAogICAgICAgICAibGlicmFuZCIsCiAgICAgXSwKICAgICBkYXRhOiBbCi0gICAgICAgICJ0ZXN0cy9kYXRhL3YxL3BhY2thZ2UubWFwIiwKLSAgICAgICAgInRlc3RzL2RhdGEvdjEvZmxhZy5tYXAiLAotICAgICAgICAidGVzdHMvZGF0YS92MS9mbGFnLnZhbCIsCi0gICAgICAgICJ0ZXN0cy9kYXRhL3YxL2ZsYWcuaW5mbyIsCisgICAgICAgICJ0ZXN0cy9kYXRhL3YxL3BhY2thZ2VfdjEubWFwIiwKKyAgICAgICAgInRlc3RzL2RhdGEvdjEvZmxhZ192MS5tYXAiLAorICAgICAgICAidGVzdHMvZGF0YS92MS9mbGFnX3YxLnZhbCIsCisgICAgICAgICJ0ZXN0cy9kYXRhL3YxL2ZsYWdfdjEuaW5mbyIsCiAgICAgXSwKIH0KIApAQCAtMTU1LDcgKzE1NSw2IEBACiAgICAgbmFtZTogImFjb25maWdfc3RvcmFnZV9yZWFkZXJfamF2YSIsCiAgICAgc3JjczogWwogICAgICAgICAic3Jjcy9hbmRyb2lkL2Fjb25maWcvc3RvcmFnZS9BY29uZmlnUGFja2FnZUltcGwuamF2YSIsCi0gICAgICAgICJzcmNzL2FuZHJvaWQvYWNvbmZpZy9zdG9yYWdlL1N0b3JhZ2VGaWxlUHJvdmlkZXIuamF2YSIsCiAgICAgICAgICJzcmNzL2FuZHJvaWQvYWNvbmZpZy9zdG9yYWdlL1N0b3JhZ2VJbnRlcm5hbFJlYWRlci5qYXZhIiwKICAgICBdLAogICAgIGxpYnM6IFsKQEAgLTE3OCw3ICsxNzcsNiBAQAogICAgIG5hbWU6ICJhY29uZmlnX3N0b3JhZ2VfcmVhZGVyX2phdmFfbm9uZSIsCiAgICAgc3JjczogWwogICAgICAgICAic3Jjcy9hbmRyb2lkL2Fjb25maWcvc3RvcmFnZS9BY29uZmlnUGFja2FnZUltcGwuamF2YSIsCi0gICAgICAgICJzcmNzL2FuZHJvaWQvYWNvbmZpZy9zdG9yYWdlL1N0b3JhZ2VGaWxlUHJvdmlkZXIuamF2YSIsCiAgICAgICAgICJzcmNzL2FuZHJvaWQvYWNvbmZpZy9zdG9yYWdlL1N0b3JhZ2VJbnRlcm5hbFJlYWRlci5qYXZhIiwKICAgICBdLAogICAgIGxpYnM6IFsKZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3NyYy9mbGFnX2luZm9fcXVlcnkucnMgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS9zcmMvZmxhZ19pbmZvX3F1ZXJ5LnJzCmluZGV4IGZlNTdhNmQuLjY4YjYxOTMgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3NyYy9mbGFnX2luZm9fcXVlcnkucnMKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvc3JjL2ZsYWdfaW5mb19xdWVyeS5ycwpAQCAtNTUsMTIgKzU1LDE0IEBACiAjW2NmZyh0ZXN0KV0KIG1vZCB0ZXN0cyB7CiAgICAgdXNlIHN1cGVyOjoqOwotICAgIHVzZSBhY29uZmlnX3N0b3JhZ2VfZmlsZTo6e3Rlc3RfdXRpbHM6OmNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0LCBGbGFnSW5mb0JpdH07CisgICAgdXNlIGFjb25maWdfc3RvcmFnZV9maWxlOjp7CisgICAgICAgIHRlc3RfdXRpbHM6OmNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0LCBGbGFnSW5mb0JpdCwgREVGQVVMVF9GSUxFX1ZFUlNJT04sCisgICAgfTsKIAogICAgICNbdGVzdF0KICAgICAvLyB0aGlzIHRlc3QgcG9pbnQgbG9ja3MgZG93biBxdWVyeSBpZiBmbGFnIGhhcyBzZXJ2ZXIgb3ZlcnJpZGUKICAgICBmbiB0ZXN0X2lzX2ZsYWdfc3RpY2t5KCkgewotICAgICAgICBsZXQgZmxhZ19pbmZvX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX2luZm9fbGlzdCgpLmludG9fYnl0ZXMoKTsKKyAgICAgICAgbGV0IGZsYWdfaW5mb19saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ19pbmZvX2xpc3QoREVGQVVMVF9GSUxFX1ZFUlNJT04pLmludG9fYnl0ZXMoKTsKICAgICAgICAgZm9yIG9mZnNldCBpbiAwLi44IHsKICAgICAgICAgICAgIGxldCBhdHRyaWJ1dGUgPQogICAgICAgICAgICAgICAgIGZpbmRfZmxhZ19hdHRyaWJ1dGUoJmZsYWdfaW5mb19saXN0Wy4uXSwgRmxhZ1ZhbHVlVHlwZTo6Qm9vbGVhbiwgb2Zmc2V0KS51bndyYXAoKTsKQEAgLTcxLDcgKzczLDcgQEAKICAgICAjW3Rlc3RdCiAgICAgLy8gdGhpcyB0ZXN0IHBvaW50IGxvY2tzIGRvd24gcXVlcnkgaWYgZmxhZyBpcyByZWFkd3JpdGUKICAgICBmbiB0ZXN0X2lzX2ZsYWdfcmVhZHdyaXRlKCkgewotICAgICAgICBsZXQgZmxhZ19pbmZvX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX2luZm9fbGlzdCgpLmludG9fYnl0ZXMoKTsKKyAgICAgICAgbGV0IGZsYWdfaW5mb19saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ19pbmZvX2xpc3QoREVGQVVMVF9GSUxFX1ZFUlNJT04pLmludG9fYnl0ZXMoKTsKICAgICAgICAgbGV0IGJhc2VsaW5lOiBWZWM8Ym9vbD4gPSB2ZWMhW3RydWUsIGZhbHNlLCB0cnVlLCB0cnVlLCBmYWxzZSwgZmFsc2UsIGZhbHNlLCB0cnVlXTsKICAgICAgICAgZm9yIG9mZnNldCBpbiAwLi44IHsKICAgICAgICAgICAgIGxldCBhdHRyaWJ1dGUgPQpAQCAtODYsNyArODgsNyBAQAogICAgICNbdGVzdF0KICAgICAvLyB0aGlzIHRlc3QgcG9pbnQgbG9ja3MgZG93biBxdWVyeSBpZiBmbGFnIGhhcyBsb2NhbCBvdmVycmlkZQogICAgIGZuIHRlc3RfZmxhZ19oYXNfb3ZlcnJpZGUoKSB7Ci0gICAgICAgIGxldCBmbGFnX2luZm9fbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0KCkuaW50b19ieXRlcygpOworICAgICAgICBsZXQgZmxhZ19pbmZvX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX2luZm9fbGlzdChERUZBVUxUX0ZJTEVfVkVSU0lPTikuaW50b19ieXRlcygpOwogICAgICAgICBmb3Igb2Zmc2V0IGluIDAuLjggewogICAgICAgICAgICAgbGV0IGF0dHJpYnV0ZSA9CiAgICAgICAgICAgICAgICAgZmluZF9mbGFnX2F0dHJpYnV0ZSgmZmxhZ19pbmZvX2xpc3RbLi5dLCBGbGFnVmFsdWVUeXBlOjpCb29sZWFuLCBvZmZzZXQpLnVud3JhcCgpOwpAQCAtOTcsNyArOTksNyBAQAogICAgICNbdGVzdF0KICAgICAvLyB0aGlzIHRlc3QgcG9pbnQgbG9ja3MgZG93biBxdWVyeSBiZXlvbmQgdGhlIGVuZCBvZiBib29sZWFuIHNlY3Rpb24KICAgICBmbiB0ZXN0X2Jvb2xlYW5fb3V0X29mX3JhbmdlKCkgewotICAgICAgICBsZXQgZmxhZ19pbmZvX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX2luZm9fbGlzdCgpLmludG9fYnl0ZXMoKTsKKyAgICAgICAgbGV0IGZsYWdfaW5mb19saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ19pbmZvX2xpc3QoREVGQVVMVF9GSUxFX1ZFUlNJT04pLmludG9fYnl0ZXMoKTsKICAgICAgICAgbGV0IGVycm9yID0KICAgICAgICAgICAgIGZpbmRfZmxhZ19hdHRyaWJ1dGUoJmZsYWdfaW5mb19saXN0Wy4uXSwgRmxhZ1ZhbHVlVHlwZTo6Qm9vbGVhbiwgOCkudW53cmFwX2VycigpOwogICAgICAgICBhc3NlcnRfZXEhKApAQCAtMTA5LDcgKzExMSw3IEBACiAgICAgI1t0ZXN0XQogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIHF1ZXJ5IGVycm9yIHdoZW4gZmlsZSBoYXMgYSBoaWdoZXIgdmVyc2lvbgogICAgIGZuIHRlc3RfaGlnaGVyX3ZlcnNpb25fc3RvcmFnZV9maWxlKCkgewotICAgICAgICBsZXQgbXV0IGluZm9fbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0KCk7CisgICAgICAgIGxldCBtdXQgaW5mb19saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ19pbmZvX2xpc3QoREVGQVVMVF9GSUxFX1ZFUlNJT04pOwogICAgICAgICBpbmZvX2xpc3QuaGVhZGVyLnZlcnNpb24gPSBNQVhfU1VQUE9SVEVEX0ZJTEVfVkVSU0lPTiArIDE7CiAgICAgICAgIGxldCBmbGFnX2luZm8gPSBpbmZvX2xpc3QuaW50b19ieXRlcygpOwogICAgICAgICBsZXQgZXJyb3IgPSBmaW5kX2ZsYWdfYXR0cmlidXRlKCZmbGFnX2luZm9bLi5dLCBGbGFnVmFsdWVUeXBlOjpCb29sZWFuLCA0KS51bndyYXBfZXJyKCk7CmRpZmYgLS1naXQgYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS9zcmMvZmxhZ190YWJsZV9xdWVyeS5ycyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3NyYy9mbGFnX3RhYmxlX3F1ZXJ5LnJzCmluZGV4IGU5YmM2MDQuLjNlODdhY2MgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3NyYy9mbGFnX3RhYmxlX3F1ZXJ5LnJzCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3NyYy9mbGFnX3RhYmxlX3F1ZXJ5LnJzCkBAIC03NCwxMiArNzQsMTIgQEAKICNbY2ZnKHRlc3QpXQogbW9kIHRlc3RzIHsKICAgICB1c2Ugc3VwZXI6Oio7Ci0gICAgdXNlIGFjb25maWdfc3RvcmFnZV9maWxlOjp0ZXN0X3V0aWxzOjpjcmVhdGVfdGVzdF9mbGFnX3RhYmxlOworICAgIHVzZSBhY29uZmlnX3N0b3JhZ2VfZmlsZTo6e3Rlc3RfdXRpbHM6OmNyZWF0ZV90ZXN0X2ZsYWdfdGFibGUsIERFRkFVTFRfRklMRV9WRVJTSU9OfTsKIAogICAgICNbdGVzdF0KICAgICAvLyB0aGlzIHRlc3QgcG9pbnQgbG9ja3MgZG93biB0YWJsZSBxdWVyeQogICAgIGZuIHRlc3RfZmxhZ19xdWVyeSgpIHsKLSAgICAgICAgbGV0IGZsYWdfdGFibGUgPSBjcmVhdGVfdGVzdF9mbGFnX3RhYmxlKCkuaW50b19ieXRlcygpOworICAgICAgICBsZXQgZmxhZ190YWJsZSA9IGNyZWF0ZV90ZXN0X2ZsYWdfdGFibGUoREVGQVVMVF9GSUxFX1ZFUlNJT04pLmludG9fYnl0ZXMoKTsKICAgICAgICAgbGV0IGJhc2VsaW5lID0gdmVjIVsKICAgICAgICAgICAgICgwLCAiZW5hYmxlZF9ybyIsIFN0b3JlZEZsYWdUeXBlOjpSZWFkT25seUJvb2xlYW4sIDF1MTYpLAogICAgICAgICAgICAgKDAsICJlbmFibGVkX3J3IiwgU3RvcmVkRmxhZ1R5cGU6OlJlYWRXcml0ZUJvb2xlYW4sIDJ1MTYpLApAQCAtMTAxLDcgKzEwMSw3IEBACiAgICAgI1t0ZXN0XQogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIHRhYmxlIHF1ZXJ5IG9mIGEgbm9uIGV4aXN0IGZsYWcKICAgICBmbiB0ZXN0X25vdF9leGlzdGVkX2ZsYWdfcXVlcnkoKSB7Ci0gICAgICAgIGxldCBmbGFnX3RhYmxlID0gY3JlYXRlX3Rlc3RfZmxhZ190YWJsZSgpLmludG9fYnl0ZXMoKTsKKyAgICAgICAgbGV0IGZsYWdfdGFibGUgPSBjcmVhdGVfdGVzdF9mbGFnX3RhYmxlKERFRkFVTFRfRklMRV9WRVJTSU9OKS5pbnRvX2J5dGVzKCk7CiAgICAgICAgIGxldCBmbGFnX2NvbnRleHQgPSBmaW5kX2ZsYWdfcmVhZF9jb250ZXh0KCZmbGFnX3RhYmxlWy4uXSwgMSwgImRpc2FibGVkX2ZpeGVkX3JvIikudW53cmFwKCk7CiAgICAgICAgIGFzc2VydF9lcSEoZmxhZ19jb250ZXh0LCBOb25lKTsKICAgICAgICAgbGV0IGZsYWdfY29udGV4dCA9IGZpbmRfZmxhZ19yZWFkX2NvbnRleHQoJmZsYWdfdGFibGVbLi5dLCAyLCAiZGlzYWJsZWRfcnciKS51bndyYXAoKTsKQEAgLTExMSw3ICsxMTEsNyBAQAogICAgICNbdGVzdF0KICAgICAvLyB0aGlzIHRlc3QgcG9pbnQgbG9ja3MgZG93biBxdWVyeSBlcnJvciB3aGVuIGZpbGUgaGFzIGEgaGlnaGVyIHZlcnNpb24KICAgICBmbiB0ZXN0X2hpZ2hlcl92ZXJzaW9uX3N0b3JhZ2VfZmlsZSgpIHsKLSAgICAgICAgbGV0IG11dCB0YWJsZSA9IGNyZWF0ZV90ZXN0X2ZsYWdfdGFibGUoKTsKKyAgICAgICAgbGV0IG11dCB0YWJsZSA9IGNyZWF0ZV90ZXN0X2ZsYWdfdGFibGUoREVGQVVMVF9GSUxFX1ZFUlNJT04pOwogICAgICAgICB0YWJsZS5oZWFkZXIudmVyc2lvbiA9IE1BWF9TVVBQT1JURURfRklMRV9WRVJTSU9OICsgMTsKICAgICAgICAgbGV0IGZsYWdfdGFibGUgPSB0YWJsZS5pbnRvX2J5dGVzKCk7CiAgICAgICAgIGxldCBlcnJvciA9IGZpbmRfZmxhZ19yZWFkX2NvbnRleHQoJmZsYWdfdGFibGVbLi5dLCAwLCAiZW5hYmxlZF9ybyIpLnVud3JhcF9lcnIoKTsKZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3NyYy9mbGFnX3ZhbHVlX3F1ZXJ5LnJzIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvc3JjL2ZsYWdfdmFsdWVfcXVlcnkucnMKaW5kZXggMTJjMWU4My4uMzVmNTY5MiAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvc3JjL2ZsYWdfdmFsdWVfcXVlcnkucnMKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvc3JjL2ZsYWdfdmFsdWVfcXVlcnkucnMKQEAgLTQ4LDEyICs0OCwxMiBAQAogI1tjZmcodGVzdCldCiBtb2QgdGVzdHMgewogICAgIHVzZSBzdXBlcjo6KjsKLSAgICB1c2UgYWNvbmZpZ19zdG9yYWdlX2ZpbGU6OnRlc3RfdXRpbHM6OmNyZWF0ZV90ZXN0X2ZsYWdfdmFsdWVfbGlzdDsKKyAgICB1c2UgYWNvbmZpZ19zdG9yYWdlX2ZpbGU6Ont0ZXN0X3V0aWxzOjpjcmVhdGVfdGVzdF9mbGFnX3ZhbHVlX2xpc3QsIERFRkFVTFRfRklMRV9WRVJTSU9OfTsKIAogICAgICNbdGVzdF0KICAgICAvLyB0aGlzIHRlc3QgcG9pbnQgbG9ja3MgZG93biBmbGFnIHZhbHVlIHF1ZXJ5CiAgICAgZm4gdGVzdF9mbGFnX3ZhbHVlX3F1ZXJ5KCkgewotICAgICAgICBsZXQgZmxhZ192YWx1ZV9saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0KCkuaW50b19ieXRlcygpOworICAgICAgICBsZXQgZmxhZ192YWx1ZV9saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0KERFRkFVTFRfRklMRV9WRVJTSU9OKS5pbnRvX2J5dGVzKCk7CiAgICAgICAgIGxldCBiYXNlbGluZTogVmVjPGJvb2w+ID0gdmVjIVtmYWxzZSwgdHJ1ZSwgdHJ1ZSwgZmFsc2UsIHRydWUsIHRydWUsIHRydWUsIHRydWVdOwogICAgICAgICBmb3IgKG9mZnNldCwgZXhwZWN0ZWRfdmFsdWUpIGluIGJhc2VsaW5lLmludG9faXRlcigpLmVudW1lcmF0ZSgpIHsKICAgICAgICAgICAgIGxldCBmbGFnX3ZhbHVlID0gZmluZF9ib29sZWFuX2ZsYWdfdmFsdWUoJmZsYWdfdmFsdWVfbGlzdFsuLl0sIG9mZnNldCBhcyB1MzIpLnVud3JhcCgpOwpAQCAtNjQsNyArNjQsNyBAQAogICAgICNbdGVzdF0KICAgICAvLyB0aGlzIHRlc3QgcG9pbnQgbG9ja3MgZG93biBxdWVyeSBiZXlvbmQgdGhlIGVuZCBvZiBib29sZWFuIHNlY3Rpb24KICAgICBmbiB0ZXN0X2Jvb2xlYW5fb3V0X29mX3JhbmdlKCkgewotICAgICAgICBsZXQgZmxhZ192YWx1ZV9saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0KCkuaW50b19ieXRlcygpOworICAgICAgICBsZXQgZmxhZ192YWx1ZV9saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0KERFRkFVTFRfRklMRV9WRVJTSU9OKS5pbnRvX2J5dGVzKCk7CiAgICAgICAgIGxldCBlcnJvciA9IGZpbmRfYm9vbGVhbl9mbGFnX3ZhbHVlKCZmbGFnX3ZhbHVlX2xpc3RbLi5dLCA4KS51bndyYXBfZXJyKCk7CiAgICAgICAgIGFzc2VydF9lcSEoCiAgICAgICAgICAgICBmb3JtYXQhKCJ7Oj99IiwgZXJyb3IpLApAQCAtNzUsNyArNzUsNyBAQAogICAgICNbdGVzdF0KICAgICAvLyB0aGlzIHRlc3QgcG9pbnQgbG9ja3MgZG93biBxdWVyeSBlcnJvciB3aGVuIGZpbGUgaGFzIGEgaGlnaGVyIHZlcnNpb24KICAgICBmbiB0ZXN0X2hpZ2hlcl92ZXJzaW9uX3N0b3JhZ2VfZmlsZSgpIHsKLSAgICAgICAgbGV0IG11dCB2YWx1ZV9saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0KCk7CisgICAgICAgIGxldCBtdXQgdmFsdWVfbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfdmFsdWVfbGlzdChERUZBVUxUX0ZJTEVfVkVSU0lPTik7CiAgICAgICAgIHZhbHVlX2xpc3QuaGVhZGVyLnZlcnNpb24gPSBNQVhfU1VQUE9SVEVEX0ZJTEVfVkVSU0lPTiArIDE7CiAgICAgICAgIGxldCBmbGFnX3ZhbHVlID0gdmFsdWVfbGlzdC5pbnRvX2J5dGVzKCk7CiAgICAgICAgIGxldCBlcnJvciA9IGZpbmRfYm9vbGVhbl9mbGFnX3ZhbHVlKCZmbGFnX3ZhbHVlWy4uXSwgNCkudW53cmFwX2VycigpOwpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvc3JjL2xpYi5ycyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3NyYy9saWIucnMKaW5kZXggNTEwNGNkMC4uNmU5OGZlOSAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvc3JjL2xpYi5ycworKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS9zcmMvbGliLnJzCkBAIC00MTMsMTAgKzQxMywxMCBAQAogICAgICAgICBsZXQgZmxhZ19tYXAgPSBzdG9yYWdlX2Rpci5jbG9uZSgpICsgIi9tYXBzL21vY2t1cC5mbGFnLm1hcCI7CiAgICAgICAgIGxldCBmbGFnX3ZhbCA9IHN0b3JhZ2VfZGlyLmNsb25lKCkgKyAiL2Jvb3QvbW9ja3VwLnZhbCI7CiAgICAgICAgIGxldCBmbGFnX2luZm8gPSBzdG9yYWdlX2Rpci5jbG9uZSgpICsgIi9ib290L21vY2t1cC5pbmZvIjsKLSAgICAgICAgZnM6OmNvcHkoIi4vdGVzdHMvZGF0YS92MS9wYWNrYWdlLm1hcCIsICZwYWNrYWdlX21hcCkudW53cmFwKCk7Ci0gICAgICAgIGZzOjpjb3B5KCIuL3Rlc3RzL2RhdGEvdjEvZmxhZy5tYXAiLCAmZmxhZ19tYXApLnVud3JhcCgpOwotICAgICAgICBmczo6Y29weSgiLi90ZXN0cy9kYXRhL3YxL2ZsYWcudmFsIiwgJmZsYWdfdmFsKS51bndyYXAoKTsKLSAgICAgICAgZnM6OmNvcHkoIi4vdGVzdHMvZGF0YS92MS9mbGFnLmluZm8iLCAmZmxhZ19pbmZvKS51bndyYXAoKTsKKyAgICAgICAgZnM6OmNvcHkoIi4vdGVzdHMvZGF0YS92MS9wYWNrYWdlX3YxLm1hcCIsICZwYWNrYWdlX21hcCkudW53cmFwKCk7CisgICAgICAgIGZzOjpjb3B5KCIuL3Rlc3RzL2RhdGEvdjEvZmxhZ192MS5tYXAiLCAmZmxhZ19tYXApLnVud3JhcCgpOworICAgICAgICBmczo6Y29weSgiLi90ZXN0cy9kYXRhL3YxL2ZsYWdfdjEudmFsIiwgJmZsYWdfdmFsKS51bndyYXAoKTsKKyAgICAgICAgZnM6OmNvcHkoIi4vdGVzdHMvZGF0YS92MS9mbGFnX3YxLmluZm8iLCAmZmxhZ19pbmZvKS51bndyYXAoKTsKIAogICAgICAgICByZXR1cm4gc3RvcmFnZV9kaXI7CiAgICAgfQpAQCAtNTA4LDkgKzUwOCw5IEBACiAgICAgI1t0ZXN0XQogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIGZsYWcgc3RvcmFnZSBmaWxlIHZlcnNpb24gbnVtYmVyIHF1ZXJ5IGFwaQogICAgIGZuIHRlc3Rfc3RvcmFnZV92ZXJzaW9uX3F1ZXJ5KCkgewotICAgICAgICBhc3NlcnRfZXEhKGdldF9zdG9yYWdlX2ZpbGVfdmVyc2lvbigiLi90ZXN0cy9kYXRhL3YxL3BhY2thZ2UubWFwIikudW53cmFwKCksIDEpOwotICAgICAgICBhc3NlcnRfZXEhKGdldF9zdG9yYWdlX2ZpbGVfdmVyc2lvbigiLi90ZXN0cy9kYXRhL3YxL2ZsYWcubWFwIikudW53cmFwKCksIDEpOwotICAgICAgICBhc3NlcnRfZXEhKGdldF9zdG9yYWdlX2ZpbGVfdmVyc2lvbigiLi90ZXN0cy9kYXRhL3YxL2ZsYWcudmFsIikudW53cmFwKCksIDEpOwotICAgICAgICBhc3NlcnRfZXEhKGdldF9zdG9yYWdlX2ZpbGVfdmVyc2lvbigiLi90ZXN0cy9kYXRhL3YxL2ZsYWcuaW5mbyIpLnVud3JhcCgpLCAxKTsKKyAgICAgICAgYXNzZXJ0X2VxIShnZXRfc3RvcmFnZV9maWxlX3ZlcnNpb24oIi4vdGVzdHMvZGF0YS92MS9wYWNrYWdlX3YxLm1hcCIpLnVud3JhcCgpLCAxKTsKKyAgICAgICAgYXNzZXJ0X2VxIShnZXRfc3RvcmFnZV9maWxlX3ZlcnNpb24oIi4vdGVzdHMvZGF0YS92MS9mbGFnX3YxLm1hcCIpLnVud3JhcCgpLCAxKTsKKyAgICAgICAgYXNzZXJ0X2VxIShnZXRfc3RvcmFnZV9maWxlX3ZlcnNpb24oIi4vdGVzdHMvZGF0YS92MS9mbGFnX3YxLnZhbCIpLnVud3JhcCgpLCAxKTsKKyAgICAgICAgYXNzZXJ0X2VxIShnZXRfc3RvcmFnZV9maWxlX3ZlcnNpb24oIi4vdGVzdHMvZGF0YS92MS9mbGFnX3YxLmluZm8iKS51bndyYXAoKSwgMSk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvc3JjL21hcHBlZF9maWxlLnJzIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvc3JjL21hcHBlZF9maWxlLnJzCmluZGV4IDJjMTg4NGEuLmY0ZTI2OWUgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3NyYy9tYXBwZWRfZmlsZS5ycworKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS9zcmMvbWFwcGVkX2ZpbGUucnMKQEAgLTk3LDEwICs5NywxMCBAQAogICAgICAgICBsZXQgZmxhZ19tYXAgPSBzdG9yYWdlX2Rpci5jbG9uZSgpICsgIi9tYXBzL21vY2t1cC5mbGFnLm1hcCI7CiAgICAgICAgIGxldCBmbGFnX3ZhbCA9IHN0b3JhZ2VfZGlyLmNsb25lKCkgKyAiL2Jvb3QvbW9ja3VwLnZhbCI7CiAgICAgICAgIGxldCBmbGFnX2luZm8gPSBzdG9yYWdlX2Rpci5jbG9uZSgpICsgIi9ib290L21vY2t1cC5pbmZvIjsKLSAgICAgICAgZnM6OmNvcHkoIi4vdGVzdHMvZGF0YS92MS9wYWNrYWdlLm1hcCIsICZwYWNrYWdlX21hcCkudW53cmFwKCk7Ci0gICAgICAgIGZzOjpjb3B5KCIuL3Rlc3RzL2RhdGEvdjEvZmxhZy5tYXAiLCAmZmxhZ19tYXApLnVud3JhcCgpOwotICAgICAgICBmczo6Y29weSgiLi90ZXN0cy9kYXRhL3YxL2ZsYWcudmFsIiwgJmZsYWdfdmFsKS51bndyYXAoKTsKLSAgICAgICAgZnM6OmNvcHkoIi4vdGVzdHMvZGF0YS92MS9mbGFnLmluZm8iLCAmZmxhZ19pbmZvKS51bndyYXAoKTsKKyAgICAgICAgZnM6OmNvcHkoIi4vdGVzdHMvZGF0YS92MS9wYWNrYWdlX3YxLm1hcCIsICZwYWNrYWdlX21hcCkudW53cmFwKCk7CisgICAgICAgIGZzOjpjb3B5KCIuL3Rlc3RzL2RhdGEvdjEvZmxhZ192MS5tYXAiLCAmZmxhZ19tYXApLnVud3JhcCgpOworICAgICAgICBmczo6Y29weSgiLi90ZXN0cy9kYXRhL3YxL2ZsYWdfdjEudmFsIiwgJmZsYWdfdmFsKS51bndyYXAoKTsKKyAgICAgICAgZnM6OmNvcHkoIi4vdGVzdHMvZGF0YS92MS9mbGFnX3YxLmluZm8iLCAmZmxhZ19pbmZvKS51bndyYXAoKTsKIAogICAgICAgICByZXR1cm4gc3RvcmFnZV9kaXI7CiAgICAgfQpAQCAtMTA4LDkgKzEwOCw5IEBACiAgICAgI1t0ZXN0XQogICAgIGZuIHRlc3RfbWFwcGVkX2ZpbGVfY29udGVudHMoKSB7CiAgICAgICAgIGxldCBzdG9yYWdlX2RpciA9IGNyZWF0ZV90ZXN0X3N0b3JhZ2VfZmlsZXMoKTsKLSAgICAgICAgbWFwX2FuZF92ZXJpZnkoJnN0b3JhZ2VfZGlyLCBTdG9yYWdlRmlsZVR5cGU6OlBhY2thZ2VNYXAsICIuL3Rlc3RzL2RhdGEvdjEvcGFja2FnZS5tYXAiKTsKLSAgICAgICAgbWFwX2FuZF92ZXJpZnkoJnN0b3JhZ2VfZGlyLCBTdG9yYWdlRmlsZVR5cGU6OkZsYWdNYXAsICIuL3Rlc3RzL2RhdGEvdjEvZmxhZy5tYXAiKTsKLSAgICAgICAgbWFwX2FuZF92ZXJpZnkoJnN0b3JhZ2VfZGlyLCBTdG9yYWdlRmlsZVR5cGU6OkZsYWdWYWwsICIuL3Rlc3RzL2RhdGEvdjEvZmxhZy52YWwiKTsKLSAgICAgICAgbWFwX2FuZF92ZXJpZnkoJnN0b3JhZ2VfZGlyLCBTdG9yYWdlRmlsZVR5cGU6OkZsYWdJbmZvLCAiLi90ZXN0cy9kYXRhL3YxL2ZsYWcuaW5mbyIpOworICAgICAgICBtYXBfYW5kX3ZlcmlmeSgmc3RvcmFnZV9kaXIsIFN0b3JhZ2VGaWxlVHlwZTo6UGFja2FnZU1hcCwgIi4vdGVzdHMvZGF0YS92MS9wYWNrYWdlX3YxLm1hcCIpOworICAgICAgICBtYXBfYW5kX3ZlcmlmeSgmc3RvcmFnZV9kaXIsIFN0b3JhZ2VGaWxlVHlwZTo6RmxhZ01hcCwgIi4vdGVzdHMvZGF0YS92MS9mbGFnX3YxLm1hcCIpOworICAgICAgICBtYXBfYW5kX3ZlcmlmeSgmc3RvcmFnZV9kaXIsIFN0b3JhZ2VGaWxlVHlwZTo6RmxhZ1ZhbCwgIi4vdGVzdHMvZGF0YS92MS9mbGFnX3YxLnZhbCIpOworICAgICAgICBtYXBfYW5kX3ZlcmlmeSgmc3RvcmFnZV9kaXIsIFN0b3JhZ2VGaWxlVHlwZTo6RmxhZ0luZm8sICIuL3Rlc3RzL2RhdGEvdjEvZmxhZ192MS5pbmZvIik7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvc3JjL3BhY2thZ2VfdGFibGVfcXVlcnkucnMgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS9zcmMvcGFja2FnZV90YWJsZV9xdWVyeS5ycwppbmRleCBhY2I2MGY2Li5hNGI2M2FiIDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS9zcmMvcGFja2FnZV90YWJsZV9xdWVyeS5ycworKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS9zcmMvcGFja2FnZV90YWJsZV9xdWVyeS5ycwpAQCAtNzQsMTIgKzc0LDEyIEBACiAjW2NmZyh0ZXN0KV0KIG1vZCB0ZXN0cyB7CiAgICAgdXNlIHN1cGVyOjoqOwotICAgIHVzZSBhY29uZmlnX3N0b3JhZ2VfZmlsZTo6dGVzdF91dGlsczo6Y3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZTsKKyAgICB1c2UgYWNvbmZpZ19zdG9yYWdlX2ZpbGU6Ont0ZXN0X3V0aWxzOjpjcmVhdGVfdGVzdF9wYWNrYWdlX3RhYmxlLCBERUZBVUxUX0ZJTEVfVkVSU0lPTn07CiAKICAgICAjW3Rlc3RdCiAgICAgLy8gdGhpcyB0ZXN0IHBvaW50IGxvY2tzIGRvd24gdGFibGUgcXVlcnkKICAgICBmbiB0ZXN0X3BhY2thZ2VfcXVlcnkoKSB7Ci0gICAgICAgIGxldCBwYWNrYWdlX3RhYmxlID0gY3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZSgpLmludG9fYnl0ZXMoKTsKKyAgICAgICAgbGV0IHBhY2thZ2VfdGFibGUgPSBjcmVhdGVfdGVzdF9wYWNrYWdlX3RhYmxlKERFRkFVTFRfRklMRV9WRVJTSU9OKS5pbnRvX2J5dGVzKCk7CiAgICAgICAgIGxldCBwYWNrYWdlX2NvbnRleHQgPQogICAgICAgICAgICAgZmluZF9wYWNrYWdlX3JlYWRfY29udGV4dCgmcGFja2FnZV90YWJsZVsuLl0sICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8xIikKICAgICAgICAgICAgICAgICAudW53cmFwKCkKQEAgLTEwNCw3ICsxMDQsNyBAQAogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIHRhYmxlIHF1ZXJ5IG9mIGEgbm9uIGV4aXN0IHBhY2thZ2UKICAgICBmbiB0ZXN0X25vdF9leGlzdGVkX3BhY2thZ2VfcXVlcnkoKSB7CiAgICAgICAgIC8vIHRoaXMgd2lsbCBsYW5kIGF0IGFuIGVtcHR5IGJ1Y2tldAotICAgICAgICBsZXQgcGFja2FnZV90YWJsZSA9IGNyZWF0ZV90ZXN0X3BhY2thZ2VfdGFibGUoKS5pbnRvX2J5dGVzKCk7CisgICAgICAgIGxldCBwYWNrYWdlX3RhYmxlID0gY3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZShERUZBVUxUX0ZJTEVfVkVSU0lPTikuaW50b19ieXRlcygpOwogICAgICAgICBsZXQgcGFja2FnZV9jb250ZXh0ID0KICAgICAgICAgICAgIGZpbmRfcGFja2FnZV9yZWFkX2NvbnRleHQoJnBhY2thZ2VfdGFibGVbLi5dLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMyIpCiAgICAgICAgICAgICAgICAgLnVud3JhcCgpOwpAQCAtMTE5LDcgKzExOSw3IEBACiAgICAgI1t0ZXN0XQogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIHF1ZXJ5IGVycm9yIHdoZW4gZmlsZSBoYXMgYSBoaWdoZXIgdmVyc2lvbgogICAgIGZuIHRlc3RfaGlnaGVyX3ZlcnNpb25fc3RvcmFnZV9maWxlKCkgewotICAgICAgICBsZXQgbXV0IHRhYmxlID0gY3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZSgpOworICAgICAgICBsZXQgbXV0IHRhYmxlID0gY3JlYXRlX3Rlc3RfcGFja2FnZV90YWJsZShERUZBVUxUX0ZJTEVfVkVSU0lPTik7CiAgICAgICAgIHRhYmxlLmhlYWRlci52ZXJzaW9uID0gTUFYX1NVUFBPUlRFRF9GSUxFX1ZFUlNJT04gKyAxOwogICAgICAgICBsZXQgcGFja2FnZV90YWJsZSA9IHRhYmxlLmludG9fYnl0ZXMoKTsKICAgICAgICAgbGV0IGVycm9yID0KZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3NyY3MvYW5kcm9pZC9hY29uZmlnL3N0b3JhZ2UvQWNvbmZpZ1BhY2thZ2VJbXBsLmphdmEgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS9zcmNzL2FuZHJvaWQvYWNvbmZpZy9zdG9yYWdlL0Fjb25maWdQYWNrYWdlSW1wbC5qYXZhCmluZGV4IGMyYmVmMzEuLjZiZjRlMDUgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3NyY3MvYW5kcm9pZC9hY29uZmlnL3N0b3JhZ2UvQWNvbmZpZ1BhY2thZ2VJbXBsLmphdmEKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvc3Jjcy9hbmRyb2lkL2Fjb25maWcvc3RvcmFnZS9BY29uZmlnUGFja2FnZUltcGwuamF2YQpAQCAtMjUsMTEzICsyNSw5OCBAQAogICAgIHByaXZhdGUgRmxhZ1RhYmxlIG1GbGFnVGFibGU7CiAgICAgcHJpdmF0ZSBGbGFnVmFsdWVMaXN0IG1GbGFnVmFsdWVMaXN0OwogICAgIHByaXZhdGUgUGFja2FnZVRhYmxlLk5vZGUgbVBOb2RlOworICAgIHByaXZhdGUgZmluYWwgaW50IG1QYWNrYWdlSWQ7CisgICAgcHJpdmF0ZSBmaW5hbCBpbnQgbUJvb2xlYW5TdGFydEluZGV4OwogCi0gICAgLyoqIEBoaWRlICovCi0gICAgcHJpdmF0ZSBBY29uZmlnUGFja2FnZUltcGwoKSB7fQorICAgIHByaXZhdGUgQWNvbmZpZ1BhY2thZ2VJbXBsKAorICAgICAgICAgICAgRmxhZ1RhYmxlIGZsYWdUYWJsZSwKKyAgICAgICAgICAgIEZsYWdWYWx1ZUxpc3QgZmxhZ1ZhbHVlTGlzdCwKKyAgICAgICAgICAgIGludCBwYWNrYWdlSWQsCisgICAgICAgICAgICBpbnQgYm9vbGVhblN0YXJ0SW5kZXgpIHsKKyAgICAgICAgdGhpcy5tRmxhZ1RhYmxlID0gZmxhZ1RhYmxlOworICAgICAgICB0aGlzLm1GbGFnVmFsdWVMaXN0ID0gZmxhZ1ZhbHVlTGlzdDsKKyAgICAgICAgdGhpcy5tUGFja2FnZUlkID0gcGFja2FnZUlkOworICAgICAgICB0aGlzLm1Cb29sZWFuU3RhcnRJbmRleCA9IGJvb2xlYW5TdGFydEluZGV4OworICAgIH0KIAotICAgIC8qKiBAaGlkZSAqLwogICAgIHB1YmxpYyBzdGF0aWMgQWNvbmZpZ1BhY2thZ2VJbXBsIGxvYWQoU3RyaW5nIHBhY2thZ2VOYW1lLCBTdG9yYWdlRmlsZVByb3ZpZGVyIGZpbGVQcm92aWRlcikgewotICAgICAgICBBY29uZmlnUGFja2FnZUltcGwgaW1wbCA9IG5ldyBBY29uZmlnUGFja2FnZUltcGwoKTsKLSAgICAgICAgaW1wbC5pbml0KG51bGwsIHBhY2thZ2VOYW1lLCBmaWxlUHJvdmlkZXIpOwotICAgICAgICByZXR1cm4gaW1wbDsKLSAgICB9Ci0KLSAgICAvKiogQGhpZGUgKi8KLSAgICBwdWJsaWMgc3RhdGljIEFjb25maWdQYWNrYWdlSW1wbCBsb2FkKAotICAgICAgICAgICAgU3RyaW5nIGNvbnRhaW5lciwgU3RyaW5nIHBhY2thZ2VOYW1lLCBTdG9yYWdlRmlsZVByb3ZpZGVyIGZpbGVQcm92aWRlcikgewotICAgICAgICBpZiAoY29udGFpbmVyID09IG51bGwpIHsKLSAgICAgICAgICAgIHRocm93IG5ldyBBY29uZmlnU3RvcmFnZUV4Y2VwdGlvbigKLSAgICAgICAgICAgICAgICAgICAgQWNvbmZpZ1N0b3JhZ2VFeGNlcHRpb24uRVJST1JfQ09OVEFJTkVSX05PVF9GT1VORCwKLSAgICAgICAgICAgICAgICAgICAgImNvbnRhaW5lciBudWxsIGNhbm5vdCBiZSBmb3VuZCBvbiB0aGUgZGV2aWNlIik7Ci0gICAgICAgIH0KLSAgICAgICAgQWNvbmZpZ1BhY2thZ2VJbXBsIGltcGwgPSBuZXcgQWNvbmZpZ1BhY2thZ2VJbXBsKCk7Ci0gICAgICAgIGltcGwuaW5pdChjb250YWluZXIsIHBhY2thZ2VOYW1lLCBmaWxlUHJvdmlkZXIpOwotICAgICAgICByZXR1cm4gaW1wbDsKLSAgICB9Ci0KLSAgICAvKiogQGhpZGUgKi8KLSAgICBwdWJsaWMgYm9vbGVhbiBnZXRCb29sZWFuRmxhZ1ZhbHVlKFN0cmluZyBmbGFnTmFtZSwgYm9vbGVhbiBkZWZhdWx0VmFsdWUpIHsKLSAgICAgICAgRmxhZ1RhYmxlLk5vZGUgZk5vZGUgPSBtRmxhZ1RhYmxlLmdldChtUE5vZGUuZ2V0UGFja2FnZUlkKCksIGZsYWdOYW1lKTsKLSAgICAgICAgLy8gbm8gc3VjaCBmbGFnIGluIHRoaXMgcGFja2FnZQotICAgICAgICBpZiAoZk5vZGUgPT0gbnVsbCkgcmV0dXJuIGRlZmF1bHRWYWx1ZTsKLSAgICAgICAgaW50IGluZGV4ID0gZk5vZGUuZ2V0RmxhZ0luZGV4KCkgKyBtUE5vZGUuZ2V0Qm9vbGVhblN0YXJ0SW5kZXgoKTsKLSAgICAgICAgcmV0dXJuIG1GbGFnVmFsdWVMaXN0LmdldEJvb2xlYW4oaW5kZXgpOwotICAgIH0KLQotICAgIC8qKiBAaGlkZSAqLwotICAgIHB1YmxpYyBib29sZWFuIGdldEJvb2xlYW5GbGFnVmFsdWUoaW50IGluZGV4KSB7Ci0gICAgICAgIHJldHVybiBtRmxhZ1ZhbHVlTGlzdC5nZXRCb29sZWFuKGluZGV4ICsgbVBOb2RlLmdldEJvb2xlYW5TdGFydEluZGV4KCkpOwotICAgIH0KLQotICAgIC8qKiBAaGlkZSAqLwotICAgIHB1YmxpYyBsb25nIGdldFBhY2thZ2VGaW5nZXJwcmludCgpIHsKLSAgICAgICAgcmV0dXJuIG1QTm9kZS5nZXRQYWNrYWdlRmluZ2VycHJpbnQoKTsKLSAgICB9Ci0KLSAgICAvKiogQGhpZGUgKi8KLSAgICBwdWJsaWMgYm9vbGVhbiBoYXNQYWNrYWdlRmluZ2VycHJpbnQoKSB7Ci0gICAgICAgIHJldHVybiBtUE5vZGUuaGFzUGFja2FnZUZpbmdlcnByaW50KCk7Ci0gICAgfQotCi0gICAgcHJpdmF0ZSB2b2lkIGluaXQoU3RyaW5nIGNvbnRhaW5lck5hbWUsIFN0cmluZyBwYWNrYWdlTmFtZSwgU3RvcmFnZUZpbGVQcm92aWRlciBmaWxlUHJvdmlkZXIpIHsKICAgICAgICAgU3RyaWN0TW9kZS5UaHJlYWRQb2xpY3kgb2xkUG9saWN5ID0gU3RyaWN0TW9kZS5hbGxvd1RocmVhZERpc2tSZWFkcygpOwotICAgICAgICBTdHJpbmcgY29udGFpbmVyID0gY29udGFpbmVyTmFtZTsKKyAgICAgICAgUGFja2FnZVRhYmxlLk5vZGUgcE5vZGUgPSBudWxsOwogICAgICAgICB0cnkgewotICAgICAgICAgICAgLy8gZm9yIGRldmljZXMgZG9uJ3QgaGF2ZSBuZXcgc3RvcmFnZSBkaXJlY3RseSByZXR1cm4KLSAgICAgICAgICAgIGlmICghZmlsZVByb3ZpZGVyLmNvbnRhaW5lckZpbGVFeGlzdHMobnVsbCkpIHsKLSAgICAgICAgICAgICAgICB0aHJvdyBuZXcgQWNvbmZpZ1N0b3JhZ2VFeGNlcHRpb24oCi0gICAgICAgICAgICAgICAgICAgICAgICBBY29uZmlnU3RvcmFnZUV4Y2VwdGlvbi5FUlJPUl9TVE9SQUdFX1NZU1RFTV9OT1RfRk9VTkQsCi0gICAgICAgICAgICAgICAgICAgICAgICAiYWNvbmZpZyBzdG9yYWdlIGNhbm5vdCBiZSBmb3VuZCBvbiB0aGUgZGV2aWNlIik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBQYWNrYWdlVGFibGUuTm9kZSBwTm9kZSA9IG51bGw7Ci0KLSAgICAgICAgICAgIGlmIChjb250YWluZXIgPT0gbnVsbCkgewotICAgICAgICAgICAgICAgIC8vIENoZWNrIGlmIHRoZSBkZXZpY2UgaGFzIGZsYWcgZmlsZXMgb24gdGhlIHN5c3RlbSBwYXJ0aXRpb24uCi0gICAgICAgICAgICAgICAgLy8gSWYgdGhlIGRldmljZSBkb2VzLCBzZWFyY2ggdGhlIHN5c3RlbSBwYXJ0aXRpb24gZmlyc3QuCi0gICAgICAgICAgICAgICAgY29udGFpbmVyID0gInN5c3RlbSI7Ci0gICAgICAgICAgICAgICAgaWYgKGZpbGVQcm92aWRlci5jb250YWluZXJGaWxlRXhpc3RzKGNvbnRhaW5lcikpIHsKLSAgICAgICAgICAgICAgICAgICAgcE5vZGUgPSBmaWxlUHJvdmlkZXIuZ2V0UGFja2FnZVRhYmxlKGNvbnRhaW5lcikuZ2V0KHBhY2thZ2VOYW1lKTsKLSAgICAgICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgICAgICBpZiAocE5vZGUgPT0gbnVsbCkgewotICAgICAgICAgICAgICAgICAgICAvLyBTZWFyY2ggYWxsIHBhY2thZ2UgbWFwIGZpbGVzIGlmIG5vdCBmb3VuZCBpbiB0aGUgc3lzdGVtIHBhcnRpdGlvbi4KLSAgICAgICAgICAgICAgICAgICAgZm9yIChQYXRoIHAgOiBmaWxlUHJvdmlkZXIubGlzdFBhY2thZ2VNYXBGaWxlcygpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBQYWNrYWdlVGFibGUgcFRhYmxlID0gU3RvcmFnZUZpbGVQcm92aWRlci5nZXRQYWNrYWdlVGFibGUocCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBwTm9kZSA9IHBUYWJsZS5nZXQocGFja2FnZU5hbWUpOwotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHBOb2RlICE9IG51bGwpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250YWluZXIgPSBwVGFibGUuZ2V0SGVhZGVyKCkuZ2V0Q29udGFpbmVyKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIGlmICghZmlsZVByb3ZpZGVyLmNvbnRhaW5lckZpbGVFeGlzdHMoY29udGFpbmVyKSkgewotICAgICAgICAgICAgICAgICAgICB0aHJvdyBuZXcgQWNvbmZpZ1N0b3JhZ2VFeGNlcHRpb24oCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgQWNvbmZpZ1N0b3JhZ2VFeGNlcHRpb24uRVJST1JfQ09OVEFJTkVSX05PVF9GT1VORCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAiY29udGFpbmVyICIgKyBjb250YWluZXIgKyAiIGNhbm5vdCBiZSBmb3VuZCBvbiB0aGUgZGV2aWNlIik7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIHBOb2RlID0gZmlsZVByb3ZpZGVyLmdldFBhY2thZ2VUYWJsZShjb250YWluZXIpLmdldChwYWNrYWdlTmFtZSk7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGlmIChwTm9kZSA9PSBudWxsKSB7Ci0gICAgICAgICAgICAgICAgLy8gZm9yIHRoZSBjYXNlIHBhY2thZ2UgaXMgbm90IGZvdW5kIGluIGFsbCBjb250YWluZXIsIHJldHVybiBpbnN0ZWFkIG9mIHRocm93aW5nCi0gICAgICAgICAgICAgICAgLy8gZXJyb3IKLSAgICAgICAgICAgICAgICB0aHJvdyBuZXcgQWNvbmZpZ1N0b3JhZ2VFeGNlcHRpb24oCi0gICAgICAgICAgICAgICAgICAgICAgICBBY29uZmlnU3RvcmFnZUV4Y2VwdGlvbi5FUlJPUl9QQUNLQUdFX05PVF9GT1VORCwKLSAgICAgICAgICAgICAgICAgICAgICAgICJwYWNrYWdlICIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyBwYWNrYWdlTmFtZQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICArICIgaW4gY29udGFpbmVyICIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyBjb250YWluZXIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyAiIGNhbm5vdCBiZSBmb3VuZCBvbiB0aGUgZGV2aWNlIik7Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIG1GbGFnVGFibGUgPSBmaWxlUHJvdmlkZXIuZ2V0RmxhZ1RhYmxlKGNvbnRhaW5lcik7Ci0gICAgICAgICAgICBtRmxhZ1ZhbHVlTGlzdCA9IGZpbGVQcm92aWRlci5nZXRGbGFnVmFsdWVMaXN0KGNvbnRhaW5lcik7Ci0gICAgICAgICAgICBtUE5vZGUgPSBwTm9kZTsKKyAgICAgICAgICAgIC8vIEZpcnN0IHRyeSB0byBmaW5kIHRoZSBwYWNrYWdlIGluIHRoZSAic3lzdGVtIiBjb250YWluZXIuCisgICAgICAgICAgICBwTm9kZSA9IGZpbGVQcm92aWRlci5nZXRQYWNrYWdlVGFibGUoInN5c3RlbSIpLmdldChwYWNrYWdlTmFtZSk7CiAgICAgICAgIH0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7CisgICAgICAgICAgICAvLworICAgICAgICB9CisgICAgICAgIHRyeSB7CisgICAgICAgICAgICBpZiAocE5vZGUgIT0gbnVsbCkgeworICAgICAgICAgICAgICAgIHJldHVybiBuZXcgQWNvbmZpZ1BhY2thZ2VJbXBsKAorICAgICAgICAgICAgICAgICAgICAgICAgZmlsZVByb3ZpZGVyLmdldEZsYWdUYWJsZSgic3lzdGVtIiksCisgICAgICAgICAgICAgICAgICAgICAgICBmaWxlUHJvdmlkZXIuZ2V0RmxhZ1ZhbHVlTGlzdCgic3lzdGVtIiksCisgICAgICAgICAgICAgICAgICAgICAgICBwTm9kZS5nZXRQYWNrYWdlSWQoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHBOb2RlLmdldEJvb2xlYW5TdGFydEluZGV4KCkpOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICAvLyBJZiBub3QgZm91bmQgaW4gInN5c3RlbSIsIHNlYXJjaCBhbGwgcGFja2FnZSBtYXAgZmlsZXMuCisgICAgICAgICAgICBmb3IgKFBhdGggcCA6IGZpbGVQcm92aWRlci5saXN0UGFja2FnZU1hcEZpbGVzKCkpIHsKKyAgICAgICAgICAgICAgICBQYWNrYWdlVGFibGUgcFRhYmxlID0gZmlsZVByb3ZpZGVyLmdldFBhY2thZ2VUYWJsZShwKTsKKyAgICAgICAgICAgICAgICBwTm9kZSA9IHBUYWJsZS5nZXQocGFja2FnZU5hbWUpOworICAgICAgICAgICAgICAgIGlmIChwTm9kZSAhPSBudWxsKSB7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBuZXcgQWNvbmZpZ1BhY2thZ2VJbXBsKAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZpbGVQcm92aWRlci5nZXRGbGFnVGFibGUocFRhYmxlLmdldEhlYWRlcigpLmdldENvbnRhaW5lcigpKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBmaWxlUHJvdmlkZXIuZ2V0RmxhZ1ZhbHVlTGlzdChwVGFibGUuZ2V0SGVhZGVyKCkuZ2V0Q29udGFpbmVyKCkpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBOb2RlLmdldFBhY2thZ2VJZCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBOb2RlLmdldEJvb2xlYW5TdGFydEluZGV4KCkpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBjYXRjaCAoQWNvbmZpZ1N0b3JhZ2VFeGNlcHRpb24gZSkgeworICAgICAgICAgICAgLy8gQ29uc2lkZXIgbG9nZ2luZyB0aGUgZXhjZXB0aW9uLgogICAgICAgICAgICAgdGhyb3cgZTsKICAgICAgICAgfSBmaW5hbGx5IHsKICAgICAgICAgICAgIFN0cmljdE1vZGUuc2V0VGhyZWFkUG9saWN5KG9sZFBvbGljeSk7CiAgICAgICAgIH0KKyAgICAgICAgLy8gUGFja2FnZSBub3QgZm91bmQuCisgICAgICAgIHRocm93IG5ldyBBY29uZmlnU3RvcmFnZUV4Y2VwdGlvbigKKyAgICAgICAgICAgICAgICBBY29uZmlnU3RvcmFnZUV4Y2VwdGlvbi5FUlJPUl9QQUNLQUdFX05PVF9GT1VORCwKKyAgICAgICAgICAgICAgICAiUGFja2FnZSAiICsgcGFja2FnZU5hbWUgKyAiIG5vdCBmb3VuZC4iKTsKKyAgICB9CisKKyAgICBwdWJsaWMgc3RhdGljIEFjb25maWdQYWNrYWdlSW1wbCBsb2FkKAorICAgICAgICAgICAgU3RyaW5nIGNvbnRhaW5lciwgU3RyaW5nIHBhY2thZ2VOYW1lLCBTdG9yYWdlRmlsZVByb3ZpZGVyIGZpbGVQcm92aWRlcikgeworCisgICAgICAgIFN0cmljdE1vZGUuVGhyZWFkUG9saWN5IG9sZFBvbGljeSA9IFN0cmljdE1vZGUuYWxsb3dUaHJlYWREaXNrUmVhZHMoKTsKKyAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgIFBhY2thZ2VUYWJsZS5Ob2RlIHBOb2RlID0gZmlsZVByb3ZpZGVyLmdldFBhY2thZ2VUYWJsZShjb250YWluZXIpLmdldChwYWNrYWdlTmFtZSk7CisgICAgICAgICAgICBpZiAocE5vZGUgIT0gbnVsbCkgeworICAgICAgICAgICAgICAgIHJldHVybiBuZXcgQWNvbmZpZ1BhY2thZ2VJbXBsKAorICAgICAgICAgICAgICAgICAgICAgICAgZmlsZVByb3ZpZGVyLmdldEZsYWdUYWJsZShjb250YWluZXIpLAorICAgICAgICAgICAgICAgICAgICAgICAgZmlsZVByb3ZpZGVyLmdldEZsYWdWYWx1ZUxpc3QoY29udGFpbmVyKSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHBOb2RlLmdldFBhY2thZ2VJZCgpLAorICAgICAgICAgICAgICAgICAgICAgICAgcE5vZGUuZ2V0Qm9vbGVhblN0YXJ0SW5kZXgoKSk7CisgICAgICAgICAgICB9CisgICAgICAgIH0gY2F0Y2ggKEFjb25maWdTdG9yYWdlRXhjZXB0aW9uIGUpIHsKKyAgICAgICAgICAgIC8vIENvbnNpZGVyIGxvZ2dpbmcgdGhlIGV4Y2VwdGlvbi4KKyAgICAgICAgICAgIHRocm93IGU7CisgICAgICAgIH0gZmluYWxseSB7CisgICAgICAgICAgICBTdHJpY3RNb2RlLnNldFRocmVhZFBvbGljeShvbGRQb2xpY3kpOworICAgICAgICB9CisKKyAgICAgICAgdGhyb3cgbmV3IEFjb25maWdTdG9yYWdlRXhjZXB0aW9uKAorICAgICAgICAgICAgICAgIEFjb25maWdTdG9yYWdlRXhjZXB0aW9uLkVSUk9SX1BBQ0tBR0VfTk9UX0ZPVU5ELAorICAgICAgICAgICAgICAgICJwYWNrYWdlICIKKyAgICAgICAgICAgICAgICAgICAgICAgICsgcGFja2FnZU5hbWUKKyAgICAgICAgICAgICAgICAgICAgICAgICsgIiBpbiBjb250YWluZXIgIgorICAgICAgICAgICAgICAgICAgICAgICAgKyBjb250YWluZXIKKyAgICAgICAgICAgICAgICAgICAgICAgICsgIiBjYW5ub3QgYmUgZm91bmQgb24gdGhlIGRldmljZSIpOworICAgIH0KKworICAgIHB1YmxpYyBib29sZWFuIGdldEJvb2xlYW5GbGFnVmFsdWUoU3RyaW5nIGZsYWdOYW1lLCBib29sZWFuIGRlZmF1bHRWYWx1ZSkgeworICAgICAgICBGbGFnVGFibGUuTm9kZSBmTm9kZSA9IG1GbGFnVGFibGUuZ2V0KG1QYWNrYWdlSWQsIGZsYWdOYW1lKTsKKyAgICAgICAgaWYgKGZOb2RlID09IG51bGwpIHJldHVybiBkZWZhdWx0VmFsdWU7CisgICAgICAgIHJldHVybiBtRmxhZ1ZhbHVlTGlzdC5nZXRCb29sZWFuKGZOb2RlLmdldEZsYWdJbmRleCgpICsgbUJvb2xlYW5TdGFydEluZGV4KTsKKyAgICB9CisKKyAgICBwdWJsaWMgYm9vbGVhbiBnZXRCb29sZWFuRmxhZ1ZhbHVlKGludCBpbmRleCkgeworICAgICAgICByZXR1cm4gbUZsYWdWYWx1ZUxpc3QuZ2V0Qm9vbGVhbihpbmRleCArIG1Cb29sZWFuU3RhcnRJbmRleCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvQW5kcm9pZC5icCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL0FuZHJvaWQuYnAKaW5kZXggYjhlNTEwZC4uNmI4OTQyYiAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvQW5kcm9pZC5icAorKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9BbmRyb2lkLmJwCkBAIC0xLDEwICsxLDE0IEBACiBmaWxlZ3JvdXAgewogICAgIG5hbWU6ICJyZWFkX2FwaV90ZXN0X3N0b3JhZ2VfZmlsZXMiLAogICAgIHNyY3M6IFsKLSAgICAgICAgImRhdGEvdjEvcGFja2FnZS5tYXAiLAotICAgICAgICAiZGF0YS92MS9mbGFnLm1hcCIsCi0gICAgICAgICJkYXRhL3YxL2ZsYWcudmFsIiwKLSAgICAgICAgImRhdGEvdjEvZmxhZy5pbmZvIiwKKyAgICAgICAgImRhdGEvdjEvcGFja2FnZV92MS5tYXAiLAorICAgICAgICAiZGF0YS92MS9mbGFnX3YxLm1hcCIsCisgICAgICAgICJkYXRhL3YxL2ZsYWdfdjEudmFsIiwKKyAgICAgICAgImRhdGEvdjEvZmxhZ192MS5pbmZvIiwKKyAgICAgICAgImRhdGEvdjIvcGFja2FnZV92Mi5tYXAiLAorICAgICAgICAiZGF0YS92Mi9mbGFnX3YyLm1hcCIsCisgICAgICAgICJkYXRhL3YyL2ZsYWdfdjIudmFsIiwKKyAgICAgICAgImRhdGEvdjIvZmxhZ192Mi5pbmZvIiwKICAgICBdLAogfQogCmRpZmYgLS1naXQgYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9kYXRhL3YxL2ZsYWcuaW5mbyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjEvZmxhZ192MS5pbmZvCnNpbWlsYXJpdHkgaW5kZXggMTAwJQpyZW5hbWUgZnJvbSB0b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9kYXRhL3YxL2ZsYWcuaW5mbwpyZW5hbWUgdG8gdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvZGF0YS92MS9mbGFnX3YxLmluZm8KQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvZGF0YS92MS9mbGFnLm1hcCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjEvZmxhZ192MS5tYXAKc2ltaWxhcml0eSBpbmRleCAxMDAlCnJlbmFtZSBmcm9tIHRvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjEvZmxhZy5tYXAKcmVuYW1lIHRvIHRvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjEvZmxhZ192MS5tYXAKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvZGF0YS92MS9mbGFnLnZhbCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjEvZmxhZ192MS52YWwKc2ltaWxhcml0eSBpbmRleCAxMDAlCnJlbmFtZSBmcm9tIHRvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjEvZmxhZy52YWwKcmVuYW1lIHRvIHRvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjEvZmxhZ192MS52YWwKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvZGF0YS92MS9wYWNrYWdlLm1hcCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjEvcGFja2FnZV92MS5tYXAKc2ltaWxhcml0eSBpbmRleCAxMDAlCnJlbmFtZSBmcm9tIHRvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjEvcGFja2FnZS5tYXAKcmVuYW1lIHRvIHRvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjEvcGFja2FnZV92MS5tYXAKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvZGF0YS92Mi9mbGFnX3YyLmluZm8gYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9kYXRhL3YyL2ZsYWdfdjIuaW5mbwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45ZGI3ZmRlCi0tLSAvZGV2L251bGwKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvZGF0YS92Mi9mbGFnX3YyLmluZm8KQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvZGF0YS92Mi9mbGFnX3YyLm1hcCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjIvZmxhZ192Mi5tYXAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uY2Y0Njg1YwotLS0gL2Rldi9udWxsCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjIvZmxhZ192Mi5tYXAKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvZGF0YS92Mi9mbGFnX3YyLnZhbCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjIvZmxhZ192Mi52YWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzdkNDc1MAotLS0gL2Rldi9udWxsCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjIvZmxhZ192Mi52YWwKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvZGF0YS92Mi9wYWNrYWdlX3YyLm1hcCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjIvcGFja2FnZV92Mi5tYXAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMTZmNDA1NAotLS0gL2Rldi9udWxsCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2RhdGEvdjIvcGFja2FnZV92Mi5tYXAKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvamF2YS9BY29uZmlnUGFja2FnZUltcGxUZXN0LmphdmEgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9qYXZhL0Fjb25maWdQYWNrYWdlSW1wbFRlc3QuamF2YQppbmRleCAxOGY3MGU4Li44MGMwOTk0IDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9qYXZhL0Fjb25maWdQYWNrYWdlSW1wbFRlc3QuamF2YQorKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9qYXZhL0Fjb25maWdQYWNrYWdlSW1wbFRlc3QuamF2YQpAQCAtNTcsMTMgKzU3LDEzIEBACiAgICAgQFRlc3QKICAgICBwdWJsaWMgdm9pZCB0ZXN0TG9hZF9lcnJvcigpIHRocm93cyBFeGNlcHRpb24gewogICAgICAgICBBY29uZmlnUGFja2FnZUltcGwgcDsKKyAgICAgICAgLy8gY2Fubm90IGZpbmQgcGFja2FnZQogICAgICAgICBBY29uZmlnU3RvcmFnZUV4Y2VwdGlvbiBlID0KICAgICAgICAgICAgICAgICBhc3NlcnRUaHJvd3MoCiAgICAgICAgICAgICAgICAgICAgICAgICBBY29uZmlnU3RvcmFnZUV4Y2VwdGlvbi5jbGFzcywKICAgICAgICAgICAgICAgICAgICAgICAgICgpIC0+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFjb25maWdQYWNrYWdlSW1wbC5sb2FkKAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJtb2NrdXAiLCAiY29tLmFuZHJvaWQuYWNvbmZpZy5zdG9yYWdlLnRlc3RfMTAiLCBwcikpOwotICAgICAgICAvLyBjYW5ub3QgZmluZCBwYWNrYWdlCiAgICAgICAgIGFzc2VydEVxdWFscyhBY29uZmlnU3RvcmFnZUV4Y2VwdGlvbi5FUlJPUl9QQUNLQUdFX05PVF9GT1VORCwgZS5nZXRFcnJvckNvZGUoKSk7CiAgICAgICAgIC8vIGNhbm5vdCBmaW5kIHBhY2thZ2UKICAgICAgICAgZSA9CkBAIC03OCwxNCArNzgsMTQgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICgpIC0+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFjb25maWdQYWNrYWdlSW1wbC5sb2FkKAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG51bGwsICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8xIiwgcHIpKTsKLSAgICAgICAgYXNzZXJ0RXF1YWxzKEFjb25maWdTdG9yYWdlRXhjZXB0aW9uLkVSUk9SX0NPTlRBSU5FUl9OT1RfRk9VTkQsIGUuZ2V0RXJyb3JDb2RlKCkpOworICAgICAgICBhc3NlcnRFcXVhbHMoQWNvbmZpZ1N0b3JhZ2VFeGNlcHRpb24uRVJST1JfQ0FOTk9UX1JFQURfU1RPUkFHRV9GSUxFLCBlLmdldEVycm9yQ29kZSgpKTsKICAgICAgICAgZSA9CiAgICAgICAgICAgICAgICAgYXNzZXJ0VGhyb3dzKAogICAgICAgICAgICAgICAgICAgICAgICAgQWNvbmZpZ1N0b3JhZ2VFeGNlcHRpb24uY2xhc3MsCiAgICAgICAgICAgICAgICAgICAgICAgICAoKSAtPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBBY29uZmlnUGFja2FnZUltcGwubG9hZCgKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidGVzdCIsICJjb20uYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdF8xIiwgcHIpKTsKLSAgICAgICAgYXNzZXJ0RXF1YWxzKEFjb25maWdTdG9yYWdlRXhjZXB0aW9uLkVSUk9SX0NPTlRBSU5FUl9OT1RfRk9VTkQsIGUuZ2V0RXJyb3JDb2RlKCkpOworICAgICAgICBhc3NlcnRFcXVhbHMoQWNvbmZpZ1N0b3JhZ2VFeGNlcHRpb24uRVJST1JfQ0FOTk9UX1JFQURfU1RPUkFHRV9GSUxFLCBlLmdldEVycm9yQ29kZSgpKTsKIAogICAgICAgICAvLyBuZXcgc3RvcmFnZSBkb2Vzbid0IGV4aXN0CiAgICAgICAgIHByID0gbmV3IFN0b3JhZ2VGaWxlUHJvdmlkZXIoImZha2UvcGF0aC8iLCAiZmFrZS9wYXRoLyIpOwpAQCAtOTMsNyArOTMsNyBAQAogICAgICAgICAgICAgICAgIGFzc2VydFRocm93cygKICAgICAgICAgICAgICAgICAgICAgICAgIEFjb25maWdTdG9yYWdlRXhjZXB0aW9uLmNsYXNzLAogICAgICAgICAgICAgICAgICAgICAgICAgKCkgLT4gQWNvbmZpZ1BhY2thZ2VJbXBsLmxvYWQoImZha2VfcGFja2FnZSIsIHByKSk7Ci0gICAgICAgIGFzc2VydEVxdWFscyhBY29uZmlnU3RvcmFnZUV4Y2VwdGlvbi5FUlJPUl9TVE9SQUdFX1NZU1RFTV9OT1RfRk9VTkQsIGUuZ2V0RXJyb3JDb2RlKCkpOworICAgICAgICBhc3NlcnRFcXVhbHMoQWNvbmZpZ1N0b3JhZ2VFeGNlcHRpb24uRVJST1JfUEFDS0FHRV9OT1RfRk9VTkQsIGUuZ2V0RXJyb3JDb2RlKCkpOwogCiAgICAgICAgIC8vIGZpbGUgcmVhZCBpc3N1ZQogICAgICAgICBwciA9IG5ldyBTdG9yYWdlRmlsZVByb3ZpZGVyKFRlc3REYXRhVXRpbHMuVEVTVERBVEFfUEFUSCwgImZha2UvcGF0aC8iKTsKQEAgLTEyNCwxMSArMTI0LDQgQEAKICAgICAgICAgYXNzZXJ0VHJ1ZShwLmdldEJvb2xlYW5GbGFnVmFsdWUoMSkpOwogICAgICAgICBhc3NlcnRUcnVlKHAuZ2V0Qm9vbGVhbkZsYWdWYWx1ZSgyKSk7CiAgICAgfQotCi0gICAgQFRlc3QKLSAgICBwdWJsaWMgdm9pZCB0ZXN0SGFzUGFja2FnZUZpbmdlcnByaW50KCkgdGhyb3dzIEV4Y2VwdGlvbiB7Ci0gICAgICAgIEFjb25maWdQYWNrYWdlSW1wbCBwID0KLSAgICAgICAgICAgICAgICBBY29uZmlnUGFja2FnZUltcGwubG9hZCgibW9ja3VwIiwgImNvbS5hbmRyb2lkLmFjb25maWcuc3RvcmFnZS50ZXN0XzEiLCBwcik7Ci0gICAgICAgIGFzc2VydEZhbHNlKHAuaGFzUGFja2FnZUZpbmdlcnByaW50KCkpOwotICAgIH0KIH0KZGlmZiAtLWdpdCBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2phdmEvQW5kcm9pZC5icCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2phdmEvQW5kcm9pZC5icAppbmRleCA5Yzg4MTIyLi4wZGUzNGE2IDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9qYXZhL0FuZHJvaWQuYnAKKysrIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvamF2YS9BbmRyb2lkLmJwCkBAIC0yOCw3ICsyOCw2IEBACiAgICAgdGVhbTogInRyZW5keV90ZWFtX2FuZHJvaWRfY29yZV9leHBlcmltZW50cyIsCiAgICAgc3JjczogWwogICAgICAgICAiQWNvbmZpZ1BhY2thZ2VJbXBsVGVzdC5qYXZhIiwKLSAgICAgICAgIlN0b3JhZ2VGaWxlUHJvdmlkZXJUZXN0LmphdmEiLAogICAgICAgICAiVGVzdERhdGFVdGlscy5qYXZhIiwKICAgICBdLAogICAgIHN0YXRpY19saWJzOiBbCmRpZmYgLS1naXQgYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9qYXZhL0FuZHJvaWRTdG9yYWdlSmF2ZVRlc3QueG1sIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvamF2YS9BbmRyb2lkU3RvcmFnZUphdmVUZXN0LnhtbAppbmRleCAzZDViYjhlLi44NjFiOWI1IDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9qYXZhL0FuZHJvaWRTdG9yYWdlSmF2ZVRlc3QueG1sCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL2phdmEvQW5kcm9pZFN0b3JhZ2VKYXZlVGVzdC54bWwKQEAgLTIxLDE0ICsyMSwxNCBAQAogICAgIDwvdGFyZ2V0X3ByZXBhcmVyPgogICAgIDx0YXJnZXRfcHJlcGFyZXIgY2xhc3M9ImNvbS5hbmRyb2lkLmNvbXBhdGliaWxpdHkuY29tbW9uLnRyYWRlZmVkLnRhcmdldHByZXAuRmlsZVB1c2hlciI+CiAgICAgICAgIDxvcHRpb24gbmFtZT0iY2xlYW51cCIgdmFsdWU9InRydWUiIC8+Ci0gICAgICAgIDxvcHRpb24gbmFtZT0icHVzaCIgdmFsdWU9InBhY2thZ2UubWFwLT4vZGF0YS9sb2NhbC90bXAvYWNvbmZpZ19zdG9yYWdlX3BhY2thZ2UvdGVzdGRhdGEvbW9ja3VwLnBhY2thZ2UubWFwIiAvPgotICAgICAgICA8b3B0aW9uIG5hbWU9InB1c2giIHZhbHVlPSJmbGFnLm1hcC0+L2RhdGEvbG9jYWwvdG1wL2Fjb25maWdfc3RvcmFnZV9wYWNrYWdlL3Rlc3RkYXRhL21vY2t1cC5mbGFnLm1hcCIgLz4KLSAgICAgICAgPG9wdGlvbiBuYW1lPSJwdXNoIiB2YWx1ZT0iZmxhZy52YWwtPi9kYXRhL2xvY2FsL3RtcC9hY29uZmlnX3N0b3JhZ2VfcGFja2FnZS90ZXN0ZGF0YS9tb2NrdXAudmFsIiAvPgotICAgICAgICA8b3B0aW9uIG5hbWU9InB1c2giIHZhbHVlPSJmbGFnLmluZm8tPi9kYXRhL2xvY2FsL3RtcC9hY29uZmlnX3N0b3JhZ2VfcGFja2FnZS90ZXN0ZGF0YS9tb2NrdXAuaW5mbyIgLz4KKyAgICAgICAgPG9wdGlvbiBuYW1lPSJwdXNoIiB2YWx1ZT0icGFja2FnZV92MS5tYXAtPi9kYXRhL2xvY2FsL3RtcC9hY29uZmlnX3N0b3JhZ2VfcGFja2FnZS90ZXN0ZGF0YS9tb2NrdXAucGFja2FnZS5tYXAiIC8+CisgICAgICAgIDxvcHRpb24gbmFtZT0icHVzaCIgdmFsdWU9ImZsYWdfdjEubWFwLT4vZGF0YS9sb2NhbC90bXAvYWNvbmZpZ19zdG9yYWdlX3BhY2thZ2UvdGVzdGRhdGEvbW9ja3VwLmZsYWcubWFwIiAvPgorICAgICAgICA8b3B0aW9uIG5hbWU9InB1c2giIHZhbHVlPSJmbGFnX3YxLnZhbC0+L2RhdGEvbG9jYWwvdG1wL2Fjb25maWdfc3RvcmFnZV9wYWNrYWdlL3Rlc3RkYXRhL21vY2t1cC52YWwiIC8+CisgICAgICAgIDxvcHRpb24gbmFtZT0icHVzaCIgdmFsdWU9ImZsYWdfdjEuaW5mby0+L2RhdGEvbG9jYWwvdG1wL2Fjb25maWdfc3RvcmFnZV9wYWNrYWdlL3Rlc3RkYXRhL21vY2t1cC5pbmZvIiAvPgogICAgICAgICA8b3B0aW9uIG5hbWU9InBvc3QtcHVzaCIgdmFsdWU9ImNobW9kICtyIC9kYXRhL2xvY2FsL3RtcC9hY29uZmlnX3N0b3JhZ2VfcGFja2FnZS90ZXN0ZGF0YS8iIC8+CiAgICAgPC90YXJnZXRfcHJlcGFyZXI+CiAgICAgPHRlc3QgY2xhc3M9ImNvbS5hbmRyb2lkLnRyYWRlZmVkLnRlc3R0eXBlLkFuZHJvaWRKVW5pdFRlc3QiID4KICAgICAgICAgPG9wdGlvbiBuYW1lPSJwYWNrYWdlIiB2YWx1ZT0iYW5kcm9pZC5hY29uZmlnLnN0b3JhZ2UudGVzdCIgLz4KICAgICAgICAgPG9wdGlvbiBuYW1lPSJydW50aW1lLWhpbnQiIHZhbHVlPSIxbSIgLz4KICAgICA8L3Rlc3Q+Ci08L2NvbmZpZ3VyYXRpb24+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorPC9jb25maWd1cmF0aW9uPgpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvamF2YS9BbmRyb2lkVGVzdC54bWwgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9qYXZhL0FuZHJvaWRUZXN0LnhtbAppbmRleCA5OWM5ZTI1Li43ZmZhMThjIDEwMDY0NAotLS0gYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9qYXZhL0FuZHJvaWRUZXN0LnhtbAorKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9qYXZhL0FuZHJvaWRUZXN0LnhtbApAQCAtMzUsMTEgKzM1LDExIEBACiAgICAgPHRhcmdldF9wcmVwYXJlciBjbGFzcz0iY29tLmFuZHJvaWQudHJhZGVmZWQudGFyZ2V0cHJlcC5QdXNoRmlsZVByZXBhcmVyIj4KICAgICAgICAgPG9wdGlvbiBuYW1lPSJjbGVhbnVwIiB2YWx1ZT0idHJ1ZSIgLz4KICAgICAgICAgPG9wdGlvbiBuYW1lPSJhYm9ydC1vbi1wdXNoLWZhaWx1cmUiIHZhbHVlPSJ0cnVlIiAvPgotICAgICAgICA8b3B0aW9uIG5hbWU9InB1c2gtZmlsZSIga2V5PSJwYWNrYWdlLm1hcCIKKyAgICAgICAgPG9wdGlvbiBuYW1lPSJwdXNoLWZpbGUiIGtleT0icGFja2FnZV92MS5tYXAiCiAgICAgICAgICAgICAgICAgdmFsdWU9Ii9kYXRhL2xvY2FsL3RtcC9hY29uZmlnX2phdmFfYXBpX3Rlc3QvbWFwcy9tb2NrdXAucGFja2FnZS5tYXAiIC8+Ci0gICAgICAgIDxvcHRpb24gbmFtZT0icHVzaC1maWxlIiBrZXk9ImZsYWcubWFwIgorICAgICAgICA8b3B0aW9uIG5hbWU9InB1c2gtZmlsZSIga2V5PSJmbGFnX3YxLm1hcCIKICAgICAgICAgICAgICAgICB2YWx1ZT0iL2RhdGEvbG9jYWwvdG1wL2Fjb25maWdfamF2YV9hcGlfdGVzdC9tYXBzL21vY2t1cC5mbGFnLm1hcCIgLz4KLSAgICAgICAgPG9wdGlvbiBuYW1lPSJwdXNoLWZpbGUiIGtleT0iZmxhZy52YWwiCisgICAgICAgIDxvcHRpb24gbmFtZT0icHVzaC1maWxlIiBrZXk9ImZsYWdfdjEudmFsIgogICAgICAgICAgICAgICAgIHZhbHVlPSIvZGF0YS9sb2NhbC90bXAvYWNvbmZpZ19qYXZhX2FwaV90ZXN0L2Jvb3QvbW9ja3VwLnZhbCIgLz4KICAgICA8L3RhcmdldF9wcmVwYXJlcj4KIApkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvc3RvcmFnZV9yZWFkX2FwaV90ZXN0LmNwcCBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL3N0b3JhZ2VfcmVhZF9hcGlfdGVzdC5jcHAKaW5kZXggNzUzNzY0My4uNTI4OWZhYSAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvc3RvcmFnZV9yZWFkX2FwaV90ZXN0LmNwcAorKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9zdG9yYWdlX3JlYWRfYXBpX3Rlc3QuY3BwCkBAIC01NiwxMCArNTYsMTAgQEAKICAgICBmbGFnX21hcCA9IHN0ZDo6c3RyaW5nKG1hcHNfZGlyKSArICIvbW9ja3VwLmZsYWcubWFwIjsKICAgICBmbGFnX3ZhbCA9IHN0ZDo6c3RyaW5nKGJvb3RfZGlyKSArICIvbW9ja3VwLnZhbCI7CiAgICAgZmxhZ19pbmZvID0gc3RkOjpzdHJpbmcoYm9vdF9kaXIpICsgIi9tb2NrdXAuaW5mbyI7Ci0gICAgY29weV9maWxlKHRlc3RfZGlyICsgIi9wYWNrYWdlLm1hcCIsIHBhY2thZ2VfbWFwKTsKLSAgICBjb3B5X2ZpbGUodGVzdF9kaXIgKyAiL2ZsYWcubWFwIiwgZmxhZ19tYXApOwotICAgIGNvcHlfZmlsZSh0ZXN0X2RpciArICIvZmxhZy52YWwiLCBmbGFnX3ZhbCk7Ci0gICAgY29weV9maWxlKHRlc3RfZGlyICsgIi9mbGFnLmluZm8iLCBmbGFnX2luZm8pOworICAgIGNvcHlfZmlsZSh0ZXN0X2RpciArICIvcGFja2FnZV92MS5tYXAiLCBwYWNrYWdlX21hcCk7CisgICAgY29weV9maWxlKHRlc3RfZGlyICsgIi9mbGFnX3YxLm1hcCIsIGZsYWdfbWFwKTsKKyAgICBjb3B5X2ZpbGUodGVzdF9kaXIgKyAiL2ZsYWdfdjEudmFsIiwgZmxhZ192YWwpOworICAgIGNvcHlfZmlsZSh0ZXN0X2RpciArICIvZmxhZ192MS5pbmZvIiwgZmxhZ19pbmZvKTsKICAgfQogCiAgIHZvaWQgVGVhckRvd24oKSBvdmVycmlkZSB7CmRpZmYgLS1naXQgYS90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9zdG9yYWdlX3JlYWRfYXBpX3Rlc3QucnMgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV9yZWFkX2FwaS90ZXN0cy9zdG9yYWdlX3JlYWRfYXBpX3Rlc3QucnMKaW5kZXggMGQ5NDNmOC4uNTYwNWE0MSAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2VfcmVhZF9hcGkvdGVzdHMvc3RvcmFnZV9yZWFkX2FwaV90ZXN0LnJzCisrKyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3JlYWRfYXBpL3Rlc3RzL3N0b3JhZ2VfcmVhZF9hcGlfdGVzdC5ycwpAQCAtOSw3ICs5LDcgQEAKICAgICB1c2UgcmFuZDo6Um5nOwogICAgIHVzZSBzdGQ6OmZzOwogCi0gICAgZm4gY3JlYXRlX3Rlc3Rfc3RvcmFnZV9maWxlcygpIC0+IFN0cmluZyB7CisgICAgZm4gY3JlYXRlX3Rlc3Rfc3RvcmFnZV9maWxlcyh2ZXJzaW9uOiB1MzIpIC0+IFN0cmluZyB7CiAgICAgICAgIGxldCBtdXQgcm5nID0gcmFuZDo6dGhyZWFkX3JuZygpOwogICAgICAgICBsZXQgbnVtYmVyOiB1MzIgPSBybmcuZ2VuKCk7CiAgICAgICAgIGxldCBzdG9yYWdlX2RpciA9IFN0cmluZzo6ZnJvbSgiL3RtcC8iKSArICZudW1iZXIudG9fc3RyaW5nKCk7CkBAIC0yNiwxNyArMjYsMTcgQEAKICAgICAgICAgbGV0IGZsYWdfbWFwID0gc3RvcmFnZV9kaXIuY2xvbmUoKSArICIvbWFwcy9tb2NrdXAuZmxhZy5tYXAiOwogICAgICAgICBsZXQgZmxhZ192YWwgPSBzdG9yYWdlX2Rpci5jbG9uZSgpICsgIi9ib290L21vY2t1cC52YWwiOwogICAgICAgICBsZXQgZmxhZ19pbmZvID0gc3RvcmFnZV9kaXIuY2xvbmUoKSArICIvYm9vdC9tb2NrdXAuaW5mbyI7Ci0gICAgICAgIGZzOjpjb3B5KCIuL2RhdGEvdjEvcGFja2FnZS5tYXAiLCBwYWNrYWdlX21hcCkudW53cmFwKCk7Ci0gICAgICAgIGZzOjpjb3B5KCIuL2RhdGEvdjEvZmxhZy5tYXAiLCBmbGFnX21hcCkudW53cmFwKCk7Ci0gICAgICAgIGZzOjpjb3B5KCIuL2RhdGEvdjEvZmxhZy52YWwiLCBmbGFnX3ZhbCkudW53cmFwKCk7Ci0gICAgICAgIGZzOjpjb3B5KCIuL2RhdGEvdjEvZmxhZy5pbmZvIiwgZmxhZ19pbmZvKS51bndyYXAoKTsKKyAgICAgICAgZnM6OmNvcHkoZm9ybWF0ISgiLi9kYXRhL3Z7MH0vcGFja2FnZV92ezB9Lm1hcCIsIHZlcnNpb24pLCBwYWNrYWdlX21hcCkudW53cmFwKCk7CisgICAgICAgIGZzOjpjb3B5KGZvcm1hdCEoIi4vZGF0YS92ezB9L2ZsYWdfdnswfS5tYXAiLCB2ZXJzaW9uKSwgZmxhZ19tYXApLnVud3JhcCgpOworICAgICAgICBmczo6Y29weShmb3JtYXQhKCIuL2RhdGEvdnt9L2ZsYWdfdnswfS52YWwiLCB2ZXJzaW9uKSwgZmxhZ192YWwpLnVud3JhcCgpOworICAgICAgICBmczo6Y29weShmb3JtYXQhKCIuL2RhdGEvdnt9L2ZsYWdfdnswfS5pbmZvIiwgdmVyc2lvbiksIGZsYWdfaW5mbykudW53cmFwKCk7CiAKICAgICAgICAgc3RvcmFnZV9kaXIKICAgICB9CiAKICAgICAjW3Rlc3RdCi0gICAgZm4gdGVzdF91bmF2YWlsYWJsZV9zdG9hcmdlKCkgewotICAgICAgICBsZXQgc3RvcmFnZV9kaXIgPSBjcmVhdGVfdGVzdF9zdG9yYWdlX2ZpbGVzKCk7CisgICAgZm4gdGVzdF91bmF2YWlsYWJsZV9zdG9yYWdlKCkgeworICAgICAgICBsZXQgc3RvcmFnZV9kaXIgPSBjcmVhdGVfdGVzdF9zdG9yYWdlX2ZpbGVzKDEpOwogICAgICAgICAvLyBTQUZFVFk6CiAgICAgICAgIC8vIFRoZSBzYWZldHkgaGVyZSBpcyBlbnN1cmVkIGFzIHRoZSB0ZXN0IHByb2Nlc3Mgd2lsbCBub3Qgd3JpdGUgdG8gdGVtcCBzdG9yYWdlIGZpbGUKICAgICAgICAgbGV0IGVyciA9IHVuc2FmZSB7CkBAIC01Myw3ICs1Myw3IEBACiAKICAgICAjW3Rlc3RdCiAgICAgZm4gdGVzdF9wYWNrYWdlX2NvbnRleHRfcXVlcnkoKSB7Ci0gICAgICAgIGxldCBzdG9yYWdlX2RpciA9IGNyZWF0ZV90ZXN0X3N0b3JhZ2VfZmlsZXMoKTsKKyAgICAgICAgbGV0IHN0b3JhZ2VfZGlyID0gY3JlYXRlX3Rlc3Rfc3RvcmFnZV9maWxlcygxKTsKICAgICAgICAgLy8gU0FGRVRZOgogICAgICAgICAvLyBUaGUgc2FmZXR5IGhlcmUgaXMgZW5zdXJlZCBhcyB0aGUgdGVzdCBwcm9jZXNzIHdpbGwgbm90IHdyaXRlIHRvIHRlbXAgc3RvcmFnZSBmaWxlCiAgICAgICAgIGxldCBwYWNrYWdlX21hcHBlZF9maWxlID0gdW5zYWZlIHsKQEAgLTg0LDcgKzg0LDcgQEAKIAogICAgICNbdGVzdF0KICAgICBmbiB0ZXN0X25vbmVfZXhpc3RfcGFja2FnZV9jb250ZXh0X3F1ZXJ5KCkgewotICAgICAgICBsZXQgc3RvcmFnZV9kaXIgPSBjcmVhdGVfdGVzdF9zdG9yYWdlX2ZpbGVzKCk7CisgICAgICAgIGxldCBzdG9yYWdlX2RpciA9IGNyZWF0ZV90ZXN0X3N0b3JhZ2VfZmlsZXMoMSk7CiAgICAgICAgIC8vIFNBRkVUWToKICAgICAgICAgLy8gVGhlIHNhZmV0eSBoZXJlIGlzIGVuc3VyZWQgYXMgdGhlIHRlc3QgcHJvY2VzcyB3aWxsIG5vdCB3cml0ZSB0byB0ZW1wIHN0b3JhZ2UgZmlsZQogICAgICAgICBsZXQgcGFja2FnZV9tYXBwZWRfZmlsZSA9IHVuc2FmZSB7CkBAIC05OSw3ICs5OSw3IEBACiAKICAgICAjW3Rlc3RdCiAgICAgZm4gdGVzdF9mbGFnX2NvbnRleHRfcXVlcnkoKSB7Ci0gICAgICAgIGxldCBzdG9yYWdlX2RpciA9IGNyZWF0ZV90ZXN0X3N0b3JhZ2VfZmlsZXMoKTsKKyAgICAgICAgbGV0IHN0b3JhZ2VfZGlyID0gY3JlYXRlX3Rlc3Rfc3RvcmFnZV9maWxlcygxKTsKICAgICAgICAgLy8gU0FGRVRZOgogICAgICAgICAvLyBUaGUgc2FmZXR5IGhlcmUgaXMgZW5zdXJlZCBhcyB0aGUgdGVzdCBwcm9jZXNzIHdpbGwgbm90IHdyaXRlIHRvIHRlbXAgc3RvcmFnZSBmaWxlCiAgICAgICAgIGxldCBmbGFnX21hcHBlZF9maWxlID0KQEAgLTEyNSw3ICsxMjUsNyBAQAogCiAgICAgI1t0ZXN0XQogICAgIGZuIHRlc3Rfbm9uZV9leGlzdF9mbGFnX2NvbnRleHRfcXVlcnkoKSB7Ci0gICAgICAgIGxldCBzdG9yYWdlX2RpciA9IGNyZWF0ZV90ZXN0X3N0b3JhZ2VfZmlsZXMoKTsKKyAgICAgICAgbGV0IHN0b3JhZ2VfZGlyID0gY3JlYXRlX3Rlc3Rfc3RvcmFnZV9maWxlcygxKTsKICAgICAgICAgLy8gU0FGRVRZOgogICAgICAgICAvLyBUaGUgc2FmZXR5IGhlcmUgaXMgZW5zdXJlZCBhcyB0aGUgdGVzdCBwcm9jZXNzIHdpbGwgbm90IHdyaXRlIHRvIHRlbXAgc3RvcmFnZSBmaWxlCiAgICAgICAgIGxldCBmbGFnX21hcHBlZF9maWxlID0KQEAgLTE0MSw3ICsxNDEsNyBAQAogCiAgICAgI1t0ZXN0XQogICAgIGZuIHRlc3RfYm9vbGVhbl9mbGFnX3ZhbHVlX3F1ZXJ5KCkgewotICAgICAgICBsZXQgc3RvcmFnZV9kaXIgPSBjcmVhdGVfdGVzdF9zdG9yYWdlX2ZpbGVzKCk7CisgICAgICAgIGxldCBzdG9yYWdlX2RpciA9IGNyZWF0ZV90ZXN0X3N0b3JhZ2VfZmlsZXMoMSk7CiAgICAgICAgIC8vIFNBRkVUWToKICAgICAgICAgLy8gVGhlIHNhZmV0eSBoZXJlIGlzIGVuc3VyZWQgYXMgdGhlIHRlc3QgcHJvY2VzcyB3aWxsIG5vdCB3cml0ZSB0byB0ZW1wIHN0b3JhZ2UgZmlsZQogICAgICAgICBsZXQgZmxhZ192YWx1ZV9maWxlID0KQEAgLTE1NSw3ICsxNTUsNyBAQAogCiAgICAgI1t0ZXN0XQogICAgIGZuIHRlc3RfaW52YWxpZF9ib29sZWFuX2ZsYWdfdmFsdWVfcXVlcnkoKSB7Ci0gICAgICAgIGxldCBzdG9yYWdlX2RpciA9IGNyZWF0ZV90ZXN0X3N0b3JhZ2VfZmlsZXMoKTsKKyAgICAgICAgbGV0IHN0b3JhZ2VfZGlyID0gY3JlYXRlX3Rlc3Rfc3RvcmFnZV9maWxlcygxKTsKICAgICAgICAgLy8gU0FGRVRZOgogICAgICAgICAvLyBUaGUgc2FmZXR5IGhlcmUgaXMgZW5zdXJlZCBhcyB0aGUgdGVzdCBwcm9jZXNzIHdpbGwgbm90IHdyaXRlIHRvIHRlbXAgc3RvcmFnZSBmaWxlCiAgICAgICAgIGxldCBmbGFnX3ZhbHVlX2ZpbGUgPQpAQCAtMTY5LDcgKzE2OSw3IEBACiAKICAgICAjW3Rlc3RdCiAgICAgZm4gdGVzdF9mbGFnX2luZm9fcXVlcnkoKSB7Ci0gICAgICAgIGxldCBzdG9yYWdlX2RpciA9IGNyZWF0ZV90ZXN0X3N0b3JhZ2VfZmlsZXMoKTsKKyAgICAgICAgbGV0IHN0b3JhZ2VfZGlyID0gY3JlYXRlX3Rlc3Rfc3RvcmFnZV9maWxlcygxKTsKICAgICAgICAgLy8gU0FGRVRZOgogICAgICAgICAvLyBUaGUgc2FmZXR5IGhlcmUgaXMgZW5zdXJlZCBhcyB0aGUgdGVzdCBwcm9jZXNzIHdpbGwgbm90IHdyaXRlIHRvIHRlbXAgc3RvcmFnZSBmaWxlCiAgICAgICAgIGxldCBmbGFnX2luZm9fZmlsZSA9CkBAIC0xODYsNyArMTg2LDcgQEAKIAogICAgICNbdGVzdF0KICAgICBmbiB0ZXN0X2ludmFsaWRfYm9vbGVhbl9mbGFnX2luZm9fcXVlcnkoKSB7Ci0gICAgICAgIGxldCBzdG9yYWdlX2RpciA9IGNyZWF0ZV90ZXN0X3N0b3JhZ2VfZmlsZXMoKTsKKyAgICAgICAgbGV0IHN0b3JhZ2VfZGlyID0gY3JlYXRlX3Rlc3Rfc3RvcmFnZV9maWxlcygxKTsKICAgICAgICAgLy8gU0FGRVRZOgogICAgICAgICAvLyBUaGUgc2FmZXR5IGhlcmUgaXMgZW5zdXJlZCBhcyB0aGUgdGVzdCBwcm9jZXNzIHdpbGwgbm90IHdyaXRlIHRvIHRlbXAgc3RvcmFnZSBmaWxlCiAgICAgICAgIGxldCBmbGFnX2luZm9fZmlsZSA9CkBAIC0xOTksMTAgKzE5OSwxOCBAQAogICAgIH0KIAogICAgICNbdGVzdF0KLSAgICBmbiB0ZXN0X3N0b3JhZ2VfdmVyc2lvbl9xdWVyeSgpIHsKLSAgICAgICAgYXNzZXJ0X2VxIShnZXRfc3RvcmFnZV9maWxlX3ZlcnNpb24oIi4vZGF0YS92MS9wYWNrYWdlLm1hcCIpLnVud3JhcCgpLCAxKTsKLSAgICAgICAgYXNzZXJ0X2VxIShnZXRfc3RvcmFnZV9maWxlX3ZlcnNpb24oIi4vZGF0YS92MS9mbGFnLm1hcCIpLnVud3JhcCgpLCAxKTsKLSAgICAgICAgYXNzZXJ0X2VxIShnZXRfc3RvcmFnZV9maWxlX3ZlcnNpb24oIi4vZGF0YS92MS9mbGFnLnZhbCIpLnVud3JhcCgpLCAxKTsKLSAgICAgICAgYXNzZXJ0X2VxIShnZXRfc3RvcmFnZV9maWxlX3ZlcnNpb24oIi4vZGF0YS92MS9mbGFnLmluZm8iKS51bndyYXAoKSwgMSk7CisgICAgZm4gdGVzdF9zdG9yYWdlX3ZlcnNpb25fcXVlcnlfdjEoKSB7CisgICAgICAgIGFzc2VydF9lcSEoZ2V0X3N0b3JhZ2VfZmlsZV92ZXJzaW9uKCIuL2RhdGEvdjEvcGFja2FnZV92MS5tYXAiKS51bndyYXAoKSwgMSk7CisgICAgICAgIGFzc2VydF9lcSEoZ2V0X3N0b3JhZ2VfZmlsZV92ZXJzaW9uKCIuL2RhdGEvdjEvZmxhZ192MS5tYXAiKS51bndyYXAoKSwgMSk7CisgICAgICAgIGFzc2VydF9lcSEoZ2V0X3N0b3JhZ2VfZmlsZV92ZXJzaW9uKCIuL2RhdGEvdjEvZmxhZ192MS52YWwiKS51bndyYXAoKSwgMSk7CisgICAgICAgIGFzc2VydF9lcSEoZ2V0X3N0b3JhZ2VfZmlsZV92ZXJzaW9uKCIuL2RhdGEvdjEvZmxhZ192MS5pbmZvIikudW53cmFwKCksIDEpOworICAgIH0KKworICAgICNbdGVzdF0KKyAgICBmbiB0ZXN0X3N0b3JhZ2VfdmVyc2lvbl9xdWVyeV92MigpIHsKKyAgICAgICAgYXNzZXJ0X2VxIShnZXRfc3RvcmFnZV9maWxlX3ZlcnNpb24oIi4vZGF0YS92Mi9wYWNrYWdlX3YyLm1hcCIpLnVud3JhcCgpLCAyKTsKKyAgICAgICAgYXNzZXJ0X2VxIShnZXRfc3RvcmFnZV9maWxlX3ZlcnNpb24oIi4vZGF0YS92Mi9mbGFnX3YyLm1hcCIpLnVud3JhcCgpLCAyKTsKKyAgICAgICAgYXNzZXJ0X2VxIShnZXRfc3RvcmFnZV9maWxlX3ZlcnNpb24oIi4vZGF0YS92Mi9mbGFnX3YyLnZhbCIpLnVud3JhcCgpLCAyKTsKKyAgICAgICAgYXNzZXJ0X2VxIShnZXRfc3RvcmFnZV9maWxlX3ZlcnNpb24oIi4vZGF0YS92Mi9mbGFnX3YyLmluZm8iKS51bndyYXAoKSwgMik7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2Vfd3JpdGVfYXBpL3NyYy9mbGFnX2luZm9fdXBkYXRlLnJzIGIvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2Vfd3JpdGVfYXBpL3NyYy9mbGFnX2luZm9fdXBkYXRlLnJzCmluZGV4IDU2NDA5MjIuLjU3MjExMDUgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3dyaXRlX2FwaS9zcmMvZmxhZ19pbmZvX3VwZGF0ZS5ycworKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV93cml0ZV9hcGkvc3JjL2ZsYWdfaW5mb191cGRhdGUucnMKQEAgLTk0LDEzICs5NCwxMyBAQAogI1tjZmcodGVzdCldCiBtb2QgdGVzdHMgewogICAgIHVzZSBzdXBlcjo6KjsKLSAgICB1c2UgYWNvbmZpZ19zdG9yYWdlX2ZpbGU6OnRlc3RfdXRpbHM6OmNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0OworICAgIHVzZSBhY29uZmlnX3N0b3JhZ2VfZmlsZTo6e3Rlc3RfdXRpbHM6OmNyZWF0ZV90ZXN0X2ZsYWdfaW5mb19saXN0LCBERUZBVUxUX0ZJTEVfVkVSU0lPTn07CiAgICAgdXNlIGFjb25maWdfc3RvcmFnZV9yZWFkX2FwaTo6ZmxhZ19pbmZvX3F1ZXJ5OjpmaW5kX2ZsYWdfYXR0cmlidXRlOwogCiAgICAgI1t0ZXN0XQogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIGhhcyBzZXJ2ZXIgb3ZlcnJpZGUgdXBkYXRlCiAgICAgZm4gdGVzdF91cGRhdGVfZmxhZ19oYXNfc2VydmVyX292ZXJyaWRlKCkgewotICAgICAgICBsZXQgZmxhZ19pbmZvX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX2luZm9fbGlzdCgpOworICAgICAgICBsZXQgZmxhZ19pbmZvX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX2luZm9fbGlzdChERUZBVUxUX0ZJTEVfVkVSU0lPTik7CiAgICAgICAgIGxldCBtdXQgYnVmID0gZmxhZ19pbmZvX2xpc3QuaW50b19ieXRlcygpOwogICAgICAgICBmb3IgaSBpbiAwLi5mbGFnX2luZm9fbGlzdC5oZWFkZXIubnVtX2ZsYWdzIHsKICAgICAgICAgICAgIHVwZGF0ZV9mbGFnX2hhc19zZXJ2ZXJfb3ZlcnJpZGUoJm11dCBidWYsIEZsYWdWYWx1ZVR5cGU6OkJvb2xlYW4sIGksIHRydWUpLnVud3JhcCgpOwpAQCAtMTE1LDcgKzExNSw3IEBACiAgICAgI1t0ZXN0XQogICAgIC8vIHRoaXMgdGVzdCBwb2ludCBsb2NrcyBkb3duIGhhcyBsb2NhbCBvdmVycmlkZSB1cGRhdGUKICAgICBmbiB0ZXN0X3VwZGF0ZV9mbGFnX2hhc19sb2NhbF9vdmVycmlkZSgpIHsKLSAgICAgICAgbGV0IGZsYWdfaW5mb19saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ19pbmZvX2xpc3QoKTsKKyAgICAgICAgbGV0IGZsYWdfaW5mb19saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ19pbmZvX2xpc3QoREVGQVVMVF9GSUxFX1ZFUlNJT04pOwogICAgICAgICBsZXQgbXV0IGJ1ZiA9IGZsYWdfaW5mb19saXN0LmludG9fYnl0ZXMoKTsKICAgICAgICAgZm9yIGkgaW4gMC4uZmxhZ19pbmZvX2xpc3QuaGVhZGVyLm51bV9mbGFncyB7CiAgICAgICAgICAgICB1cGRhdGVfZmxhZ19oYXNfbG9jYWxfb3ZlcnJpZGUoJm11dCBidWYsIEZsYWdWYWx1ZVR5cGU6OkJvb2xlYW4sIGksIHRydWUpLnVud3JhcCgpOwpkaWZmIC0tZ2l0IGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2Vfd3JpdGVfYXBpL3NyYy9mbGFnX3ZhbHVlX3VwZGF0ZS5ycyBiL3Rvb2xzL2Fjb25maWcvYWNvbmZpZ19zdG9yYWdlX3dyaXRlX2FwaS9zcmMvZmxhZ192YWx1ZV91cGRhdGUucnMKaW5kZXggMDZhOWIxNS4uOTc3MmRiOSAxMDA2NDQKLS0tIGEvdG9vbHMvYWNvbmZpZy9hY29uZmlnX3N0b3JhZ2Vfd3JpdGVfYXBpL3NyYy9mbGFnX3ZhbHVlX3VwZGF0ZS5ycworKysgYi90b29scy9hY29uZmlnL2Fjb25maWdfc3RvcmFnZV93cml0ZV9hcGkvc3JjL2ZsYWdfdmFsdWVfdXBkYXRlLnJzCkBAIC00OSwxMiArNDksMTIgQEAKICNbY2ZnKHRlc3QpXQogbW9kIHRlc3RzIHsKICAgICB1c2Ugc3VwZXI6Oio7Ci0gICAgdXNlIGFjb25maWdfc3RvcmFnZV9maWxlOjp0ZXN0X3V0aWxzOjpjcmVhdGVfdGVzdF9mbGFnX3ZhbHVlX2xpc3Q7CisgICAgdXNlIGFjb25maWdfc3RvcmFnZV9maWxlOjp7dGVzdF91dGlsczo6Y3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0LCBERUZBVUxUX0ZJTEVfVkVSU0lPTn07CiAKICAgICAjW3Rlc3RdCiAgICAgLy8gdGhpcyB0ZXN0IHBvaW50IGxvY2tzIGRvd24gZmxhZyB2YWx1ZSB1cGRhdGUKICAgICBmbiB0ZXN0X2Jvb2xlYW5fZmxhZ192YWx1ZV91cGRhdGUoKSB7Ci0gICAgICAgIGxldCBmbGFnX3ZhbHVlX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX3ZhbHVlX2xpc3QoKTsKKyAgICAgICAgbGV0IGZsYWdfdmFsdWVfbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfdmFsdWVfbGlzdChERUZBVUxUX0ZJTEVfVkVSU0lPTik7CiAgICAgICAgIGxldCB2YWx1ZV9vZmZzZXQgPSBmbGFnX3ZhbHVlX2xpc3QuaGVhZGVyLmJvb2xlYW5fdmFsdWVfb2Zmc2V0OwogICAgICAgICBsZXQgbXV0IGNvbnRlbnQgPSBmbGFnX3ZhbHVlX2xpc3QuaW50b19ieXRlcygpOwogICAgICAgICBsZXQgdHJ1ZV9ieXRlID0gdTg6OmZyb20odHJ1ZSkudG9fbGVfYnl0ZXMoKVswXTsKQEAgLTcyLDcgKzcyLDcgQEAKICAgICAjW3Rlc3RdCiAgICAgLy8gdGhpcyB0ZXN0IHBvaW50IGxvY2tzIGRvd24gdXBkYXRlIGJleW9uZCB0aGUgZW5kIG9mIGJvb2xlYW4gc2VjdGlvbgogICAgIGZuIHRlc3RfYm9vbGVhbl9vdXRfb2ZfcmFuZ2UoKSB7Ci0gICAgICAgIGxldCBtdXQgZmxhZ192YWx1ZV9saXN0ID0gY3JlYXRlX3Rlc3RfZmxhZ192YWx1ZV9saXN0KCkuaW50b19ieXRlcygpOworICAgICAgICBsZXQgbXV0IGZsYWdfdmFsdWVfbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfdmFsdWVfbGlzdChERUZBVUxUX0ZJTEVfVkVSU0lPTikuaW50b19ieXRlcygpOwogICAgICAgICBsZXQgZXJyb3IgPSB1cGRhdGVfYm9vbGVhbl9mbGFnX3ZhbHVlKCZtdXQgZmxhZ192YWx1ZV9saXN0Wy4uXSwgOCwgdHJ1ZSkudW53cmFwX2VycigpOwogICAgICAgICBhc3NlcnRfZXEhKAogICAgICAgICAgICAgZm9ybWF0ISgiezo/fSIsIGVycm9yKSwKQEAgLTgzLDcgKzgzLDcgQEAKICAgICAjW3Rlc3RdCiAgICAgLy8gdGhpcyB0ZXN0IHBvaW50IGxvY2tzIGRvd24gcXVlcnkgZXJyb3Igd2hlbiBmaWxlIGhhcyBhIGhpZ2hlciB2ZXJzaW9uCiAgICAgZm4gdGVzdF9oaWdoZXJfdmVyc2lvbl9zdG9yYWdlX2ZpbGUoKSB7Ci0gICAgICAgIGxldCBtdXQgdmFsdWVfbGlzdCA9IGNyZWF0ZV90ZXN0X2ZsYWdfdmFsdWVfbGlzdCgpOworICAgICAgICBsZXQgbXV0IHZhbHVlX2xpc3QgPSBjcmVhdGVfdGVzdF9mbGFnX3ZhbHVlX2xpc3QoREVGQVVMVF9GSUxFX1ZFUlNJT04pOwogICAgICAgICB2YWx1ZV9saXN0LmhlYWRlci52ZXJzaW9uID0gTUFYX1NVUFBPUlRFRF9GSUxFX1ZFUlNJT04gKyAxOwogICAgICAgICBsZXQgbXV0IGZsYWdfdmFsdWUgPSB2YWx1ZV9saXN0LmludG9fYnl0ZXMoKTsKICAgICAgICAgbGV0IGVycm9yID0gdXBkYXRlX2Jvb2xlYW5fZmxhZ192YWx1ZSgmbXV0IGZsYWdfdmFsdWVbLi5dLCA0LCB0cnVlKS51bndyYXBfZXJyKCk7CmRpZmYgLS1naXQgYS90b29scy9hY29uZmlnL2FmbGFncy9zcmMvYWNvbmZpZ19zdG9yYWdlX3NvdXJjZS5ycyBiL3Rvb2xzL2Fjb25maWcvYWZsYWdzL3NyYy9hY29uZmlnX3N0b3JhZ2Vfc291cmNlLnJzCmluZGV4IDY4ZWRmN2QuLjNmNTkzZmUgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2Fjb25maWcvYWZsYWdzL3NyYy9hY29uZmlnX3N0b3JhZ2Vfc291cmNlLnJzCisrKyBiL3Rvb2xzL2Fjb25maWcvYWZsYWdzL3NyYy9hY29uZmlnX3N0b3JhZ2Vfc291cmNlLnJzCkBAIC05Myw3ICs5MywxMiBAQAogICAgICAgICBzcGVjaWFsX2ZpZWxkczogU3BlY2lhbEZpZWxkczo6bmV3KCksCiAgICAgfTsKIAotICAgIGxldCBtdXQgc29ja2V0ID0gVW5peFN0cmVhbTo6Y29ubmVjdCgiL2Rldi9zb2NrZXQvYWNvbmZpZ2QiKT87CisgICAgbGV0IHNvY2tldF9uYW1lID0gaWYgYWNvbmZpZ19mbGFnczo6YXV0b19nZW5lcmF0ZWQ6OmVuYWJsZV9zeXN0ZW1fYWNvbmZpZ2RfcnVzdCgpIHsKKyAgICAgICAgIi9kZXYvc29ja2V0L2Fjb25maWdkX3N5c3RlbSIKKyAgICB9IGVsc2UgeworICAgICAgICAiL2Rldi9zb2NrZXQvYWNvbmZpZ2QiCisgICAgfTsKKyAgICBsZXQgbXV0IHNvY2tldCA9IFVuaXhTdHJlYW06OmNvbm5lY3Qoc29ja2V0X25hbWUpPzsKIAogICAgIGxldCBtZXNzYWdlX2J1ZmZlciA9IG1lc3NhZ2VzLndyaXRlX3RvX2J5dGVzKCk/OwogICAgIGxldCBtdXQgbWVzc2FnZV9sZW5ndGhfYnVmZmVyOiBbdTg7IDRdID0gWzA7IDRdOwpkaWZmIC0tZ2l0IGEvdG9vbHMvZWRpdF9tb25pdG9yL2RhZW1vbl9tYW5hZ2VyLnB5IGIvdG9vbHMvZWRpdF9tb25pdG9yL2RhZW1vbl9tYW5hZ2VyLnB5CmluZGV4IGFmZGVmYzUuLmVmMmEzMDkgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2VkaXRfbW9uaXRvci9kYWVtb25fbWFuYWdlci5weQorKysgYi90b29scy9lZGl0X21vbml0b3IvZGFlbW9uX21hbmFnZXIucHkKQEAgLTMzLDcgKzMzLDcgQEAKIAogREVGQVVMVF9QUk9DRVNTX1RFUk1JTkFUSU9OX1RJTUVPVVRfU0VDT05EUyA9IDUKIERFRkFVTFRfTU9OSVRPUl9JTlRFUlZBTF9TRUNPTkRTID0gNQotREVGQVVMVF9NRU1PUllfVVNBR0VfVEhSRVNIT0xEID0gMiAqIDEwMjQgICMgMkdCCitERUZBVUxUX01FTU9SWV9VU0FHRV9USFJFU0hPTEQgPSAzICogMTAyNCAgIyAzR0IKIERFRkFVTFRfQ1BVX1VTQUdFX1RIUkVTSE9MRCA9IDIwMAogREVGQVVMVF9SRUJPT1RfVElNRU9VVF9TRUNPTkRTID0gNjAgKiA2MCAqIDI0CiBCTE9DS19TSUdOX0ZJTEUgPSAiZWRpdF9tb25pdG9yX2Jsb2NrX3NpZ24iCkBAIC04NCw3ICs4NCw3IEBACiAgICAgICAgICJlZGl0X21vbml0b3IiLAogICAgICAgICBzZWxmLnVzZXJfbmFtZSwKICAgICAgICAgIkVOQUJMRV9BTkRST0lEX0VESVRfTU9OSVRPUiIsCi0gICAgICAgIDEwLAorICAgICAgICA1MCwKICAgICApOgogICAgICAgbG9nZ2luZy53YXJuaW5nKCJFZGl0IG1vbml0b3IgaXMgZGlzYWJsZWQsIGV4aXRpbmcuLi4iKQogICAgICAgcmV0dXJuCkBAIC0xNDEsMTcgKzE0MSwxMSBAQAogICAgICAgICAjIExvZ2dpbmcgdGhlIGVycm9yIGFuZCBjb250aW51ZS4KICAgICAgICAgbG9nZ2luZy53YXJuaW5nKCJGYWlsZWQgdG8gbW9uaXRvciBkYWVtb24gcHJvY2VzcyB3aXRoIGVycm9yOiAlcyIsIGUpCiAKLSAgICAgIGlmICgKLSAgICAgICAgICBzZWxmLm1heF9tZW1vcnlfdXNhZ2UgPj0gbWVtb3J5X3RocmVzaG9sZAotICAgICAgICAgIG9yIHNlbGYubWF4X2NwdV91c2FnZSA+PSBjcHVfdGhyZXNob2xkCi0gICAgICApOgotICAgICAgICBsb2dnaW5nLmVycm9yKAotICAgICAgICAgICAgIkRhZW1vbiBwcm9jZXNzIGlzIGNvbnN1bWluZyB0b28gbXVjaCByZXNvdXJjZSwga2lsbGluZy4uLiIKLSAgICAgICAgKSwKLSAgICAgICAgc2VsZi5fc2VuZF9lcnJvcl9ldmVudF90b19jbGVhcmN1dCgKLSAgICAgICAgICAgIGVkaXRfZXZlbnRfcGIyLkVkaXRFdmVudC5LSUxMRURfRFVFX1RPX0VYQ0VFREVEX1JFU09VUkNFX1VTQUdFCi0gICAgICAgICkKLSAgICAgICAgc2VsZi5fdGVybWluYXRlX3Byb2Nlc3Moc2VsZi5kYWVtb25fcHJvY2Vzcy5waWQpCisgICAgICBpZiBzZWxmLm1heF9tZW1vcnlfdXNhZ2UgPj0gbWVtb3J5X3RocmVzaG9sZDoKKyAgICAgICAgc2VsZi5faGFuZGxlX3Jlc291cmNlX2V4aGF1c3RlZF9lcnJvcigibWVtb3J5IikKKworICAgICAgaWYgc2VsZi5tYXhfY3B1X3VzYWdlID49IGNwdV90aHJlc2hvbGQ6CisgICAgICAgIHNlbGYuX2hhbmRsZV9yZXNvdXJjZV9leGhhdXN0ZWRfZXJyb3IoImNwdSIpCiAKICAgICBsb2dnaW5nLmluZm8oCiAgICAgICAgICJEYWVtb24gcHJvY2VzcyAlZCB0ZXJtaW5hdGVkLiBNYXggbWVtb3J5IHVzYWdlOiAlZiwgTWF4IGNwdSIKQEAgLTM5Miw2ICszODYsMjAgQEAKIAogICAgIHJldHVybiBwaWRzCiAKKyAgZGVmIF9oYW5kbGVfcmVzb3VyY2VfZXhoYXVzdGVkX2Vycm9yKHNlbGYsIHJlc291cmNlX3R5cGU6c3RyKToKKyAgICBpZiByZXNvdXJjZV90eXBlID09ICJtZW1vcnkiOgorICAgICAgc2VsZi5fc2VuZF9lcnJvcl9ldmVudF90b19jbGVhcmN1dCgKKyAgICAgICAgICBlZGl0X2V2ZW50X3BiMi5FZGl0RXZlbnQuS0lMTEVEX0RVRV9UT19FWENFRURFRF9NRU1PUllfVVNBR0UKKyAgICAgICkKKyAgICBlbHNlOgorICAgICAgc2VsZi5fc2VuZF9lcnJvcl9ldmVudF90b19jbGVhcmN1dCgKKyAgICAgICAgICBlZGl0X2V2ZW50X3BiMi5FZGl0RXZlbnQuS0lMTEVEX0RVRV9UT19FWENFRURFRF9DUFVfVVNBR0UKKyAgICAgICkKKyAgICBsb2dnaW5nLmVycm9yKAorICAgICAgICAiRGFlbW9uIHByb2Nlc3MgaXMgY29uc3VtaW5nIHRvbyBtdWNoICVzLCBraWxsaW5nLi4uIiwgcmVzb3VyY2VfdHlwZQorICAgICksCisgICAgc2VsZi5fdGVybWluYXRlX3Byb2Nlc3Moc2VsZi5kYWVtb25fcHJvY2Vzcy5waWQpCisKICAgZGVmIF9zZW5kX2Vycm9yX2V2ZW50X3RvX2NsZWFyY3V0KHNlbGYsIGVycm9yX3R5cGUpOgogICAgIGVkaXRfbW9uaXRvcl9lcnJvcl9ldmVudF9wcm90byA9IGVkaXRfZXZlbnRfcGIyLkVkaXRFdmVudCgKICAgICAgICAgdXNlcl9uYW1lPXNlbGYudXNlcl9uYW1lLApkaWZmIC0tZ2l0IGEvdG9vbHMvZWRpdF9tb25pdG9yL2RhZW1vbl9tYW5hZ2VyX3Rlc3QucHkgYi90b29scy9lZGl0X21vbml0b3IvZGFlbW9uX21hbmFnZXJfdGVzdC5weQppbmRleCA4ZDE4Mzg4Li4xMmFhYWIzIDEwMDY0NAotLS0gYS90b29scy9lZGl0X21vbml0b3IvZGFlbW9uX21hbmFnZXJfdGVzdC5weQorKysgYi90b29scy9lZGl0X21vbml0b3IvZGFlbW9uX21hbmFnZXJfdGVzdC5weQpAQCAtMjE3LDcgKzIxNyw3IEBACiAgICAgc2VsZi5hc3NlcnRfbm9fc3VicHJvY2Vzc19ydW5uaW5nKCkKICAgICBzZWxmLl9hc3NlcnRfZXJyb3JfZXZlbnRfbG9nZ2VkKAogICAgICAgICBmYWtlX2NjbGllbnQsCi0gICAgICAgIGVkaXRfZXZlbnRfcGIyLkVkaXRFdmVudC5LSUxMRURfRFVFX1RPX0VYQ0VFREVEX1JFU09VUkNFX1VTQUdFLAorICAgICAgICBlZGl0X2V2ZW50X3BiMi5FZGl0RXZlbnQuS0lMTEVEX0RVRV9UT19FWENFRURFRF9NRU1PUllfVVNBR0UsCiAgICAgKQogCiAgIGRlZiB0ZXN0X21vbml0b3JfZGFlbW9uX3N1YnByb2Nlc3Nfa2lsbGVkX2hpZ2hfY3B1X3VzYWdlKHNlbGYpOgpAQCAtMjM1LDcgKzIzNSw3IEBACiAgICAgc2VsZi5hc3NlcnRfbm9fc3VicHJvY2Vzc19ydW5uaW5nKCkKICAgICBzZWxmLl9hc3NlcnRfZXJyb3JfZXZlbnRfbG9nZ2VkKAogICAgICAgICBmYWtlX2NjbGllbnQsCi0gICAgICAgIGVkaXRfZXZlbnRfcGIyLkVkaXRFdmVudC5LSUxMRURfRFVFX1RPX0VYQ0VFREVEX1JFU09VUkNFX1VTQUdFLAorICAgICAgICBlZGl0X2V2ZW50X3BiMi5FZGl0RXZlbnQuS0lMTEVEX0RVRV9UT19FWENFRURFRF9DUFVfVVNBR0UsCiAgICAgKQogCiAgIEBtb2NrLnBhdGNoKCdzdWJwcm9jZXNzLmNoZWNrX291dHB1dCcpCmRpZmYgLS1naXQgYS90b29scy9lZGl0X21vbml0b3IvcHJvdG8vZWRpdF9ldmVudC5wcm90byBiL3Rvb2xzL2VkaXRfbW9uaXRvci9wcm90by9lZGl0X2V2ZW50LnByb3RvCmluZGV4IGRjM2QzZjYuLjlhY2MyZTcgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2VkaXRfbW9uaXRvci9wcm90by9lZGl0X2V2ZW50LnByb3RvCisrKyBiL3Rvb2xzL2VkaXRfbW9uaXRvci9wcm90by9lZGl0X2V2ZW50LnByb3RvCkBAIC0xNiw4ICsxNiw5IEBACiAgICAgRkFJTEVEX1RPX1NUQVJUX0VESVRfTU9OSVRPUiA9IDE7CiAgICAgRkFJTEVEX1RPX1NUT1BfRURJVF9NT05JVE9SID0gMjsKICAgICBGQUlMRURfVE9fUkVCT09UX0VESVRfTU9OSVRPUiA9IDM7Ci0gICAgS0lMTEVEX0RVRV9UT19FWENFRURFRF9SRVNPVVJDRV9VU0FHRSA9IDQ7CisgICAgS0lMTEVEX0RVRV9UT19FWENFRURFRF9NRU1PUllfVVNBR0UgPSA0OwogICAgIEZPUkNFX0NMRUFOVVAgPSA1OworICAgIEtJTExFRF9EVUVfVE9fRVhDRUVERURfQ1BVX1VTQUdFID0gNjsKICAgfQogCiAgIC8vIEV2ZW50IHRoYXQgbG9ncyBhIHNpbmdsZSBlZGl0CmRpZmYgLS1naXQgYS90b29scy9maWxlbGlzdGRpZmYvZmlsZV9saXN0X2RpZmYucHkgYi90b29scy9maWxlbGlzdGRpZmYvZmlsZV9saXN0X2RpZmYucHkKaW5kZXggZmJiZmVkZi4uYTY0MDhlOCAxMDA2NDQKLS0tIGEvdG9vbHMvZmlsZWxpc3RkaWZmL2ZpbGVfbGlzdF9kaWZmLnB5CisrKyBiL3Rvb2xzL2ZpbGVsaXN0ZGlmZi9maWxlX2xpc3RfZGlmZi5weQpAQCAtNzYsNyArNzYsNyBAQAogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJ2thdGlfaW5zdGFsbGVkX2ZpbGVfbGlzdCcpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnc29vbmdfaW5zdGFsbGVkX2ZpbGVfbGlzdCcpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnc3lzdGVtX21vZHVsZV9uYW1lJykKLSAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLWFsbG93bGlzdHMnLCBuYXJncz0nKycpCisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1hbGxvd2xpc3RzJywgbmFyZ3M9JyonLCBkZWZhdWx0PVtdKQogICAgIGFyZ3MgPSBwYXJzZXIucGFyc2VfYXJncygpCiAKICAgICBmaW5kX3VuaXF1ZV9pdGVtcyhhcmdzLmthdGlfaW5zdGFsbGVkX2ZpbGVfbGlzdCwgYXJncy5zb29uZ19pbnN0YWxsZWRfZmlsZV9saXN0LCBhcmdzLnN5c3RlbV9tb2R1bGVfbmFtZSwgYXJncy5hbGxvd2xpc3RzKQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3Rvb2xzL2lkZV9xdWVyeS9wcm9iZXJfc2NyaXB0cy9pZGVfcXVlcnkub3V0IGIvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL2lkZV9xdWVyeS5vdXQKaW5kZXggY2Q3Y2U2ZC4uYmU0OGRhMSAxMDA2NDQKLS0tIGEvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL2lkZV9xdWVyeS5vdXQKKysrIGIvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL2lkZV9xdWVyeS5vdXQKQEAgLTEsNyArMSw5IEBACiAKLQNvdXQSlmEKLThidWlsZC9tYWtlL3Rvb2xzL2lkZV9xdWVyeS9wcm9iZXJfc2NyaXB0cy9jcHAvZ2VuZXJhbC5jYxo4cHJlYnVpbHRzL2NsYW5nL2hvc3QvbGludXgteDg2L2NsYW5nLXI1MjI4MTcvYmluL2NsYW5nKysaBy1tdGh1bWIaAy1PcxoULWZvbWl0LWZyYW1lLXBvaW50ZXIaBi1tbGx2bRoZLWVuYWJsZS1zaHJpbmstd3JhcD1mYWxzZRoDLU8yGgUtV2FsbBoHLVdleHRyYRoLLVdpbml0LXNlbGYaDy1XcG9pbnRlci1hcml0aBoYLVd1bmd1YXJkZWQtYXZhaWxhYmlsaXR5GhEtV2Vycm9yPWRhdGUtdGltZRoWLVdlcnJvcj1pbnQtY29udmVyc2lvbhoTLVdlcnJvcj1wcmFnbWEtcGFjaxomLVdlcnJvcj1wcmFnbWEtcGFjay1zdXNwaWNpb3VzLWluY2x1ZGUaGC1XZXJyb3I9c2l6ZW9mLWFycmF5LWRpdhoXLVdlcnJvcj1zdHJpbmctcGx1cy1pbnQaJy1XZXJyb3I9dW5yZWFjaGFibGUtY29kZS1sb29wLWluY3JlbWVudBoiLVduby1lcnJvcj1kZXByZWNhdGVkLWRlY2xhcmF0aW9ucxoTLVduby1jOTktZGVzaWduYXRvchoZLVduby1nbnUtZm9sZGluZy1jb25zdGFudBoiLVduby1pbmNvbnNpc3RlbnQtbWlzc2luZy1vdmVycmlkZRocLVduby1lcnJvcj1yZW9yZGVyLWluaXQtbGlzdBoWLVduby1yZW9yZGVyLWluaXQtbGlzdBoRLVduby1zaWduLWNvbXBhcmUaCy1Xbm8tdW51c2VkGgktREFORFJPSUQaCC1ETkRFQlVHGgctVURFQlVHGigtRF9fY29tcGlsZXJfb2Zmc2V0b2Y9X19idWlsdGluX29mZnNldG9mGiotRF9fQU5EUk9JRF9VTkFWQUlMQUJMRV9TWU1CT0xTX0FSRV9XRUFLX18aCS1mYWRkcnNpZxoZLWZkZWJ1Zy1kZWZhdWx0LXZlcnNpb249NRoTLWZjb2xvci1kaWFnbm9zdGljcxoRLWZmcC1jb250cmFjdD1vZmYaDy1mbm8tZXhjZXB0aW9ucxoULWZuby1zdHJpY3QtYWxpYXNpbmcaEi1mbWVzc2FnZS1sZW5ndGg9MBojLWZuby1yZWxheGVkLXRlbXBsYXRlLXRlbXBsYXRlLWFyZ3MaFy1nc2ltcGxlLXRlbXBsYXRlLW5hbWVzGggtZ3o9enN0ZBoWLW5vLWNhbm9uaWNhbC1wcmVmaXhlcxoRLVduby1lcnJvcj1mb3JtYXQaIi1mZGVidWctcHJlZml4LW1hcD0vcHJvYy9zZWxmL2N3ZD0aHC1mdHJpdmlhbC1hdXRvLXZhci1pbml0PXplcm8aAi1nGhMtZmZ1bmN0aW9uLXNlY3Rpb25zGg8tZmRhdGEtc2VjdGlvbnMaEC1mbm8tc2hvcnQtZW51bXMaDy1mdW53aW5kLXRhYmxlcxoYLWZzdGFjay1wcm90ZWN0b3Itc3Ryb25nGhEtV2EsLS1ub2V4ZWNzdGFjaxoTLURfRk9SVElGWV9TT1VSQ0U9MhoTLVdzdHJpY3QtYWxpYXNpbmc9MhoTLVdlcnJvcj1yZXR1cm4tdHlwZRoYLVdlcnJvcj1ub24tdmlydHVhbC1kdG9yGg8tV2Vycm9yPWFkZHJlc3MaFi1XZXJyb3I9c2VxdWVuY2UtcG9pbnQaFy1XZXJyb3I9Zm9ybWF0LXNlY3VyaXR5Ggwtbm9zdGRsaWJpbmMaGi1mZGVidWctaW5mby1mb3ItcHJvZmlsaW5nGgwtbXNvZnQtZmxvYXQaDi1tYXJjaD1hcm12Ny1hGhItbWZsb2F0LWFiaT1zb2Z0ZnAaCi0tbWZwdT1uZW9uGi8tSWJ1aWxkL21ha2UvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL2NwcBqzAS1Jb3V0L3Nvb25nLy5pbnRlcm1lZGlhdGVzL2J1aWxkL21ha2UvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL2NwcC9pZGVfcXVlcnlfcHJvYmVyc2NyaXB0X2NjL2FuZHJvaWRfYXJtX2FybXY3LWEtbmVvbi9nZW4vcHJvdG8vYnVpbGQvbWFrZS90b29scy9pZGVfcXVlcnkvcHJvYmVyX3NjcmlwdHMvY3BwGoUBLUlvdXQvc29vbmcvLmludGVybWVkaWF0ZXMvYnVpbGQvbWFrZS90b29scy9pZGVfcXVlcnkvcHJvYmVyX3NjcmlwdHMvY3BwL2lkZV9xdWVyeV9wcm9iZXJzY3JpcHRfY2MvYW5kcm9pZF9hcm1fYXJtdjctYS1uZW9uL2dlbi9wcm90bxoULURfX0xJQkNfQVBJX189MTAwMDAaFC1EX19MSUJNX0FQSV9fPTEwMDAwGhUtRF9fTElCRExfQVBJX189MTAwMDAaFy1JZXh0ZXJuYWwvcHJvdG9idWYvc3JjGlktSXByZWJ1aWx0cy9jbGFuZy9ob3N0L2xpbnV4LXg4Ni9jbGFuZy1yNTIyODE3L2FuZHJvaWRfbGliYysrL3BsYXRmb3JtL2FybS9pbmNsdWRlL2MrKy92MRo9LUlwcmVidWlsdHMvY2xhbmcvaG9zdC9saW51eC14ODYvY2xhbmctcjUyMjgxNy9pbmNsdWRlL2MrKy92MRogLUliaW9uaWMvbGliYy9hc3luY19zYWZlL2luY2x1ZGUaHy1Jc3lzdGVtL2xvZ2dpbmcvbGlibG9nL2luY2x1ZGUaJy1JYmlvbmljL2xpYmMvc3lzdGVtX3Byb3BlcnRpZXMvaW5jbHVkZRo8LUlzeXN0ZW0vY29yZS9wcm9wZXJ0eV9zZXJ2aWNlL2xpYnByb3BlcnR5aW5mb3BhcnNlci9pbmNsdWRlGggtaXN5c3RlbRoTYmlvbmljL2xpYmMvaW5jbHVkZRoILWlzeXN0ZW0aH2Jpb25pYy9saWJjL2tlcm5lbC91YXBpL2FzbS1hcm0aCC1pc3lzdGVtGhdiaW9uaWMvbGliYy9rZXJuZWwvdWFwaRoILWlzeXN0ZW0aH2Jpb25pYy9saWJjL2tlcm5lbC9hbmRyb2lkL3Njc2kaCC1pc3lzdGVtGh9iaW9uaWMvbGliYy9rZXJuZWwvYW5kcm9pZC91YXBpGgctdGFyZ2V0Gh1hcm12N2EtbGludXgtYW5kcm9pZGVhYmkxMDAwMBoQLURBTkRST0lEX1NUUklDVBoFLWZQSUUaBy1XZXJyb3IaFS1Xbm8tdW51c2VkLXBhcmFtZXRlchoZLURHT09HTEVfUFJPVE9CVUZfTk9fUlRUSRoWLVdpbXBsaWNpdC1mYWxsdGhyb3VnaBoqLURfTElCQ1BQX0VOQUJMRV9USFJFQURfU0FGRVRZX0FOTk9UQVRJT05TGhUtV25vLWdudS1pbmNsdWRlLW5leHQaGy1mdmlzaWJpbGl0eS1pbmxpbmVzLWhpZGRlbhoGLW1sbHZtGhktZW5hYmxlLXNocmluay13cmFwPWZhbHNlGgwtc3RkPWdudSsrMjAaCS1mbm8tcnR0aRoVLUlzeXN0ZW0vY29yZS9pbmNsdWRlGh8tSXN5c3RlbS9sb2dnaW5nL2xpYmxvZy9pbmNsdWRlGhwtSXN5c3RlbS9tZWRpYS9hdWRpby9pbmNsdWRlGh4tSWhhcmR3YXJlL2xpYmhhcmR3YXJlL2luY2x1ZGUaJS1JaGFyZHdhcmUvbGliaGFyZHdhcmVfbGVnYWN5L2luY2x1ZGUaFi1JaGFyZHdhcmUvcmlsL2luY2x1ZGUaGy1JZnJhbWV3b3Jrcy9uYXRpdmUvaW5jbHVkZRoiLUlmcmFtZXdvcmtzL25hdGl2ZS9vcGVuZ2wvaW5jbHVkZRoXLUlmcmFtZXdvcmtzL2F2L2luY2x1ZGUaFi1XZXJyb3I9Ym9vbC1vcGVyYXRpb24aIC1XZXJyb3I9Zm9ybWF0LWluc3VmZmljaWVudC1hcmdzGiUtV2Vycm9yPWltcGxpY2l0LWludC1mbG9hdC1jb252ZXJzaW9uGhstV2Vycm9yPWludC1pbi1ib29sLWNvbnRleHQaGy1XZXJyb3I9aW50LXRvLXBvaW50ZXItY2FzdBobLVdlcnJvcj1wb2ludGVyLXRvLWludC1jYXN0GhctV2Vycm9yPXhvci11c2VkLWFzLXBvdxoeLVduby12b2lkLXBvaW50ZXItdG8tZW51bS1jYXN0Gh0tV25vLXZvaWQtcG9pbnRlci10by1pbnQtY2FzdBoYLVduby1wb2ludGVyLXRvLWludC1jYXN0GhYtV2Vycm9yPWZvcnRpZnktc291cmNlGhQtV25vLXVudXNlZC12YXJpYWJsZRofLVduby1taXNzaW5nLWZpZWxkLWluaXRpYWxpemVycxoTLVduby1wYWNrZWQtbm9uLXBvZBocLVdlcnJvcj1hZGRyZXNzLW9mLXRlbXBvcmFyeRorLVdlcnJvcj1pbmNvbXBhdGlibGUtZnVuY3Rpb24tcG9pbnRlci10eXBlcxoYLVdlcnJvcj1udWxsLWRlcmVmZXJlbmNlGhMtV2Vycm9yPXJldHVybi10eXBlGiItV25vLXRhdXRvbG9naWNhbC1jb25zdGFudC1jb21wYXJlGiQtV25vLXRhdXRvbG9naWNhbC10eXBlLWxpbWl0LWNvbXBhcmUaIi1Xbm8taW1wbGljaXQtaW50LWZsb2F0LWNvbnZlcnNpb24aIS1Xbm8tdGF1dG9sb2dpY2FsLW92ZXJsYXAtY29tcGFyZRoULVduby1kZXByZWNhdGVkLWNvcHkaGS1Xbm8tcmFuZ2UtbG9vcC1jb25zdHJ1Y3QaIi1Xbm8temVyby1hcy1udWxsLXBvaW50ZXItY29uc3RhbnQaKS1Xbm8tZGVwcmVjYXRlZC1hbm9uLWVudW0tZW51bS1jb252ZXJzaW9uGiQtV25vLWRlcHJlY2F0ZWQtZW51bS1lbnVtLWNvbnZlcnNpb24aFS1Xbm8tcGVzc2ltaXppbmctbW92ZRoeLVduby1ub24tYy10eXBlZGVmLWZvci1saW5rYWdlGhMtV25vLWFsaWduLW1pc21hdGNoGiItV25vLWVycm9yPXVudXNlZC1idXQtc2V0LXZhcmlhYmxlGiMtV25vLWVycm9yPXVudXNlZC1idXQtc2V0LXBhcmFtZXRlchoeLVduby1lcnJvcj1kZXByZWNhdGVkLWJ1aWx0aW5zGhUtV25vLWVycm9yPWRlcHJlY2F0ZWQaMi1Xbm8tZXJyb3I9c2luZ2xlLWJpdC1iaXRmaWVsZC1jb25zdGFudC1jb252ZXJzaW9uGiQtV25vLWVycm9yPWVudW0tY29uc3RleHByLWNvbnZlcnNpb24aGy1Xbm8tZXJyb3I9aW52YWxpZC1vZmZzZXRvZhomLVduby1kZXByZWNhdGVkLWR5bmFtaWMtZXhjZXB0aW9uLXNwZWMaOGJ1aWxkL21ha2UvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL2NwcC9nZW5lcmFsLmNjItU/CisDb3V0MngKKzhidWlsZC9tYWtlL3Rvb2xzL2lkZV9xdWVyeS9wcm9iZXJfc2NyaXB0cy9jcHAvZ2VuZXJhbC5jYxICCAEaOGJ1aWxkL21ha2UvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL2NwcC9nZW5lcmFsLmNjOpciCis4YnVpbGQvbWFrZS90b29scy9pZGVfcXVlcnkvcHJvYmVyX3NjcmlwdHMvY3BwL2dlbmVyYWwuY2MQAho4YnVpbGQvbWFrZS90b29scy9pZGVfcXVlcnkvcHJvYmVyX3NjcmlwdHMvY3BwL2dlbmVyYWwuY2MiOHByZWJ1aWx0cy9jbGFuZy9ob3N0L2xpbnV4LXg4Ni9jbGFuZy1yNTMwNTY3L2Jpbi9jbGFuZysrIgwtbm9zdGRsaWJpbmMiBy1tdGh1bWIiAy1PcyIULWZvbWl0LWZyYW1lLXBvaW50ZXIiBi1tbGx2bSIZLWVuYWJsZS1zaHJpbmstd3JhcD1mYWxzZSIDLU8yIgUtV2FsbCIHLVdleHRyYSILLVdpbml0LXNlbGYiDy1XcG9pbnRlci1hcml0aCIYLVd1bmd1YXJkZWQtYXZhaWxhYmlsaXR5IhEtV2Vycm9yPWRhdGUtdGltZSIWLVdlcnJvcj1pbnQtY29udmVyc2lvbiITLVdlcnJvcj1wcmFnbWEtcGFjayImLVdlcnJvcj1wcmFnbWEtcGFjay1zdXNwaWNpb3VzLWluY2x1ZGUiGC1XZXJyb3I9c2l6ZW9mLWFycmF5LWRpdiIXLVdlcnJvcj1zdHJpbmctcGx1cy1pbnQiJy1XZXJyb3I9dW5yZWFjaGFibGUtY29kZS1sb29wLWluY3JlbWVudCIiLVduby1lcnJvcj1kZXByZWNhdGVkLWRlY2xhcmF0aW9ucyITLVduby1jMjMtZXh0ZW5zaW9ucyITLVduby1jOTktZGVzaWduYXRvciIZLVduby1nbnUtZm9sZGluZy1jb25zdGFudCIiLVduby1pbmNvbnNpc3RlbnQtbWlzc2luZy1vdmVycmlkZSIcLVduby1lcnJvcj1yZW9yZGVyLWluaXQtbGlzdCIWLVduby1yZW9yZGVyLWluaXQtbGlzdCIRLVduby1zaWduLWNvbXBhcmUiCy1Xbm8tdW51c2VkIgktREFORFJPSUQiCC1ETkRFQlVHIgctVURFQlVHIigtRF9fY29tcGlsZXJfb2Zmc2V0b2Y9X19idWlsdGluX29mZnNldG9mIiotRF9fQU5EUk9JRF9VTkFWQUlMQUJMRV9TWU1CT0xTX0FSRV9XRUFLX18iCS1mYWRkcnNpZyIZLWZkZWJ1Zy1kZWZhdWx0LXZlcnNpb249NSITLWZjb2xvci1kaWFnbm9zdGljcyIRLWZmcC1jb250cmFjdD1vZmYiDy1mbm8tZXhjZXB0aW9ucyIULWZuby1zdHJpY3QtYWxpYXNpbmciEi1mbWVzc2FnZS1sZW5ndGg9MCIXLWdzaW1wbGUtdGVtcGxhdGUtbmFtZXMiCC1nej16c3RkIhYtbm8tY2Fub25pY2FsLXByZWZpeGVzIiItZmRlYnVnLXByZWZpeC1tYXA9L3Byb2Mvc2VsZi9jd2Q9IhwtZnRyaXZpYWwtYXV0by12YXItaW5pdD16ZXJvIgItZyITLWZmdW5jdGlvbi1zZWN0aW9ucyIPLWZkYXRhLXNlY3Rpb25zIhAtZm5vLXNob3J0LWVudW1zIg8tZnVud2luZC10YWJsZXMiGC1mc3RhY2stcHJvdGVjdG9yLXN0cm9uZyIRLVdhLC0tbm9leGVjc3RhY2siEy1EX0ZPUlRJRllfU09VUkNFPTIiEy1Xc3RyaWN0LWFsaWFzaW5nPTIiEy1XZXJyb3I9cmV0dXJuLXR5cGUiGC1XZXJyb3I9bm9uLXZpcnR1YWwtZHRvciIPLVdlcnJvcj1hZGRyZXNzIhYtV2Vycm9yPXNlcXVlbmNlLXBvaW50IhctV2Vycm9yPWZvcm1hdC1zZWN1cml0eSIMLW1zb2Z0LWZsb2F0Ig4tbWFyY2g9YXJtdjctYSISLW1mbG9hdC1hYmk9c29mdGZwIgorLW1mcHU9bmVvbiIvLUlidWlsZC9tYWtlL3Rvb2xzL2lkZV9xdWVyeS9wcm9iZXJfc2NyaXB0cy9jcHAiswEtSW91dC9zb29uZy8uaW50ZXJtZWRpYXRlcy9idWlsZC9tYWtlL3Rvb2xzL2lkZV9xdWVyeS9wcm9iZXJfc2NyaXB0cy9jcHAvaWRlX3F1ZXJ5X3Byb2JlcnNjcmlwdF9jYy9hbmRyb2lkX2FybV9hcm12Ny1hLW5lb24vZ2VuL3Byb3RvL2J1aWxkL21ha2UvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL2NwcCKFAS1Jb3V0L3Nvb25nLy5pbnRlcm1lZGlhdGVzL2J1aWxkL21ha2UvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL2NwcC9pZGVfcXVlcnlfcHJvYmVyc2NyaXB0X2NjL2FuZHJvaWRfYXJtX2FybXY3LWEtbmVvbi9nZW4vcHJvdG8iFC1EX19MSUJDX0FQSV9fPTEwMDAwIhQtRF9fTElCTV9BUElfXz0xMDAwMCIVLURfX0xJQkRMX0FQSV9fPTEwMDAwIhctSWV4dGVybmFsL3Byb3RvYnVmL3NyYyJZLUlwcmVidWlsdHMvY2xhbmcvaG9zdC9saW51eC14ODYvY2xhbmctcjUzMDU2Ny9hbmRyb2lkX2xpYmMrKy9wbGF0Zm9ybS9hcm0vaW5jbHVkZS9jKysvdjEiPS1JcHJlYnVpbHRzL2NsYW5nL2hvc3QvbGludXgteDg2L2NsYW5nLXI1MzA1NjcvaW5jbHVkZS9jKysvdjEiIC1JYmlvbmljL2xpYmMvYXN5bmNfc2FmZS9pbmNsdWRlIh8tSXN5c3RlbS9sb2dnaW5nL2xpYmxvZy9pbmNsdWRlIictSWJpb25pYy9saWJjL3N5c3RlbV9wcm9wZXJ0aWVzL2luY2x1ZGUiPC1Jc3lzdGVtL2NvcmUvcHJvcGVydHlfc2VydmljZS9saWJwcm9wZXJ0eWluZm9wYXJzZXIvaW5jbHVkZSIILWlzeXN0ZW0iE2Jpb25pYy9saWJjL2luY2x1ZGUiCC1pc3lzdGVtIh9iaW9uaWMvbGliYy9rZXJuZWwvdWFwaS9hc20tYXJtIggtaXN5c3RlbSIXYmlvbmljL2xpYmMva2VybmVsL3VhcGkiCC1pc3lzdGVtIh9iaW9uaWMvbGliYy9rZXJuZWwvYW5kcm9pZC9zY3NpIggtaXN5c3RlbSIfYmlvbmljL2xpYmMva2VybmVsL2FuZHJvaWQvdWFwaSIHLXRhcmdldCIdYXJtdjdhLWxpbnV4LWFuZHJvaWRlYWJpMTAwMDAiEC1EQU5EUk9JRF9TVFJJQ1QiBS1mUElFIgctV2Vycm9yIhUtV25vLXVudXNlZC1wYXJhbWV0ZXIiGS1ER09PR0xFX1BST1RPQlVGX05PX1JUVEkiFi1XaW1wbGljaXQtZmFsbHRocm91Z2giKi1EX0xJQkNQUF9FTkFCTEVfVEhSRUFEX1NBRkVUWV9BTk5PVEFUSU9OUyIVLVduby1nbnUtaW5jbHVkZS1uZXh0IhstZnZpc2liaWxpdHktaW5saW5lcy1oaWRkZW4iBi1tbGx2bSIZLWVuYWJsZS1zaHJpbmstd3JhcD1mYWxzZSIMLXN0ZD1nbnUrKzIwIgktZm5vLXJ0dGkiFS1Jc3lzdGVtL2NvcmUvaW5jbHVkZSIfLUlzeXN0ZW0vbG9nZ2luZy9saWJsb2cvaW5jbHVkZSIcLUlzeXN0ZW0vbWVkaWEvYXVkaW8vaW5jbHVkZSIeLUloYXJkd2FyZS9saWJoYXJkd2FyZS9pbmNsdWRlIiUtSWhhcmR3YXJlL2xpYmhhcmR3YXJlX2xlZ2FjeS9pbmNsdWRlIhYtSWhhcmR3YXJlL3JpbC9pbmNsdWRlIhstSWZyYW1ld29ya3MvbmF0aXZlL2luY2x1ZGUiIi1JZnJhbWV3b3Jrcy9uYXRpdmUvb3BlbmdsL2luY2x1ZGUiFy1JZnJhbWV3b3Jrcy9hdi9pbmNsdWRlIhYtV2Vycm9yPWJvb2wtb3BlcmF0aW9uIiAtV2Vycm9yPWZvcm1hdC1pbnN1ZmZpY2llbnQtYXJncyIlLVdlcnJvcj1pbXBsaWNpdC1pbnQtZmxvYXQtY29udmVyc2lvbiIbLVdlcnJvcj1pbnQtaW4tYm9vbC1jb250ZXh0IhstV2Vycm9yPWludC10by1wb2ludGVyLWNhc3QiGy1XZXJyb3I9cG9pbnRlci10by1pbnQtY2FzdCIXLVdlcnJvcj14b3ItdXNlZC1hcy1wb3ciHi1Xbm8tdm9pZC1wb2ludGVyLXRvLWVudW0tY2FzdCIdLVduby12b2lkLXBvaW50ZXItdG8taW50LWNhc3QiGC1Xbm8tcG9pbnRlci10by1pbnQtY2FzdCIWLVdlcnJvcj1mb3J0aWZ5LXNvdXJjZSIULVduby11bnVzZWQtdmFyaWFibGUiHy1Xbm8tbWlzc2luZy1maWVsZC1pbml0aWFsaXplcnMiEy1Xbm8tcGFja2VkLW5vbi1wb2QiHC1XZXJyb3I9YWRkcmVzcy1vZi10ZW1wb3JhcnkiKy1XZXJyb3I9aW5jb21wYXRpYmxlLWZ1bmN0aW9uLXBvaW50ZXItdHlwZXMiGC1XZXJyb3I9bnVsbC1kZXJlZmVyZW5jZSITLVdlcnJvcj1yZXR1cm4tdHlwZSIiLVduby10YXV0b2xvZ2ljYWwtY29uc3RhbnQtY29tcGFyZSIkLVduby10YXV0b2xvZ2ljYWwtdHlwZS1saW1pdC1jb21wYXJlIiItV25vLWltcGxpY2l0LWludC1mbG9hdC1jb252ZXJzaW9uIiEtV25vLXRhdXRvbG9naWNhbC1vdmVybGFwLWNvbXBhcmUiFC1Xbm8tZGVwcmVjYXRlZC1jb3B5IhktV25vLXJhbmdlLWxvb3AtY29uc3RydWN0IiItV25vLXplcm8tYXMtbnVsbC1wb2ludGVyLWNvbnN0YW50IiktV25vLWRlcHJlY2F0ZWQtYW5vbi1lbnVtLWVudW0tY29udmVyc2lvbiIkLVduby1kZXByZWNhdGVkLWVudW0tZW51bS1jb252ZXJzaW9uIhstV25vLWVycm9yPXBlc3NpbWl6aW5nLW1vdmUiHi1Xbm8tbm9uLWMtdHlwZWRlZi1mb3ItbGlua2FnZSITLVduby1hbGlnbi1taXNtYXRjaCIiLVduby1lcnJvcj11bnVzZWQtYnV0LXNldC12YXJpYWJsZSIjLVduby1lcnJvcj11bnVzZWQtYnV0LXNldC1wYXJhbWV0ZXIiHi1Xbm8tZXJyb3I9ZGVwcmVjYXRlZC1idWlsdGlucyIVLVduby1lcnJvcj1kZXByZWNhdGVkIiYtV25vLWRlcHJlY2F0ZWQtZHluYW1pYy1leGNlcHRpb24tc3BlYyIkLVduby1lcnJvcj1lbnVtLWNvbnN0ZXhwci1jb252ZXJzaW9uIhstV25vLWVycm9yPWludmFsaWQtb2Zmc2V0b2YiKS1Xbm8tZXJyb3I9dGhyZWFkLXNhZmV0eS1yZWZlcmVuY2UtcmV0dXJuIhYtV25vLXZsYS1jeHgtZXh0ZW5zaW9uIjhidWlsZC9tYWtlL3Rvb2xzL2lkZV9xdWVyeS9wcm9iZXJfc2NyaXB0cy9jcHAvZ2VuZXJhbC5jYzJFZ2VuZmlsZXNfZm9yX2J1aWxkL21ha2UvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL2NwcC9nZW5lcmFsLmNjOp9ACitFZ2VuZmlsZXNfZm9yX2J1aWxkL21ha2UvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL2NwcC9nZW5lcmFsLmNjKtU/CiC2AXNvb25nLy5pbnRlcm1lZGlhdGVzL2J1aWxkL21ha2UvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL2NwcC9pZGVfcXVlcnlfcHJvYmVyc2NyaXB0X2NjL2FuZHJvaWRfYXJtX2FybXY3LWEtbmVvbi9nZW4vcHJvdG8vYnVpbGQvbWFrZS90b29scy9pZGVfcXVlcnkvcHJvYmVyX3NjcmlwdHMvY3BwL2Zvby5wYi5oEpk+Ly8gR2VuZXJhdGVkIGJ5IHRoZSBwcm90b2NvbCBidWZmZXIgY29tcGlsZXIuICBETyBOT1QgRURJVCEKIC8vIHNvdXJjZTogYnVpbGQvbWFrZS90b29scy9pZGVfcXVlcnkvcHJvYmVyX3NjcmlwdHMvY3BwL2Zvby5wcm90bwogCmRpZmYgLS1naXQgYS90b29scy9pZGVfcXVlcnkvcHJvYmVyX3NjcmlwdHMvcmVnZW4uc2ggYi90b29scy9pZGVfcXVlcnkvcHJvYmVyX3NjcmlwdHMvcmVnZW4uc2gKaW5kZXggMmVkZmU1My4uMDRhMDI2NCAxMDA3NTUKLS0tIGEvdG9vbHMvaWRlX3F1ZXJ5L3Byb2Jlcl9zY3JpcHRzL3JlZ2VuLnNoCisrKyBiL3Rvb2xzL2lkZV9xdWVyeS9wcm9iZXJfc2NyaXB0cy9yZWdlbi5zaApAQCAtMjEsMTMgKzIxLDggQEAKICMgaWRlX3F1ZXJ5LnNoLiBUaGUgcHJvYmVyIGRvZXNuJ3QgY2hlY2stb3V0IHRoZSBmdWxsIHNvdXJjZSBjb2RlLCBzbyBpdAogIyBjYW4ndCBydW4gaWRlX3F1ZXJ5LnNoIGl0c2VsZi4KIAotY2QgJChkaXJuYW1lICRCQVNIX1NPVVJDRSkKLXNvdXJjZSAkKHB3ZCkvLi4vLi4vLi4vc2hlbGxfdXRpbHMuc2gKLXJlcXVpcmVfdG9wCi0KIGZpbGVzX3RvX2J1aWxkPSgKICAgYnVpbGQvbWFrZS90b29scy9pZGVfcXVlcnkvcHJvYmVyX3NjcmlwdHMvY3BwL2dlbmVyYWwuY2MKICkKIAotY2QgJHtUT1B9CiBidWlsZC9tYWtlL3Rvb2xzL2lkZV9xdWVyeS9pZGVfcXVlcnkuc2ggLS1sdW5jaF90YXJnZXQ9YW9zcF9hcm0tdHJ1bmtfc3RhZ2luZy1lbmcgJHtmaWxlc190b19idWlsZFtAXX0gPiBidWlsZC9tYWtlL3Rvb2xzL2lkZV9xdWVyeS9wcm9iZXJfc2NyaXB0cy9pZGVfcXVlcnkub3V0CmRpZmYgLS1naXQgYS90b29scy9yZWxlYXNldG9vbHMvYWRkX2ltZ190b190YXJnZXRfZmlsZXMucHkgYi90b29scy9yZWxlYXNldG9vbHMvYWRkX2ltZ190b190YXJnZXRfZmlsZXMucHkKaW5kZXggYzI1ZmYyNy4uMzBhNmFjYyAxMDA2NDQKLS0tIGEvdG9vbHMvcmVsZWFzZXRvb2xzL2FkZF9pbWdfdG9fdGFyZ2V0X2ZpbGVzLnB5CisrKyBiL3Rvb2xzL3JlbGVhc2V0b29scy9hZGRfaW1nX3RvX3RhcmdldF9maWxlcy5weQpAQCAtMTEwMCw3ICsxMTAwLDcgQEAKICAgICB2Ym1ldGFfcGFydGl0aW9ucyA9IGNvbW1vbi5BVkJfUEFSVElUSU9OU1s6XSArIHR1cGxlKGF2Yl9jdXN0b21fcGFydGl0aW9ucykKIAogICAgIHZibWV0YV9zeXN0ZW0gPSBPUFRJT05TLmluZm9fZGljdC5nZXQoImF2Yl92Ym1ldGFfc3lzdGVtIiwgIiIpLnN0cmlwKCkKLSAgICBpZiB2Ym1ldGFfc3lzdGVtOgorICAgIGlmIHZibWV0YV9zeXN0ZW0gYW5kIHNldCh2Ym1ldGFfc3lzdGVtLnNwbGl0KCkpLmludGVyc2VjdGlvbihwYXJ0aXRpb25zKToKICAgICAgIGJhbm5lcigidmJtZXRhX3N5c3RlbSIpCiAgICAgICBwYXJ0aXRpb25zWyJ2Ym1ldGFfc3lzdGVtIl0gPSBBZGRWQk1ldGEoCiAgICAgICAgICAgb3V0cHV0X3ppcCwgcGFydGl0aW9ucywgInZibWV0YV9zeXN0ZW0iLCB2Ym1ldGFfc3lzdGVtLnNwbGl0KCkpCkBAIC0xMTEwLDcgKzExMTAsNyBAQAogICAgICAgdmJtZXRhX3BhcnRpdGlvbnMuYXBwZW5kKCJ2Ym1ldGFfc3lzdGVtIikKIAogICAgIHZibWV0YV92ZW5kb3IgPSBPUFRJT05TLmluZm9fZGljdC5nZXQoImF2Yl92Ym1ldGFfdmVuZG9yIiwgIiIpLnN0cmlwKCkKLSAgICBpZiB2Ym1ldGFfdmVuZG9yOgorICAgIGlmIHZibWV0YV92ZW5kb3IgYW5kIHNldCh2Ym1ldGFfdmVuZG9yLnNwbGl0KCkpLmludGVyc2VjdGlvbihwYXJ0aXRpb25zKToKICAgICAgIGJhbm5lcigidmJtZXRhX3ZlbmRvciIpCiAgICAgICBwYXJ0aXRpb25zWyJ2Ym1ldGFfdmVuZG9yIl0gPSBBZGRWQk1ldGEoCiAgICAgICAgICAgb3V0cHV0X3ppcCwgcGFydGl0aW9ucywgInZibWV0YV92ZW5kb3IiLCB2Ym1ldGFfdmVuZG9yLnNwbGl0KCkpCkBAIC0xMTM3LDcgKzExMzcsNyBAQAogICAgICAgICAgICAgaWYgaXRlbSBub3QgaW4gaW5jbHVkZWRfcGFydGl0aW9uc10KICAgICAgICAgdmJtZXRhX3BhcnRpdGlvbnMuYXBwZW5kKHBhcnRpdGlvbl9uYW1lKQogCi0gICAgaWYgT1BUSU9OUy5pbmZvX2RpY3QuZ2V0KCJhdmJfYnVpbGRpbmdfdmJtZXRhX2ltYWdlIikgPT0gInRydWUiOgorICAgIGlmIE9QVElPTlMuaW5mb19kaWN0LmdldCgiYXZiX2J1aWxkaW5nX3ZibWV0YV9pbWFnZSIpID09ICJ0cnVlIiBhbmQgc2V0KHZibWV0YV9wYXJ0aXRpb25zKS5pbnRlcnNlY3Rpb24ocGFydGl0aW9ucyk6CiAgICAgICBiYW5uZXIoInZibWV0YSIpCiAgICAgICBBZGRWQk1ldGEob3V0cHV0X3ppcCwgcGFydGl0aW9ucywgInZibWV0YSIsIHZibWV0YV9wYXJ0aXRpb25zKQogCg==