95770 2012-09-04 12:27:46 -0700 [Chromium-Android] Include device serial number in ChromiumAndroidDriver log messages 2012-09-04 15:14:19 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Android RESOLVED FIXED NRWT P2 Normal --- 1 wangxianzhu wangxianzhu abarth dpranke ojan webkit.review.bot oldest_to_newest 711342 0 wangxianzhu 2012-09-04 12:27:46 -0700 As we support multiple devices, it'd be useful to prefix all log messages of ChromiumAndroidDriver with the device serial numbers. 711352 1 162081 wangxianzhu 2012-09-04 12:43:09 -0700 Created attachment 162081 Patch 711357 2 162082 wangxianzhu 2012-09-04 12:48:16 -0700 Created attachment 162082 Update unittest 711483 3 162082 webkit.review.bot 2012-09-04 15:14:15 -0700 Comment on attachment 162082 Update unittest Clearing flags on attachment: 162082 Committed r127512: <http://trac.webkit.org/changeset/127512> 711484 4 webkit.review.bot 2012-09-04 15:14:19 -0700 All reviewed patches have been landed. Closing bug. 162081 2012-09-04 12:43:09 -0700 2012-09-04 12:48:14 -0700 Patch bug-95770-20120904124251.patch text/plain 11195 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NDcwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTM2MDllMmUzZWNhMTFlMjNjYzA5NjM2NDFkZjNmYzYz OTZmNzA2MC4uNmUxYTdkZDdiZmQyN2FlMTFhMDNmNzQ1ODQzMjc5MGIyZDEzNTAzOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDEyLTA5LTA0ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIEluY2x1ZGUgZGV2aWNlIHNlcmlhbCBudW1i ZXIgaW4gQ2hyb21pdW1BbmRyb2lkRHJpdmVyIGxvZyBtZXNzYWdlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU3NzAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weToKKyAgICAgICAgKENocm9taXVtQW5kcm9p ZERyaXZlci5fX2luaXRfXyk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXIuX2xvZ19l cnJvcik6IEFkZGVkIHRvIHJlcGxhY2Ugb3JpZ2luYWwgX2xvZy5lcnJvcigpLgorICAgICAgICAo Q2hyb21pdW1BbmRyb2lkRHJpdmVyLl9sb2dfZGVidWcpOiBBZGRlZCB0byByZXBsYWNlIG9yaWdp bmFsIF9sb2cuZGVidWcoKS4KKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fYWJvcnQp OiBBZGRlZCB0byByZXBsYWNlIG9yaWdpbmFsIHJhaXNlIEFzc2VydGlvbkVycm9yKCkuCisgICAg ICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXIuX3B1c2hfZXhlY3V0YWJsZSk6CisgICAgICAgIChD aHJvbWl1bUFuZHJvaWREcml2ZXIuX3B1c2hfZm9udHMpOgorICAgICAgICAoQ2hyb21pdW1BbmRy b2lkRHJpdmVyLl9wdXNoX3Rlc3RfcmVzb3VyY2VzKToKKyAgICAgICAgKENocm9taXVtQW5kcm9p ZERyaXZlci5fcnVuX2FkYl9jb21tYW5kKToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZl ci5fZ2V0X2xhc3Rfc3RhY2t0cmFjZSk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXIu X2dldF9jcmFzaF9sb2cpOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9zdGFydCk6 CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXIuX3N0YXJ0X29uY2UpOgorICAgICAgICAo Q2hyb21pdW1BbmRyb2lkRHJpdmVyLl9zdGFydF9vbmNlLmRlYWRsb2NrX2RldGVjdG9yKToKKwog MjAxMi0wOS0wMyAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+CiAKICAgICAg ICAgW0VGTF0gQ2hhbmdlIHRoZSBmb2N1cyB3aGVuIHRoZSB3ZWIgdmlldyBpcyBjbGlja2VkIGlu IE1pbmlCcm93c2VyIGFuZCBFV2ViTGF1bmNoZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQppbmRl eCA0ZTg1YWZlNmNjY2NhNDkwN2ZiNTU4YzUyZGI4OTRmYjI2ZjUwNzEzLi4zMGUxMjFjOWUxMDY4 YTdiNDgwNGQ0MmI1ZDA1NDE2NTZjM2U2NTU4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CkBA IC0zMTcsNyArMzE3LDggQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZlci5Ecml2 ZXIpOgogICAgICAgICBzZWxmLl9mb3J3YXJkZXJfcHJvY2VzcyA9IE5vbmUKICAgICAgICAgc2Vs Zi5faGFzX3NldHVwID0gRmFsc2UKICAgICAgICAgc2VsZi5fb3JpZ2luYWxfZ292ZXJub3JzID0g e30KLSAgICAgICAgc2VsZi5fYWRiX2NvbW1hbmQgPSBbJ2FkYicsICctcycsIHBvcnQuX2dldF9k ZXZpY2Vfc2VyaWFsKHdvcmtlcl9udW1iZXIpXQorICAgICAgICBzZWxmLl9kZXZpY2Vfc2VyaWFs ID0gcG9ydC5fZ2V0X2RldmljZV9zZXJpYWwod29ya2VyX251bWJlcikKKyAgICAgICAgc2VsZi5f YWRiX2NvbW1hbmQgPSBbJ2FkYicsICctcycsIHNlbGYuX2RldmljZV9zZXJpYWxdCiAKICAgICBk ZWYgX19kZWxfXyhzZWxmKToKICAgICAgICAgc2VsZi5fdGVhcmRvd25fcGVyZm9ybWFuY2UoKQpA QCAtMzQ3LDYgKzM0OCwxNSBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRy aXZlcik6CiAgICAgICAgICMgVGhpcyBpcyBsaWtlIHdoYXQncyBkb25lIGluIENocm9taXVtUG9y dC5zZXR1cF90ZXN0X3J1biBidXQgb24gdGhlIGRldmljZS4KICAgICAgICAgc2VsZi5fcnVuX2Fk Yl9jb21tYW5kKFsnc2hlbGwnLCAncm0nLCAnLXInLCBEUlRfQVBQX0NBQ0hFX0RJUl0pCiAKKyAg ICBkZWYgX2xvZ19lcnJvcihzZWxmLCBtZXNzYWdlKToKKyAgICAgICAgX2xvZy5lcnJvcignWyVz XSAlcycgJSAoc2VsZi5fZGV2aWNlX3NlcmlhbCwgbWVzc2FnZSkpCisKKyAgICBkZWYgX2xvZ19k ZWJ1ZyhzZWxmLCBtZXNzYWdlKToKKyAgICAgICAgX2xvZy5kZWJ1ZygnWyVzXSAlcycgJSAoc2Vs Zi5fZGV2aWNlX3NlcmlhbCwgbWVzc2FnZSkpCisKKyAgICBkZWYgX2Fib3J0KHNlbGYsIG1lc3Nh Z2UpOgorICAgICAgICByYWlzZSBBc3NlcnRpb25FcnJvcignWyVzXSAlcycgJSAoc2VsZi5fZGV2 aWNlX3NlcmlhbCwgbWVzc2FnZSkpCisKICAgICBkZWYgX3B1c2hfZXhlY3V0YWJsZShzZWxmKToK ICAgICAgICAgZHJ0X2hvc3RfcGF0aCA9IHNlbGYuX3BvcnQuX3BhdGhfdG9fZHJpdmVyKCkKICAg ICAgICAgZm9yd2FyZGVyX2hvc3RfcGF0aCA9IHNlbGYuX3BvcnQuX3BhdGhfdG9fZm9yd2FyZGVy KCkKQEAgLTM1NSwxMiArMzY1LDEyIEBAIGNsYXNzIENocm9taXVtQW5kcm9pZERyaXZlcihkcml2 ZXIuRHJpdmVyKToKICAgICAgICAgZGV2aWNlX3N0YW1wID0gaW50KGZsb2F0KHNlbGYuX3J1bl9h ZGJfY29tbWFuZChbCiAgICAgICAgICAgICAnc2hlbGwnLCAnY2F0ICVzIDI+L2Rldi9udWxsIHx8 IGVjaG8gMCcgJSBERVZJQ0VfRFJUX1NUQU1QX1BBVEhdKSkpCiAgICAgICAgIGlmIGRldmljZV9z dGFtcCAhPSBob3N0X3N0YW1wOgotICAgICAgICAgICAgX2xvZy5kZWJ1ZygnUHVzaGluZyBleGVj dXRhYmxlJykKKyAgICAgICAgICAgIHNlbGYuX2xvZ19kZWJ1ZygnUHVzaGluZyBleGVjdXRhYmxl JykKICAgICAgICAgICAgIHNlbGYuX3B1c2hfdG9fZGV2aWNlKGZvcndhcmRlcl9ob3N0X3BhdGgs IERFVklDRV9GT1JXQVJERVJfUEFUSCkKICAgICAgICAgICAgIHNlbGYuX3J1bl9hZGJfY29tbWFu ZChbJ3VuaW5zdGFsbCcsIERSVF9BUFBfUEFDS0FHRV0pCiAgICAgICAgICAgICBpbnN0YWxsX3Jl c3VsdCA9IHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ2luc3RhbGwnLCBkcnRfaG9zdF9wYXRoXSkK ICAgICAgICAgICAgIGlmIGluc3RhbGxfcmVzdWx0LmZpbmQoJ1N1Y2Nlc3MnKSA9PSAtMToKLSAg ICAgICAgICAgICAgICByYWlzZSBBc3NlcnRpb25FcnJvcignRmFpbGVkIHRvIGluc3RhbGwgJXMg b250byBkZXZpY2U6ICVzJyAlIChkcnRfaG9zdF9wYXRoLCBpbnN0YWxsX3Jlc3VsdCkpCisgICAg ICAgICAgICAgICAgc2VsZi5fYWJvcnQoJ0ZhaWxlZCB0byBpbnN0YWxsICVzIG9udG8gZGV2aWNl OiAlcycgJSAoZHJ0X2hvc3RfcGF0aCwgaW5zdGFsbF9yZXN1bHQpKQogICAgICAgICAgICAgc2Vs Zi5fcHVzaF90b19kZXZpY2Uoc2VsZi5fcG9ydC5fYnVpbGRfcGF0aCgnRHVtcFJlbmRlclRyZWUu cGFrJyksIERFVklDRV9EUlRfRElSICsgJ0R1bXBSZW5kZXJUcmVlLnBhaycpCiAgICAgICAgICAg ICBzZWxmLl9wdXNoX3RvX2RldmljZShzZWxmLl9wb3J0Ll9idWlsZF9wYXRoKCdEdW1wUmVuZGVy VHJlZV9yZXNvdXJjZXMnKSwgREVWSUNFX0RSVF9ESVIgKyAnRHVtcFJlbmRlclRyZWVfcmVzb3Vy Y2VzJykKICAgICAgICAgICAgIHNlbGYuX3B1c2hfdG9fZGV2aWNlKHNlbGYuX3BvcnQuX2J1aWxk X3BhdGgoJ2FuZHJvaWRfbWFpbl9mb250cy54bWwnKSwgREVWSUNFX0RSVF9ESVIgKyAnYW5kcm9p ZF9tYWluX2ZvbnRzLnhtbCcpCkBAIC0zNzMsNyArMzgzLDcgQEAgY2xhc3MgQ2hyb21pdW1BbmRy b2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIpOgogCiAgICAgZGVmIF9wdXNoX2ZvbnRzKHNlbGYpOgog ICAgICAgICBpZiBub3Qgc2VsZi5fY2hlY2tfdmVyc2lvbihERVZJQ0VfRk9OVFNfRElSLCBGT05U X0ZJTEVTX1ZFUlNJT04pOgotICAgICAgICAgICAgX2xvZy5kZWJ1ZygnUHVzaGluZyBmb250cycp CisgICAgICAgICAgICBzZWxmLl9sb2dfZGVidWcoJ1B1c2hpbmcgZm9udHMnKQogICAgICAgICAg ICAgcGF0aF90b19haGVtX2ZvbnQgPSBzZWxmLl9wb3J0Ll9idWlsZF9wYXRoKCdBSEVNX19fXy5U VEYnKQogICAgICAgICAgICAgc2VsZi5fcHVzaF90b19kZXZpY2UocGF0aF90b19haGVtX2ZvbnQs IERFVklDRV9GT05UU19ESVIgKyAnQUhFTV9fX18uVFRGJykKICAgICAgICAgICAgIGZvciAoaG9z dF9kaXIsIGZvbnRfZmlsZSkgaW4gSE9TVF9GT05UX0ZJTEVTOgpAQCAtMzgyLDcgKzM5Miw3IEBA IGNsYXNzIENocm9taXVtQW5kcm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICAgICAgICAg IHNlbGYuX3VwZGF0ZV92ZXJzaW9uKERFVklDRV9GT05UU19ESVIsIEZPTlRfRklMRVNfVkVSU0lP TikKIAogICAgIGRlZiBfcHVzaF90ZXN0X3Jlc291cmNlcyhzZWxmKToKLSAgICAgICAgX2xvZy5k ZWJ1ZygnUHVzaGluZyB0ZXN0IHJlc291cmNlcycpCisgICAgICAgIHNlbGYuX2xvZ19kZWJ1Zygn UHVzaGluZyB0ZXN0IHJlc291cmNlcycpCiAgICAgICAgIGZvciByZXNvdXJjZSBpbiBURVNUX1JF U09VUkNFU19UT19QVVNIOgogICAgICAgICAgICAgc2VsZi5fcHVzaF90b19kZXZpY2Uoc2VsZi5f cG9ydC5sYXlvdXRfdGVzdHNfZGlyKCkgKyAnLycgKyByZXNvdXJjZSwgREVWSUNFX0xBWU9VVF9U RVNUU19ESVIgKyByZXNvdXJjZSkKIApAQCAtNDA5LDcgKzQxOSw3IEBAIGNsYXNzIENocm9taXVt QW5kcm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICAgICAgc2VsZi5fcnVuX2FkYl9jb21t YW5kKFsnc2hlbGwnLCAnZWNobyAlZCA+ICVzVkVSU0lPTicgJSAodmVyc2lvbiwgZGlyKV0pCiAK ICAgICBkZWYgX3J1bl9hZGJfY29tbWFuZChzZWxmLCBjbWQsIGlnbm9yZV9lcnJvcj1GYWxzZSk6 Ci0gICAgICAgIF9sb2cuZGVidWcoJ1J1biBhZGIgY29tbWFuZDogJyArIHN0cihjbWQpKQorICAg ICAgICBzZWxmLl9sb2dfZGVidWcoJ1J1biBhZGIgY29tbWFuZDogJyArIHN0cihjbWQpKQogICAg ICAgICBpZiBpZ25vcmVfZXJyb3I6CiAgICAgICAgICAgICBlcnJvcl9oYW5kbGVyID0gc2VsZi5f cG9ydC5fZXhlY3V0aXZlLmlnbm9yZV9lcnJvcgogICAgICAgICBlbHNlOgpAQCAtNDE3LDcgKzQy Nyw3IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICAg ICAgcmVzdWx0ID0gc2VsZi5fcG9ydC5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKHNlbGYuX2FkYl9j b21tYW5kICsgY21kLCBlcnJvcl9oYW5kbGVyPWVycm9yX2hhbmRsZXIpCiAgICAgICAgICMgTGlt aXQgdGhlIGxlbmd0aCB0byBhdm9pZCB0b28gdmVyYm9zZSBvdXRwdXQgb2YgY29tbWFuZHMgbGlr ZSAnYWRiIGxvZ2NhdCcgYW5kICdjYXQgL2RhdGEvdG9tYnN0b25lcy90b21ic3RvbmUwMScKICAg ICAgICAgIyB3aG9zZSBvdXRwdXRzIGFyZSBub3JtYWxseSBwcmludGVkIGluIGxhdGVyIGxvZ3Mu Ci0gICAgICAgIF9sb2cuZGVidWcoJ1J1biBhZGIgcmVzdWx0OiAnICsgcmVzdWx0Wzo4MF0pCisg ICAgICAgIHNlbGYuX2xvZ19kZWJ1ZygnUnVuIGFkYiByZXN1bHQ6ICcgKyByZXN1bHRbOjgwXSkK ICAgICAgICAgcmV0dXJuIHJlc3VsdAogCiAgICAgZGVmIF9saW5rX2RldmljZV9maWxlKHNlbGYs IGZyb21fZmlsZSwgdG9fZmlsZSwgaWdub3JlX2Vycm9yPUZhbHNlKToKQEAgLTQzNCw3ICs0NDQs NyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAgICAgZGVm IF9nZXRfbGFzdF9zdGFja3RyYWNlKHNlbGYpOgogICAgICAgICB0b21ic3RvbmVzID0gc2VsZi5f cnVuX2FkYl9jb21tYW5kKFsnc2hlbGwnLCAnbHMnLCAnLW4nLCAnL2RhdGEvdG9tYnN0b25lcydd KQogICAgICAgICBpZiBub3QgdG9tYnN0b25lcyBvciB0b21ic3RvbmVzLnN0YXJ0c3dpdGgoJy9k YXRhL3RvbWJzdG9uZXM6IE5vIHN1Y2ggZmlsZSBvciBkaXJlY3RvcnknKToKLSAgICAgICAgICAg IF9sb2cuZXJyb3IoJ0RSVCBjcmFzaGVkLCBidXQgbm8gdG9tYnN0b25lIGZvdW5kIScpCisgICAg ICAgICAgICBzZWxmLl9sb2dfZXJyb3IoJ0RSVCBjcmFzaGVkLCBidXQgbm8gdG9tYnN0b25lIGZv dW5kIScpCiAgICAgICAgICAgICByZXR1cm4gJycKICAgICAgICAgdG9tYnN0b25lcyA9IHRvbWJz dG9uZXMucnN0cmlwKCkuc3BsaXQoJ1xuJykKICAgICAgICAgbGFzdF90b21ic3RvbmUgPSB0b21i c3RvbmVzWzBdLnNwbGl0KCkKQEAgLTQ3OSwxMCArNDg5LDEwIEBAIGNsYXNzIENocm9taXVtQW5k cm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICBkZWYgX2dldF9jcmFzaF9sb2coc2VsZiwg c3Rkb3V0LCBzdGRlcnIsIG5ld2VyX3RoYW4pOgogICAgICAgICBpZiBub3Qgc3Rkb3V0OgogICAg ICAgICAgICAgc3Rkb3V0ID0gJycKLSAgICAgICAgc3Rkb3V0ICs9ICcqKioqKioqKiogTG9nY2F0 OlxuJyArIHNlbGYuX2dldF9sb2djYXQoKQorICAgICAgICBzdGRvdXQgKz0gJyoqKioqKioqKiBb JXNdIExvZ2NhdDpcbiVzJyAlIChzZWxmLl9kZXZpY2Vfc2VyaWFsLCBzZWxmLl9nZXRfbG9nY2F0 KCkpCiAgICAgICAgIGlmIG5vdCBzdGRlcnI6CiAgICAgICAgICAgICBzdGRlcnIgPSAnJwotICAg ICAgICBzdGRlcnIgKz0gJyoqKioqKioqKiBUb21ic3RvbmUgZmlsZTpcbicgKyBzZWxmLl9nZXRf bGFzdF9zdGFja3RyYWNlKCkKKyAgICAgICAgc3RkZXJyICs9ICcqKioqKioqKiogWyVzXSBUb21i c3RvbmUgZmlsZTpcbiVzJyAlIChzZWxmLl9kZXZpY2Vfc2VyaWFsLCBzZWxmLl9nZXRfbGFzdF9z dGFja3RyYWNlKCkpCiAgICAgICAgIHJldHVybiBzdXBlcihDaHJvbWl1bUFuZHJvaWREcml2ZXIs IHNlbGYpLl9nZXRfY3Jhc2hfbG9nKHN0ZG91dCwgc3RkZXJyLCBuZXdlcl90aGFuKQogCiAgICAg ZGVmIGNtZF9saW5lKHNlbGYsIHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKToKQEAgLTU0Mywx NSArNTUzLDE1IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToK ICAgICAgICAgZm9yIHJldHJpZXMgaW4gcmFuZ2UoMyk6CiAgICAgICAgICAgICBpZiBzZWxmLl9z dGFydF9vbmNlKHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKToKICAgICAgICAgICAgICAgICBy ZXR1cm4KLSAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0ZhaWxlZCB0byBzdGFydCBEdW1wUmVuZGVy VHJlZSBhcHBsaWNhdGlvbi4gUmV0cmllcz0lZC4gTG9nOiVzJyAlIChyZXRyaWVzLCBzZWxmLl9n ZXRfbG9nY2F0KCkpKQorICAgICAgICAgICAgc2VsZi5fbG9nX2Vycm9yKCdGYWlsZWQgdG8gc3Rh cnQgRHVtcFJlbmRlclRyZWUgYXBwbGljYXRpb24uIFJldHJpZXM9JWQuIExvZzolcycgJSAocmV0 cmllcywgc2VsZi5fZ2V0X2xvZ2NhdCgpKSkKICAgICAgICAgICAgIHNlbGYuc3RvcCgpCiAgICAg ICAgICAgICB0aW1lLnNsZWVwKDIpCi0gICAgICAgIHJhaXNlIEFzc2VydGlvbkVycm9yKCdGYWls ZWQgdG8gc3RhcnQgRHVtcFJlbmRlclRyZWUgYXBwbGljYXRpb24gbXVsdGlwbGUgdGltZXMuIEdp dmUgdXAuJykKKyAgICAgICAgc2VsZi5fYWJvcnQoJ0ZhaWxlZCB0byBzdGFydCBEdW1wUmVuZGVy VHJlZSBhcHBsaWNhdGlvbiBtdWx0aXBsZSB0aW1lcy4gR2l2ZSB1cC4nKQogCiAgICAgZGVmIF9z dGFydF9vbmNlKHNlbGYsIHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKToKICAgICAgICAgc3Vw ZXIoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLCBzZWxmKS5fc3RhcnQocGl4ZWxfdGVzdHMsIHBlcl90 ZXN0X2FyZ3MpCiAKLSAgICAgICAgX2xvZy5kZWJ1ZygnU3RhcnRpbmcgZm9yd2FyZGVyJykKKyAg ICAgICAgc2VsZi5fbG9nX2RlYnVnKCdTdGFydGluZyBmb3J3YXJkZXInKQogICAgICAgICBzZWxm Ll9mb3J3YXJkZXJfcHJvY2VzcyA9IHNlbGYuX3BvcnQuX3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVj dG9yKAogICAgICAgICAgICAgc2VsZi5fcG9ydCwgJ0ZvcndhcmRlcicsIHNlbGYuX2FkYl9jb21t YW5kICsgWydzaGVsbCcsICclcyAtRCAlcycgJSAoREVWSUNFX0ZPUldBUkRFUl9QQVRILCBGT1JX QVJEX1BPUlRTKV0pCiAgICAgICAgIHNlbGYuX2ZvcndhcmRlcl9wcm9jZXNzLnN0YXJ0KCkKQEAg LTU2MCw3ICs1NzAsNyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZl cik6CiAgICAgICAgIHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxsJywgJ2VjaG8nXSArIHNl bGYuX2NtZF9saW5lICsgWyc+JywgQ09NTUFORF9MSU5FX0ZJTEVdKQogICAgICAgICBzdGFydF9y ZXN1bHQgPSBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydzaGVsbCcsICdhbScsICdzdGFydCcsICct ZScsICdSdW5JblN1YlRocmVhZCcsICctbicsIERSVF9BQ1RJVklUWV9GVUxMX05BTUVdKQogICAg ICAgICBpZiBzdGFydF9yZXN1bHQuZmluZCgnRXhjZXB0aW9uJykgIT0gLTE6Ci0gICAgICAgICAg ICBfbG9nLmVycm9yKCdGYWlsZWQgdG8gc3RhcnQgRHVtcFJlbmRlclRyZWUgYXBwbGljYXRpb24u IEV4Y2VwdGlvbjpcbicgKyBzdGFydF9yZXN1bHQpCisgICAgICAgICAgICBzZWxmLl9sb2dfZXJy b3IoJ0ZhaWxlZCB0byBzdGFydCBEdW1wUmVuZGVyVHJlZSBhcHBsaWNhdGlvbi4gRXhjZXB0aW9u OlxuJyArIHN0YXJ0X3Jlc3VsdCkKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogCiAgICAgICAg IGlmIG5vdCBDaHJvbWl1bUFuZHJvaWREcml2ZXIuX2xvb3Bfd2l0aF90aW1lb3V0KHNlbGYuX2Fs bF9waXBlc19jcmVhdGVkLCBEUlRfU1RBUlRfU1RPUF9USU1FT1VUX1NFQ1MpOgpAQCAtNTcwLDIx ICs1ODAsMjEgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIpOgog ICAgICAgICBkZWFkbGluZSA9IHRpbWUudGltZSgpICsgRFJUX1NUQVJUX1NUT1BfVElNRU9VVF9T RUNTCiAgICAgICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzLnN0YXJ0KCkKICAgICAgICAgc2VsZi5f cmVhZF9wcm9tcHQoZGVhZGxpbmUpCi0gICAgICAgIF9sb2cuZGVidWcoJ0ludGVyYWN0aXZlIHNo ZWxsIHN0YXJ0ZWQnKQorICAgICAgICBzZWxmLl9sb2dfZGVidWcoJ0ludGVyYWN0aXZlIHNoZWxs IHN0YXJ0ZWQnKQogCiAgICAgICAgICMgU3RhcnQgYSBwcm9jZXNzIHRvIHJlYWQgZnJvbSB0aGUg c3Rkb3V0IGZpZm8gb2YgdGhlIER1bXBSZW5kZXJUcmVlIGFwcCBhbmQgcHJpbnQgdG8gc3Rkb3V0 LgotICAgICAgICBfbG9nLmRlYnVnKCdSZWRpcmVjdGluZyBzdGRvdXQgdG8gJyArIHNlbGYuX291 dF9maWZvX3BhdGgpCisgICAgICAgIHNlbGYuX2xvZ19kZWJ1ZygnUmVkaXJlY3Rpbmcgc3Rkb3V0 IHRvICcgKyBzZWxmLl9vdXRfZmlmb19wYXRoKQogICAgICAgICBzZWxmLl9yZWFkX3N0ZG91dF9w cm9jZXNzID0gc2VsZi5fcG9ydC5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3IoCiAgICAgICAg ICAgICBzZWxmLl9wb3J0LCAnUmVhZFN0ZG91dCcsIHNlbGYuX2FkYl9jb21tYW5kICsgWydzaGVs bCcsICdjYXQnLCBzZWxmLl9vdXRfZmlmb19wYXRoXSkKICAgICAgICAgc2VsZi5fcmVhZF9zdGRv dXRfcHJvY2Vzcy5zdGFydCgpCiAKICAgICAgICAgIyBTdGFydCBhIHByb2Nlc3MgdG8gcmVhZCBm cm9tIHRoZSBzdGRlcnIgZmlmbyBvZiB0aGUgRHVtcFJlbmRlclRyZWUgYXBwIGFuZCBwcmludCB0 byBzdGRvdXQuCi0gICAgICAgIF9sb2cuZGVidWcoJ1JlZGlyZWN0aW5nIHN0ZGVyciB0byAnICsg c2VsZi5fZXJyX2ZpZm9fcGF0aCkKKyAgICAgICAgc2VsZi5fbG9nX2RlYnVnKCdSZWRpcmVjdGlu ZyBzdGRlcnIgdG8gJyArIHNlbGYuX2Vycl9maWZvX3BhdGgpCiAgICAgICAgIHNlbGYuX3JlYWRf c3RkZXJyX3Byb2Nlc3MgPSBzZWxmLl9wb3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1Y3RvcigK ICAgICAgICAgICAgIHNlbGYuX3BvcnQsICdSZWFkU3RkZXJyJywgc2VsZi5fYWRiX2NvbW1hbmQg KyBbJ3NoZWxsJywgJ2NhdCcsIHNlbGYuX2Vycl9maWZvX3BhdGhdKQogICAgICAgICBzZWxmLl9y ZWFkX3N0ZGVycl9wcm9jZXNzLnN0YXJ0KCkKIAotICAgICAgICBfbG9nLmRlYnVnKCdSZWRpcmVj dGluZyBzdGRpbiB0byAnICsgc2VsZi5faW5fZmlmb19wYXRoKQorICAgICAgICBzZWxmLl9sb2df ZGVidWcoJ1JlZGlyZWN0aW5nIHN0ZGluIHRvICcgKyBzZWxmLl9pbl9maWZvX3BhdGgpCiAgICAg ICAgIHNlbGYuX3NlcnZlcl9wcm9jZXNzLndyaXRlKCdjYXQgPiVzXG4nICUgc2VsZi5faW5fZmlm b19wYXRoKQogCiAgICAgICAgICMgQ29tYmluZSB0aGUgc3Rkb3V0IGFuZCBzdGRlcnIgcGlwZXMg aW50byBzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy4KQEAgLTU5Niw3ICs2MDYsNyBAQCBjbGFzcyBDaHJv bWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAgICAgICAgICAgICAgICAgIyByZWFk aW5nL3dyaXRpbmcgdGhlIGZpZm8uIEtpbGwgdGhlIGZpZm8gcmVhZGluZy93cml0aW5nIHByb2Nl c3NlcyB0byBsZXQgdGhlCiAgICAgICAgICAgICAgICAgIyBtYWluIHRocmVhZCBlc2NhcGUgZnJv bSB0aGUgZGVhZGxvY2tlZCBzdGF0ZS4gQWZ0ZXIgdGhhdCwgdGhlIG1haW4gdGhyZWFkIHdpbGwK ICAgICAgICAgICAgICAgICAjIHRyZWF0IHRoaXMgYXMgYSBjcmFzaC4KLSAgICAgICAgICAgICAg ICBfbG9nLndhcm4oJ0RlYWRsb2NrIGRldGVjdGVkLiBQcm9jZXNzZXMga2lsbGVkLicpCisgICAg ICAgICAgICAgICAgc2VsZi5fbG9nX2Vycm9yKCdEZWFkbG9jayBkZXRlY3RlZC4gUHJvY2Vzc2Vz IGtpbGxlZC4nKQogICAgICAgICAgICAgICAgIGZvciBpIGluIHByb2Nlc3NlczoKICAgICAgICAg ICAgICAgICAgICAgaS5raWxsKCkKIAo= 162082 2012-09-04 12:48:16 -0700 2012-09-04 15:14:15 -0700 Update unittest bug-95770-20120904124759.patch text/plain 13932 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NDcwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTM2MDllMmUzZWNhMTFlMjNjYzA5NjM2NDFkZjNmYzYz OTZmNzA2MC4uMjdlYjRjMTRlM2FmNzE1YWRhNzYzYWRlZTIwMjhjYmIxNTBlMDZlZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDEyLTA5LTA0ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIEluY2x1ZGUgZGV2aWNlIHNlcmlhbCBudW1i ZXIgaW4gQ2hyb21pdW1BbmRyb2lkRHJpdmVyIGxvZyBtZXNzYWdlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU3NzAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weToKKyAgICAgICAgKENocm9taXVtQW5kcm9p ZERyaXZlci5fX2luaXRfXyk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXIuX2xvZ19l cnJvcik6IEFkZGVkIHRvIHJlcGxhY2Ugb3JpZ2luYWwgX2xvZy5lcnJvcigpLgorICAgICAgICAo Q2hyb21pdW1BbmRyb2lkRHJpdmVyLl9sb2dfZGVidWcpOiBBZGRlZCB0byByZXBsYWNlIG9yaWdp bmFsIF9sb2cuZGVidWcoKS4KKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fYWJvcnQp OiBBZGRlZCB0byByZXBsYWNlIG9yaWdpbmFsIHJhaXNlIEFzc2VydGlvbkVycm9yKCkuCisgICAg ICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXIuX3B1c2hfZXhlY3V0YWJsZSk6CisgICAgICAgIChD aHJvbWl1bUFuZHJvaWREcml2ZXIuX3B1c2hfZm9udHMpOgorICAgICAgICAoQ2hyb21pdW1BbmRy b2lkRHJpdmVyLl9wdXNoX3Rlc3RfcmVzb3VyY2VzKToKKyAgICAgICAgKENocm9taXVtQW5kcm9p ZERyaXZlci5fcnVuX2FkYl9jb21tYW5kKToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZl ci5fZ2V0X2xhc3Rfc3RhY2t0cmFjZSk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXIu X2dldF9jcmFzaF9sb2cpOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9zdGFydCk6 CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXIuX3N0YXJ0X29uY2UpOgorICAgICAgICAo Q2hyb21pdW1BbmRyb2lkRHJpdmVyLl9zdGFydF9vbmNlLmRlYWRsb2NrX2RldGVjdG9yKToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJv aWRfdW5pdHRlc3QucHk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXJUZXN0LnRlc3Rf Z2V0X2NyYXNoX2xvZyk6CisKIDIwMTItMDktMDMgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQHNh bXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdIENoYW5nZSB0aGUgZm9jdXMgd2hlbiB0aGUgd2Vi IHZpZXcgaXMgY2xpY2tlZCBpbiBNaW5pQnJvd3NlciBhbmQgRVdlYkxhdW5jaGVyCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2Fu ZHJvaWQucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t aXVtX2FuZHJvaWQucHkKaW5kZXggNGU4NWFmZTZjY2NjYTQ5MDdmYjU1OGM1MmRiODk0ZmIyNmY1 MDcxMy4uMzBlMTIxYzllMTA2OGE3YjQ4MDRkNDJiNWQwNTQxNjU2YzNlNjU1OCAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRy b2lkLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fYW5kcm9pZC5weQpAQCAtMzE3LDcgKzMxNyw4IEBAIGNsYXNzIENocm9taXVtQW5kcm9p ZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICAgICAgc2VsZi5fZm9yd2FyZGVyX3Byb2Nlc3Mg PSBOb25lCiAgICAgICAgIHNlbGYuX2hhc19zZXR1cCA9IEZhbHNlCiAgICAgICAgIHNlbGYuX29y aWdpbmFsX2dvdmVybm9ycyA9IHt9Ci0gICAgICAgIHNlbGYuX2FkYl9jb21tYW5kID0gWydhZGIn LCAnLXMnLCBwb3J0Ll9nZXRfZGV2aWNlX3NlcmlhbCh3b3JrZXJfbnVtYmVyKV0KKyAgICAgICAg c2VsZi5fZGV2aWNlX3NlcmlhbCA9IHBvcnQuX2dldF9kZXZpY2Vfc2VyaWFsKHdvcmtlcl9udW1i ZXIpCisgICAgICAgIHNlbGYuX2FkYl9jb21tYW5kID0gWydhZGInLCAnLXMnLCBzZWxmLl9kZXZp Y2Vfc2VyaWFsXQogCiAgICAgZGVmIF9fZGVsX18oc2VsZik6CiAgICAgICAgIHNlbGYuX3RlYXJk b3duX3BlcmZvcm1hbmNlKCkKQEAgLTM0Nyw2ICszNDgsMTUgQEAgY2xhc3MgQ2hyb21pdW1BbmRy b2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIpOgogICAgICAgICAjIFRoaXMgaXMgbGlrZSB3aGF0J3Mg ZG9uZSBpbiBDaHJvbWl1bVBvcnQuc2V0dXBfdGVzdF9ydW4gYnV0IG9uIHRoZSBkZXZpY2UuCiAg ICAgICAgIHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxsJywgJ3JtJywgJy1yJywgRFJUX0FQ UF9DQUNIRV9ESVJdKQogCisgICAgZGVmIF9sb2dfZXJyb3Ioc2VsZiwgbWVzc2FnZSk6CisgICAg ICAgIF9sb2cuZXJyb3IoJ1slc10gJXMnICUgKHNlbGYuX2RldmljZV9zZXJpYWwsIG1lc3NhZ2Up KQorCisgICAgZGVmIF9sb2dfZGVidWcoc2VsZiwgbWVzc2FnZSk6CisgICAgICAgIF9sb2cuZGVi dWcoJ1slc10gJXMnICUgKHNlbGYuX2RldmljZV9zZXJpYWwsIG1lc3NhZ2UpKQorCisgICAgZGVm IF9hYm9ydChzZWxmLCBtZXNzYWdlKToKKyAgICAgICAgcmFpc2UgQXNzZXJ0aW9uRXJyb3IoJ1sl c10gJXMnICUgKHNlbGYuX2RldmljZV9zZXJpYWwsIG1lc3NhZ2UpKQorCiAgICAgZGVmIF9wdXNo X2V4ZWN1dGFibGUoc2VsZik6CiAgICAgICAgIGRydF9ob3N0X3BhdGggPSBzZWxmLl9wb3J0Ll9w YXRoX3RvX2RyaXZlcigpCiAgICAgICAgIGZvcndhcmRlcl9ob3N0X3BhdGggPSBzZWxmLl9wb3J0 Ll9wYXRoX3RvX2ZvcndhcmRlcigpCkBAIC0zNTUsMTIgKzM2NSwxMiBAQCBjbGFzcyBDaHJvbWl1 bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAgICAgICAgIGRldmljZV9zdGFtcCA9IGlu dChmbG9hdChzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWwogICAgICAgICAgICAgJ3NoZWxsJywgJ2Nh dCAlcyAyPi9kZXYvbnVsbCB8fCBlY2hvIDAnICUgREVWSUNFX0RSVF9TVEFNUF9QQVRIXSkpKQog ICAgICAgICBpZiBkZXZpY2Vfc3RhbXAgIT0gaG9zdF9zdGFtcDoKLSAgICAgICAgICAgIF9sb2cu ZGVidWcoJ1B1c2hpbmcgZXhlY3V0YWJsZScpCisgICAgICAgICAgICBzZWxmLl9sb2dfZGVidWco J1B1c2hpbmcgZXhlY3V0YWJsZScpCiAgICAgICAgICAgICBzZWxmLl9wdXNoX3RvX2RldmljZShm b3J3YXJkZXJfaG9zdF9wYXRoLCBERVZJQ0VfRk9SV0FSREVSX1BBVEgpCiAgICAgICAgICAgICBz ZWxmLl9ydW5fYWRiX2NvbW1hbmQoWyd1bmluc3RhbGwnLCBEUlRfQVBQX1BBQ0tBR0VdKQogICAg ICAgICAgICAgaW5zdGFsbF9yZXN1bHQgPSBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydpbnN0YWxs JywgZHJ0X2hvc3RfcGF0aF0pCiAgICAgICAgICAgICBpZiBpbnN0YWxsX3Jlc3VsdC5maW5kKCdT dWNjZXNzJykgPT0gLTE6Ci0gICAgICAgICAgICAgICAgcmFpc2UgQXNzZXJ0aW9uRXJyb3IoJ0Zh aWxlZCB0byBpbnN0YWxsICVzIG9udG8gZGV2aWNlOiAlcycgJSAoZHJ0X2hvc3RfcGF0aCwgaW5z dGFsbF9yZXN1bHQpKQorICAgICAgICAgICAgICAgIHNlbGYuX2Fib3J0KCdGYWlsZWQgdG8gaW5z dGFsbCAlcyBvbnRvIGRldmljZTogJXMnICUgKGRydF9ob3N0X3BhdGgsIGluc3RhbGxfcmVzdWx0 KSkKICAgICAgICAgICAgIHNlbGYuX3B1c2hfdG9fZGV2aWNlKHNlbGYuX3BvcnQuX2J1aWxkX3Bh dGgoJ0R1bXBSZW5kZXJUcmVlLnBhaycpLCBERVZJQ0VfRFJUX0RJUiArICdEdW1wUmVuZGVyVHJl ZS5wYWsnKQogICAgICAgICAgICAgc2VsZi5fcHVzaF90b19kZXZpY2Uoc2VsZi5fcG9ydC5fYnVp bGRfcGF0aCgnRHVtcFJlbmRlclRyZWVfcmVzb3VyY2VzJyksIERFVklDRV9EUlRfRElSICsgJ0R1 bXBSZW5kZXJUcmVlX3Jlc291cmNlcycpCiAgICAgICAgICAgICBzZWxmLl9wdXNoX3RvX2Rldmlj ZShzZWxmLl9wb3J0Ll9idWlsZF9wYXRoKCdhbmRyb2lkX21haW5fZm9udHMueG1sJyksIERFVklD RV9EUlRfRElSICsgJ2FuZHJvaWRfbWFpbl9mb250cy54bWwnKQpAQCAtMzczLDcgKzM4Myw3IEBA IGNsYXNzIENocm9taXVtQW5kcm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKIAogICAgIGRlZiBf cHVzaF9mb250cyhzZWxmKToKICAgICAgICAgaWYgbm90IHNlbGYuX2NoZWNrX3ZlcnNpb24oREVW SUNFX0ZPTlRTX0RJUiwgRk9OVF9GSUxFU19WRVJTSU9OKToKLSAgICAgICAgICAgIF9sb2cuZGVi dWcoJ1B1c2hpbmcgZm9udHMnKQorICAgICAgICAgICAgc2VsZi5fbG9nX2RlYnVnKCdQdXNoaW5n IGZvbnRzJykKICAgICAgICAgICAgIHBhdGhfdG9fYWhlbV9mb250ID0gc2VsZi5fcG9ydC5fYnVp bGRfcGF0aCgnQUhFTV9fX18uVFRGJykKICAgICAgICAgICAgIHNlbGYuX3B1c2hfdG9fZGV2aWNl KHBhdGhfdG9fYWhlbV9mb250LCBERVZJQ0VfRk9OVFNfRElSICsgJ0FIRU1fX19fLlRURicpCiAg ICAgICAgICAgICBmb3IgKGhvc3RfZGlyLCBmb250X2ZpbGUpIGluIEhPU1RfRk9OVF9GSUxFUzoK QEAgLTM4Miw3ICszOTIsNyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRy aXZlcik6CiAgICAgICAgICAgICBzZWxmLl91cGRhdGVfdmVyc2lvbihERVZJQ0VfRk9OVFNfRElS LCBGT05UX0ZJTEVTX1ZFUlNJT04pCiAKICAgICBkZWYgX3B1c2hfdGVzdF9yZXNvdXJjZXMoc2Vs Zik6Ci0gICAgICAgIF9sb2cuZGVidWcoJ1B1c2hpbmcgdGVzdCByZXNvdXJjZXMnKQorICAgICAg ICBzZWxmLl9sb2dfZGVidWcoJ1B1c2hpbmcgdGVzdCByZXNvdXJjZXMnKQogICAgICAgICBmb3Ig cmVzb3VyY2UgaW4gVEVTVF9SRVNPVVJDRVNfVE9fUFVTSDoKICAgICAgICAgICAgIHNlbGYuX3B1 c2hfdG9fZGV2aWNlKHNlbGYuX3BvcnQubGF5b3V0X3Rlc3RzX2RpcigpICsgJy8nICsgcmVzb3Vy Y2UsIERFVklDRV9MQVlPVVRfVEVTVFNfRElSICsgcmVzb3VyY2UpCiAKQEAgLTQwOSw3ICs0MTks NyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAgICAgICAg IHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxsJywgJ2VjaG8gJWQgPiAlc1ZFUlNJT04nICUg KHZlcnNpb24sIGRpcildKQogCiAgICAgZGVmIF9ydW5fYWRiX2NvbW1hbmQoc2VsZiwgY21kLCBp Z25vcmVfZXJyb3I9RmFsc2UpOgotICAgICAgICBfbG9nLmRlYnVnKCdSdW4gYWRiIGNvbW1hbmQ6 ICcgKyBzdHIoY21kKSkKKyAgICAgICAgc2VsZi5fbG9nX2RlYnVnKCdSdW4gYWRiIGNvbW1hbmQ6 ICcgKyBzdHIoY21kKSkKICAgICAgICAgaWYgaWdub3JlX2Vycm9yOgogICAgICAgICAgICAgZXJy b3JfaGFuZGxlciA9IHNlbGYuX3BvcnQuX2V4ZWN1dGl2ZS5pZ25vcmVfZXJyb3IKICAgICAgICAg ZWxzZToKQEAgLTQxNyw3ICs0MjcsNyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJp dmVyLkRyaXZlcik6CiAgICAgICAgIHJlc3VsdCA9IHNlbGYuX3BvcnQuX2V4ZWN1dGl2ZS5ydW5f Y29tbWFuZChzZWxmLl9hZGJfY29tbWFuZCArIGNtZCwgZXJyb3JfaGFuZGxlcj1lcnJvcl9oYW5k bGVyKQogICAgICAgICAjIExpbWl0IHRoZSBsZW5ndGggdG8gYXZvaWQgdG9vIHZlcmJvc2Ugb3V0 cHV0IG9mIGNvbW1hbmRzIGxpa2UgJ2FkYiBsb2djYXQnIGFuZCAnY2F0IC9kYXRhL3RvbWJzdG9u ZXMvdG9tYnN0b25lMDEnCiAgICAgICAgICMgd2hvc2Ugb3V0cHV0cyBhcmUgbm9ybWFsbHkgcHJp bnRlZCBpbiBsYXRlciBsb2dzLgotICAgICAgICBfbG9nLmRlYnVnKCdSdW4gYWRiIHJlc3VsdDog JyArIHJlc3VsdFs6ODBdKQorICAgICAgICBzZWxmLl9sb2dfZGVidWcoJ1J1biBhZGIgcmVzdWx0 OiAnICsgcmVzdWx0Wzo4MF0pCiAgICAgICAgIHJldHVybiByZXN1bHQKIAogICAgIGRlZiBfbGlu a19kZXZpY2VfZmlsZShzZWxmLCBmcm9tX2ZpbGUsIHRvX2ZpbGUsIGlnbm9yZV9lcnJvcj1GYWxz ZSk6CkBAIC00MzQsNyArNDQ0LDcgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZl ci5Ecml2ZXIpOgogICAgIGRlZiBfZ2V0X2xhc3Rfc3RhY2t0cmFjZShzZWxmKToKICAgICAgICAg dG9tYnN0b25lcyA9IHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxsJywgJ2xzJywgJy1uJywg Jy9kYXRhL3RvbWJzdG9uZXMnXSkKICAgICAgICAgaWYgbm90IHRvbWJzdG9uZXMgb3IgdG9tYnN0 b25lcy5zdGFydHN3aXRoKCcvZGF0YS90b21ic3RvbmVzOiBObyBzdWNoIGZpbGUgb3IgZGlyZWN0 b3J5Jyk6Ci0gICAgICAgICAgICBfbG9nLmVycm9yKCdEUlQgY3Jhc2hlZCwgYnV0IG5vIHRvbWJz dG9uZSBmb3VuZCEnKQorICAgICAgICAgICAgc2VsZi5fbG9nX2Vycm9yKCdEUlQgY3Jhc2hlZCwg YnV0IG5vIHRvbWJzdG9uZSBmb3VuZCEnKQogICAgICAgICAgICAgcmV0dXJuICcnCiAgICAgICAg IHRvbWJzdG9uZXMgPSB0b21ic3RvbmVzLnJzdHJpcCgpLnNwbGl0KCdcbicpCiAgICAgICAgIGxh c3RfdG9tYnN0b25lID0gdG9tYnN0b25lc1swXS5zcGxpdCgpCkBAIC00NzksMTAgKzQ4OSwxMCBA QCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAgICAgZGVmIF9n ZXRfY3Jhc2hfbG9nKHNlbGYsIHN0ZG91dCwgc3RkZXJyLCBuZXdlcl90aGFuKToKICAgICAgICAg aWYgbm90IHN0ZG91dDoKICAgICAgICAgICAgIHN0ZG91dCA9ICcnCi0gICAgICAgIHN0ZG91dCAr PSAnKioqKioqKioqIExvZ2NhdDpcbicgKyBzZWxmLl9nZXRfbG9nY2F0KCkKKyAgICAgICAgc3Rk b3V0ICs9ICcqKioqKioqKiogWyVzXSBMb2djYXQ6XG4lcycgJSAoc2VsZi5fZGV2aWNlX3Nlcmlh bCwgc2VsZi5fZ2V0X2xvZ2NhdCgpKQogICAgICAgICBpZiBub3Qgc3RkZXJyOgogICAgICAgICAg ICAgc3RkZXJyID0gJycKLSAgICAgICAgc3RkZXJyICs9ICcqKioqKioqKiogVG9tYnN0b25lIGZp bGU6XG4nICsgc2VsZi5fZ2V0X2xhc3Rfc3RhY2t0cmFjZSgpCisgICAgICAgIHN0ZGVyciArPSAn KioqKioqKioqIFslc10gVG9tYnN0b25lIGZpbGU6XG4lcycgJSAoc2VsZi5fZGV2aWNlX3Nlcmlh bCwgc2VsZi5fZ2V0X2xhc3Rfc3RhY2t0cmFjZSgpKQogICAgICAgICByZXR1cm4gc3VwZXIoQ2hy b21pdW1BbmRyb2lkRHJpdmVyLCBzZWxmKS5fZ2V0X2NyYXNoX2xvZyhzdGRvdXQsIHN0ZGVyciwg bmV3ZXJfdGhhbikKIAogICAgIGRlZiBjbWRfbGluZShzZWxmLCBwaXhlbF90ZXN0cywgcGVyX3Rl c3RfYXJncyk6CkBAIC01NDMsMTUgKzU1MywxNSBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2 ZXIoZHJpdmVyLkRyaXZlcik6CiAgICAgICAgIGZvciByZXRyaWVzIGluIHJhbmdlKDMpOgogICAg ICAgICAgICAgaWYgc2VsZi5fc3RhcnRfb25jZShwaXhlbF90ZXN0cywgcGVyX3Rlc3RfYXJncyk6 CiAgICAgICAgICAgICAgICAgcmV0dXJuCi0gICAgICAgICAgICBfbG9nLmVycm9yKCdGYWlsZWQg dG8gc3RhcnQgRHVtcFJlbmRlclRyZWUgYXBwbGljYXRpb24uIFJldHJpZXM9JWQuIExvZzolcycg JSAocmV0cmllcywgc2VsZi5fZ2V0X2xvZ2NhdCgpKSkKKyAgICAgICAgICAgIHNlbGYuX2xvZ19l cnJvcignRmFpbGVkIHRvIHN0YXJ0IER1bXBSZW5kZXJUcmVlIGFwcGxpY2F0aW9uLiBSZXRyaWVz PSVkLiBMb2c6JXMnICUgKHJldHJpZXMsIHNlbGYuX2dldF9sb2djYXQoKSkpCiAgICAgICAgICAg ICBzZWxmLnN0b3AoKQogICAgICAgICAgICAgdGltZS5zbGVlcCgyKQotICAgICAgICByYWlzZSBB c3NlcnRpb25FcnJvcignRmFpbGVkIHRvIHN0YXJ0IER1bXBSZW5kZXJUcmVlIGFwcGxpY2F0aW9u IG11bHRpcGxlIHRpbWVzLiBHaXZlIHVwLicpCisgICAgICAgIHNlbGYuX2Fib3J0KCdGYWlsZWQg dG8gc3RhcnQgRHVtcFJlbmRlclRyZWUgYXBwbGljYXRpb24gbXVsdGlwbGUgdGltZXMuIEdpdmUg dXAuJykKIAogICAgIGRlZiBfc3RhcnRfb25jZShzZWxmLCBwaXhlbF90ZXN0cywgcGVyX3Rlc3Rf YXJncyk6CiAgICAgICAgIHN1cGVyKENocm9taXVtQW5kcm9pZERyaXZlciwgc2VsZikuX3N0YXJ0 KHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKQogCi0gICAgICAgIF9sb2cuZGVidWcoJ1N0YXJ0 aW5nIGZvcndhcmRlcicpCisgICAgICAgIHNlbGYuX2xvZ19kZWJ1ZygnU3RhcnRpbmcgZm9yd2Fy ZGVyJykKICAgICAgICAgc2VsZi5fZm9yd2FyZGVyX3Byb2Nlc3MgPSBzZWxmLl9wb3J0Ll9zZXJ2 ZXJfcHJvY2Vzc19jb25zdHJ1Y3RvcigKICAgICAgICAgICAgIHNlbGYuX3BvcnQsICdGb3J3YXJk ZXInLCBzZWxmLl9hZGJfY29tbWFuZCArIFsnc2hlbGwnLCAnJXMgLUQgJXMnICUgKERFVklDRV9G T1JXQVJERVJfUEFUSCwgRk9SV0FSRF9QT1JUUyldKQogICAgICAgICBzZWxmLl9mb3J3YXJkZXJf cHJvY2Vzcy5zdGFydCgpCkBAIC01NjAsNyArNTcwLDcgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lk RHJpdmVyKGRyaXZlci5Ecml2ZXIpOgogICAgICAgICBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydz aGVsbCcsICdlY2hvJ10gKyBzZWxmLl9jbWRfbGluZSArIFsnPicsIENPTU1BTkRfTElORV9GSUxF XSkKICAgICAgICAgc3RhcnRfcmVzdWx0ID0gc2VsZi5fcnVuX2FkYl9jb21tYW5kKFsnc2hlbGwn LCAnYW0nLCAnc3RhcnQnLCAnLWUnLCAnUnVuSW5TdWJUaHJlYWQnLCAnLW4nLCBEUlRfQUNUSVZJ VFlfRlVMTF9OQU1FXSkKICAgICAgICAgaWYgc3RhcnRfcmVzdWx0LmZpbmQoJ0V4Y2VwdGlvbicp ICE9IC0xOgotICAgICAgICAgICAgX2xvZy5lcnJvcignRmFpbGVkIHRvIHN0YXJ0IER1bXBSZW5k ZXJUcmVlIGFwcGxpY2F0aW9uLiBFeGNlcHRpb246XG4nICsgc3RhcnRfcmVzdWx0KQorICAgICAg ICAgICAgc2VsZi5fbG9nX2Vycm9yKCdGYWlsZWQgdG8gc3RhcnQgRHVtcFJlbmRlclRyZWUgYXBw bGljYXRpb24uIEV4Y2VwdGlvbjpcbicgKyBzdGFydF9yZXN1bHQpCiAgICAgICAgICAgICByZXR1 cm4gRmFsc2UKIAogICAgICAgICBpZiBub3QgQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9sb29wX3dp dGhfdGltZW91dChzZWxmLl9hbGxfcGlwZXNfY3JlYXRlZCwgRFJUX1NUQVJUX1NUT1BfVElNRU9V VF9TRUNTKToKQEAgLTU3MCwyMSArNTgwLDIxIEBAIGNsYXNzIENocm9taXVtQW5kcm9pZERyaXZl cihkcml2ZXIuRHJpdmVyKToKICAgICAgICAgZGVhZGxpbmUgPSB0aW1lLnRpbWUoKSArIERSVF9T VEFSVF9TVE9QX1RJTUVPVVRfU0VDUwogICAgICAgICBzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5zdGFy dCgpCiAgICAgICAgIHNlbGYuX3JlYWRfcHJvbXB0KGRlYWRsaW5lKQotICAgICAgICBfbG9nLmRl YnVnKCdJbnRlcmFjdGl2ZSBzaGVsbCBzdGFydGVkJykKKyAgICAgICAgc2VsZi5fbG9nX2RlYnVn KCdJbnRlcmFjdGl2ZSBzaGVsbCBzdGFydGVkJykKIAogICAgICAgICAjIFN0YXJ0IGEgcHJvY2Vz cyB0byByZWFkIGZyb20gdGhlIHN0ZG91dCBmaWZvIG9mIHRoZSBEdW1wUmVuZGVyVHJlZSBhcHAg YW5kIHByaW50IHRvIHN0ZG91dC4KLSAgICAgICAgX2xvZy5kZWJ1ZygnUmVkaXJlY3Rpbmcgc3Rk b3V0IHRvICcgKyBzZWxmLl9vdXRfZmlmb19wYXRoKQorICAgICAgICBzZWxmLl9sb2dfZGVidWco J1JlZGlyZWN0aW5nIHN0ZG91dCB0byAnICsgc2VsZi5fb3V0X2ZpZm9fcGF0aCkKICAgICAgICAg c2VsZi5fcmVhZF9zdGRvdXRfcHJvY2VzcyA9IHNlbGYuX3BvcnQuX3NlcnZlcl9wcm9jZXNzX2Nv bnN0cnVjdG9yKAogICAgICAgICAgICAgc2VsZi5fcG9ydCwgJ1JlYWRTdGRvdXQnLCBzZWxmLl9h ZGJfY29tbWFuZCArIFsnc2hlbGwnLCAnY2F0Jywgc2VsZi5fb3V0X2ZpZm9fcGF0aF0pCiAgICAg ICAgIHNlbGYuX3JlYWRfc3Rkb3V0X3Byb2Nlc3Muc3RhcnQoKQogCiAgICAgICAgICMgU3RhcnQg YSBwcm9jZXNzIHRvIHJlYWQgZnJvbSB0aGUgc3RkZXJyIGZpZm8gb2YgdGhlIER1bXBSZW5kZXJU cmVlIGFwcCBhbmQgcHJpbnQgdG8gc3Rkb3V0LgotICAgICAgICBfbG9nLmRlYnVnKCdSZWRpcmVj dGluZyBzdGRlcnIgdG8gJyArIHNlbGYuX2Vycl9maWZvX3BhdGgpCisgICAgICAgIHNlbGYuX2xv Z19kZWJ1ZygnUmVkaXJlY3Rpbmcgc3RkZXJyIHRvICcgKyBzZWxmLl9lcnJfZmlmb19wYXRoKQog ICAgICAgICBzZWxmLl9yZWFkX3N0ZGVycl9wcm9jZXNzID0gc2VsZi5fcG9ydC5fc2VydmVyX3By b2Nlc3NfY29uc3RydWN0b3IoCiAgICAgICAgICAgICBzZWxmLl9wb3J0LCAnUmVhZFN0ZGVycics IHNlbGYuX2FkYl9jb21tYW5kICsgWydzaGVsbCcsICdjYXQnLCBzZWxmLl9lcnJfZmlmb19wYXRo XSkKICAgICAgICAgc2VsZi5fcmVhZF9zdGRlcnJfcHJvY2Vzcy5zdGFydCgpCiAKLSAgICAgICAg X2xvZy5kZWJ1ZygnUmVkaXJlY3Rpbmcgc3RkaW4gdG8gJyArIHNlbGYuX2luX2ZpZm9fcGF0aCkK KyAgICAgICAgc2VsZi5fbG9nX2RlYnVnKCdSZWRpcmVjdGluZyBzdGRpbiB0byAnICsgc2VsZi5f aW5fZmlmb19wYXRoKQogICAgICAgICBzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy53cml0ZSgnY2F0ID4l c1xuJyAlIHNlbGYuX2luX2ZpZm9fcGF0aCkKIAogICAgICAgICAjIENvbWJpbmUgdGhlIHN0ZG91 dCBhbmQgc3RkZXJyIHBpcGVzIGludG8gc2VsZi5fc2VydmVyX3Byb2Nlc3MuCkBAIC01OTYsNyAr NjA2LDcgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIpOgogICAg ICAgICAgICAgICAgICMgcmVhZGluZy93cml0aW5nIHRoZSBmaWZvLiBLaWxsIHRoZSBmaWZvIHJl YWRpbmcvd3JpdGluZyBwcm9jZXNzZXMgdG8gbGV0IHRoZQogICAgICAgICAgICAgICAgICMgbWFp biB0aHJlYWQgZXNjYXBlIGZyb20gdGhlIGRlYWRsb2NrZWQgc3RhdGUuIEFmdGVyIHRoYXQsIHRo ZSBtYWluIHRocmVhZCB3aWxsCiAgICAgICAgICAgICAgICAgIyB0cmVhdCB0aGlzIGFzIGEgY3Jh c2guCi0gICAgICAgICAgICAgICAgX2xvZy53YXJuKCdEZWFkbG9jayBkZXRlY3RlZC4gUHJvY2Vz c2VzIGtpbGxlZC4nKQorICAgICAgICAgICAgICAgIHNlbGYuX2xvZ19lcnJvcignRGVhZGxvY2sg ZGV0ZWN0ZWQuIFByb2Nlc3NlcyBraWxsZWQuJykKICAgICAgICAgICAgICAgICBmb3IgaSBpbiBw cm9jZXNzZXM6CiAgICAgICAgICAgICAgICAgICAgIGkua2lsbCgpCiAKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZF91 bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fYW5kcm9pZF91bml0dGVzdC5weQppbmRleCBjNzk1NDZiYjhjNzhjOGJlZTlkMTczZjMy NDVkMjRiNTA1MGRkMjhkLi5kMjAwYWNjNWI5MzM5ZjBmNzBlZWU3NjYzMTdlNTU5MjIwOGRlZGJl IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2No cm9taXVtX2FuZHJvaWRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkX3VuaXR0ZXN0LnB5CkBAIC0xOTQsMTgg KzE5NCwxOCBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXJUZXN0KHVuaXR0ZXN0LlRlc3RD YXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5kcml2ZXIuX2dldF9jcmFzaF9s b2coJ291dCBiYXJcbm91dCBiYXpcbicsICdlcnIgYmFyXG5lcnIgYmF6XG4nLCBuZXdlcl90aGFu PU5vbmUpLAogICAgICAgICAgICAgKCdlcnIgYmFyXG4nCiAgICAgICAgICAgICAgJ2VyciBiYXpc bicKLSAgICAgICAgICAgICAnKioqKioqKioqIFRvbWJzdG9uZSBmaWxlOlxuJworICAgICAgICAg ICAgICcqKioqKioqKiogWzEyMzQ1Njc4OUFCQ0RFRjBdIFRvbWJzdG9uZSBmaWxlOlxuJwogICAg ICAgICAgICAgICctcnctLS0tLS0tIDEwMDAgMTAwMCA0NTMxNiAyMDEyLTA0LTI3IDE2OjMzIHRv bWJzdG9uZV8wM1xuJwogICAgICAgICAgICAgICcvZGF0YS90b21ic3RvbmVzL3RvbWJzdG9uZV8w M1xuJwogICAgICAgICAgICAgICdtb2NrX2NvbnRlbnRzXG4nLAogICAgICAgICAgICAgIHUnY3Jh c2ggbG9nIGZvciBmb28gKHBpZCAxMjM0KTpcbicKICAgICAgICAgICAgICB1J1NURE9VVDogb3V0 IGJhclxuJwogICAgICAgICAgICAgIHUnU1RET1VUOiBvdXQgYmF6XG4nCi0gICAgICAgICAgICAg dSdTVERPVVQ6ICoqKioqKioqKiBMb2djYXQ6XG4nCisgICAgICAgICAgICAgdSdTVERPVVQ6ICoq KioqKioqKiBbMTIzNDU2Nzg5QUJDREVGMF0gTG9nY2F0OlxuJwogICAgICAgICAgICAgIHUnU1RE T1VUOiBsb2djYXQgY29udGVudHNcbicKICAgICAgICAgICAgICB1J1NUREVSUjogZXJyIGJhclxu JwogICAgICAgICAgICAgIHUnU1RERVJSOiBlcnIgYmF6XG4nCi0gICAgICAgICAgICAgdSdTVERF UlI6ICoqKioqKioqKiBUb21ic3RvbmUgZmlsZTpcbicKKyAgICAgICAgICAgICB1J1NUREVSUjog KioqKioqKioqIFsxMjM0NTY3ODlBQkNERUYwXSBUb21ic3RvbmUgZmlsZTpcbicKICAgICAgICAg ICAgICB1J1NUREVSUjogLXJ3LS0tLS0tLSAxMDAwIDEwMDAgNDUzMTYgMjAxMi0wNC0yNyAxNjoz MyB0b21ic3RvbmVfMDNcbicKICAgICAgICAgICAgICB1J1NUREVSUjogL2RhdGEvdG9tYnN0b25l cy90b21ic3RvbmVfMDNcbicKICAgICAgICAgICAgICB1J1NUREVSUjogbW9ja19jb250ZW50c1xu JykpCkBAIC0yMTMsMTQgKzIxMywxNCBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXJUZXN0 KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5kcml2ZXIuX2NyYXNoZWRfcHJvY2Vz c19uYW1lID0gTm9uZQogICAgICAgICBzZWxmLmRyaXZlci5fY3Jhc2hlZF9waWQgPSBOb25lCiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYuZHJpdmVyLl9nZXRfY3Jhc2hfbG9nKE5vbmUs IE5vbmUsIG5ld2VyX3RoYW49Tm9uZSksCi0gICAgICAgICAgICAoJyoqKioqKioqKiBUb21ic3Rv bmUgZmlsZTpcbicKKyAgICAgICAgICAgICgnKioqKioqKioqIFsxMjM0NTY3ODlBQkNERUYwXSBU b21ic3RvbmUgZmlsZTpcbicKICAgICAgICAgICAgICAnLXJ3LS0tLS0tLSAxMDAwIDEwMDAgNDUz MTYgMjAxMi0wNC0yNyAxNjozMyB0b21ic3RvbmVfMDNcbicKICAgICAgICAgICAgICAnL2RhdGEv dG9tYnN0b25lcy90b21ic3RvbmVfMDNcbicKICAgICAgICAgICAgICAnbW9ja19jb250ZW50c1xu JywKICAgICAgICAgICAgICB1J2NyYXNoIGxvZyBmb3IgPHVua25vd24gcHJvY2VzcyBuYW1lPiAo cGlkIDx1bmtub3duPik6XG4nCi0gICAgICAgICAgICAgdSdTVERPVVQ6ICoqKioqKioqKiBMb2dj YXQ6XG4nCisgICAgICAgICAgICAgdSdTVERPVVQ6ICoqKioqKioqKiBbMTIzNDU2Nzg5QUJDREVG MF0gTG9nY2F0OlxuJwogICAgICAgICAgICAgIHUnU1RET1VUOiBsb2djYXQgY29udGVudHNcbicK LSAgICAgICAgICAgICB1J1NUREVSUjogKioqKioqKioqIFRvbWJzdG9uZSBmaWxlOlxuJworICAg ICAgICAgICAgIHUnU1RERVJSOiAqKioqKioqKiogWzEyMzQ1Njc4OUFCQ0RFRjBdIFRvbWJzdG9u ZSBmaWxlOlxuJwogICAgICAgICAgICAgIHUnU1RERVJSOiAtcnctLS0tLS0tIDEwMDAgMTAwMCA0 NTMxNiAyMDEyLTA0LTI3IDE2OjMzIHRvbWJzdG9uZV8wM1xuJwogICAgICAgICAgICAgIHUnU1RE RVJSOiAvZGF0YS90b21ic3RvbmVzL3RvbWJzdG9uZV8wM1xuJwogICAgICAgICAgICAgIHUnU1RE RVJSOiBtb2NrX2NvbnRlbnRzXG4nKSkK