91910 2012-07-20 16:30:33 -0700 [Chromium-Android] Store test executable, data and fonts in /data/local/tmp 2012-08-06 11:29:52 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Android Unspecified RESOLVED FIXED P2 Normal --- 91872 1 wangxianzhu wangxianzhu abarth dpranke ojan peter webkit.review.bot oldest_to_newest 675065 0 wangxianzhu 2012-07-20 16:30:33 -0700 Similar to bug 91909, but storing the data and fonts in /data/local/tmp need modify both the script and C++ code (Chromium and WebKit). 687299 1 156491 wangxianzhu 2012-08-03 17:50:28 -0700 Created attachment 156491 Patch 688192 2 156705 wangxianzhu 2012-08-06 09:26:58 -0700 Created attachment 156705 rebased for landing 688215 3 156705 wangxianzhu 2012-08-06 09:43:32 -0700 Comment on attachment 156705 rebased for landing Just found the mode 0666 doesn't work as expected. 688225 4 156714 wangxianzhu 2012-08-06 09:56:11 -0700 Created attachment 156714 for landing 688302 5 156714 webkit.review.bot 2012-08-06 11:29:47 -0700 Comment on attachment 156714 for landing Clearing flags on attachment: 156714 Committed r124788: <http://trac.webkit.org/changeset/124788> 688303 6 webkit.review.bot 2012-08-06 11:29:52 -0700 All reviewed patches have been landed. Closing bug. 156491 2012-08-03 17:50:28 -0700 2012-08-06 09:26:55 -0700 Patch bug-91910-20120803175007.patch text/plain 10085 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NjIzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmQxYzBmMzFiMjBkNDZkN2UzMjY5NWQ4YTlkNWVmYThh MGQ2ZWFlMy4uODZhZDU3M2U1NmQzM2NiNDFjNzg3M2Q0MjQ3Yjk5NDZmOThkNjFjMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDEyLTA4LTAzICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFN0b3JlIHRlc3QgZXhlY3V0YWJsZSwgZGF0 YSBhbmQgZm9udHMgaW4gL2RhdGEvbG9jYWwvdG1wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTkxMAorCisgICAgICAgIC9kYXRhL2xvY2FsL3RtcCBp cyBhIGRpcmVjdG9yeSB3aXRoIHBlcm1pc3Npb24gMDc3NyBieSBkZWZhdWx0LgorICAgICAgICBQ bGFjZSBEdW1wUmVuZGVyVHJlZSByZXNvdXJjZXMgaGVyZSBzbyB0aGF0IGJvdGggdGhlIG5hdGl2 ZSB0ZXN0IGFwcCBhbmQKKyAgICAgICAgdGhlIE5SV1Qgc2NyaXB0IGNhbiBhY2Nlc3MgdGhlbSBl dmVuIGlmIGFkYiBzaGVsbCBpc24ndCBydW5uaW5nIGFzIHJvb3QuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9UZXN0U2hlbGxBbmRyb2lkLmNwcDoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHk6CisgICAgICAgIChDaHJvbWl1bUFuZHJv aWRQb3J0LmRyaXZlcl9jbWRfbGluZSk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXIu X19pbml0X18pOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9zZXR1cF90ZXN0KToK KyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fcHVzaF9leGVjdXRhYmxlKToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWRf dW5pdHRlc3QucHk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWRQb3J0VGVzdC5tYWtlX3BvcnQp OgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkUG9ydFRlc3QudGVzdF9leHBlY3RhdGlvbnNfZmls ZXMpOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyVGVzdC50ZXN0X2RydF9jbWRfbGlu ZSk6CisKIDIwMTItMDgtMDMgIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMjQ1NjcuCmRpZmYgLS1naXQgYS9U b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGxBbmRyb2lkLmNwcCBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbEFuZHJvaWQuY3BwCmluZGV4IDVmMDRm ZmY1YjFiZWY4ZDY5ZjY3MDkxOTI4OWNkNjk3MDI1MTJjOTQuLjgxZTZmZmI0N2NiZWZmMmQyOGRj YTdlOWJlNThhMjZiYzU0MDhlNzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1Rlc3RTaGVsbEFuZHJvaWQuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL1Rlc3RTaGVsbEFuZHJvaWQuY3BwCkBAIC00NCw5ICs0NCwxMiBAQAogCiBuYW1lc3Bh Y2UgewogCi1jb25zdCBjaGFyIGZvbnRNYWluQ29uZmlnRmlsZVtdID0gIi9kYXRhL2RydC9hbmRy b2lkX21haW5fZm9udHMueG1sIjsKLWNvbnN0IGNoYXIgZm9udEZhbGxiYWNrQ29uZmlnRmlsZVtd ID0gIi9kYXRhL2RydC9hbmRyb2lkX2ZhbGxiYWNrX2ZvbnRzLnhtbCI7Ci1jb25zdCBjaGFyIGZv bnRzRGlyW10gPSAiL2RhdGEvZHJ0L2ZvbnRzLyI7CisvLyBNdXN0IGJlIHNhbWUgYXMgREVWSUNF X0RSVF9ESVIgaW4gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV9hbmRyb2lkLnB5LgorI2RlZmluZSBERVZJQ0VfRFJUX0RJUiAiL2RhdGEvbG9jYWwvdG1w L2RydC8iCisKK2NvbnN0IGNoYXIgZm9udE1haW5Db25maWdGaWxlW10gPSBERVZJQ0VfRFJUX0RJ UiAiYW5kcm9pZF9tYWluX2ZvbnRzLnhtbCI7Citjb25zdCBjaGFyIGZvbnRGYWxsYmFja0NvbmZp Z0ZpbGVbXSA9IERFVklDRV9EUlRfRElSICJhbmRyb2lkX2ZhbGxiYWNrX2ZvbnRzLnhtbCI7Citj b25zdCBjaGFyIGZvbnRzRGlyW10gPSBERVZJQ0VfRFJUX0RJUiAiZm9udHMvIjsKIAogY29uc3Qg Y2hhciBvcHRpb25JbkZJRk9bXSA9ICItLWluLWZpZm89IjsKIGNvbnN0IGNoYXIgb3B0aW9uT3V0 RklGT1tdID0gIi0tb3V0LWZpZm89IjsKQEAgLTcyLDcgKzc1LDggQEAgdm9pZCByZW1vdmVBcmco aW50IGluZGV4LCBpbnQqIGFyZ2MsIGNoYXIqKiogYXJndikKIHZvaWQgY3JlYXRlRklGTyhjb25z dCBjaGFyKiBmaWZvUGF0aCkKIHsKICAgICB1bmxpbmsoZmlmb1BhdGgpOwotICAgIGlmIChta2Zp Zm8oZmlmb1BhdGgsIDA2MDApKSB7CisgICAgLy8gMDY2NiBpcyBydy1ydy1ydy0sIHRvIGFsbG93 IGFkYiBzaGVsbCB0byByZWFkL3dyaXRlIHRoZSBmaWZvLgorICAgIGlmIChta2ZpZm8oZmlmb1Bh dGgsIDA2NjYpKSB7CiAgICAgICAgIGFuZHJvaWRMb2dFcnJvcigiRmFpbGVkIHRvIGNyZWF0ZSBm aWZvICVzOiAlc1xuIiwgZmlmb1BhdGgsIHN0cmVycm9yKGVycm5vKSk7CiAgICAgICAgIGV4aXQo RVhJVF9GQUlMVVJFKTsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKaW5kZXggNGY0Zjlk M2RlMzNjMWU5ODAwMTNkZTM2ODRmYzZkNWRlOTdhOTA5Mi4uNDNiZDJiMmU2NWQwZmQ4MDBkYTU2 NTkyZmI0ZmM3NWEwMGEzZTVjOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQpAQCAtNDQsMjEg KzQ0LDIwIEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogIyBUaGUgcm9v dCBkaXJlY3RvcnkgZm9yIHRlc3QgcmVzb3VyY2VzLCB3aGljaCBoYXMgdGhlIHNhbWUgc3RydWN0 dXJlIGFzIHRoZQogIyBzb3VyY2Ugcm9vdCBkaXJlY3Rvcnkgb2YgQ2hyb21pdW0uCi0jIFRoaXMg cGF0aCBpcyBkZWZpbmVkIGluIGJhc2UvYmFzZV9wYXRoc19hbmRyb2lkLmNjIGFuZAotIyB3ZWJr aXQvc3VwcG9ydC9wbGF0Zm9ybV9zdXBwb3J0X2FuZHJvaWQuY2MuCisjIFRoaXMgcGF0aCBpcyBk ZWZpbmVkIGluIENocm9taXVtJ3MgYmFzZS90ZXN0L3Rlc3Rfc3VwcG9ydF9hbmRyb2lkLmNjLgog REVWSUNFX1NPVVJDRV9ST09UX0RJUiA9ICcvZGF0YS9sb2NhbC90bXAvJwogQ09NTUFORF9MSU5F X0ZJTEUgPSBERVZJQ0VfU09VUkNFX1JPT1RfRElSICsgJ2Nocm9tZS1uYXRpdmUtdGVzdHMtY29t bWFuZC1saW5lJwogCiAjIFRoZSBkaXJlY3RvcnkgdG8gcHV0IHRvb2xzIGFuZCByZXNvdXJjZXMg b2YgRHVtcFJlbmRlclRyZWUuCi1ERVZJQ0VfRFJUX0RJUiA9ICcvZGF0YS9kcnQvJworIyBJZiBj aGFuZ2UgdGhpcywgbXVzdCBhbHNvIGNoYW5nZSBUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9UZXN0U2hlbGxBbmRyb2lkLmNwcAorIyBhbmQgQ2hyb21pdW0ncyB3ZWJraXQvc3VwcG9ydC9w bGF0Zm9ybV9zdXBwb3J0X2FuZHJvaWQuY2MuCitERVZJQ0VfRFJUX0RJUiA9IERFVklDRV9TT1VS Q0VfUk9PVF9ESVIgKyAnZHJ0LycKIERFVklDRV9GT1JXQVJERVJfUEFUSCA9IERFVklDRV9EUlRf RElSICsgJ2ZvcndhcmRlcicKIERFVklDRV9EUlRfU1RBTVBfUEFUSCA9IERFVklDRV9EUlRfRElS ICsgJ0R1bXBSZW5kZXJUcmVlLnN0YW1wJwogCiBEUlRfQVBQX1BBQ0tBR0UgPSAnb3JnLmNocm9t aXVtLm5hdGl2ZV90ZXN0JwogRFJUX0FDVElWSVRZX0ZVTExfTkFNRSA9IERSVF9BUFBfUEFDS0FH RSArICcvLkNocm9tZU5hdGl2ZVRlc3RBY3Rpdml0eScKLURSVF9BUFBfRElSID0gJy9kYXRhL3Vz ZXIvMC8nICsgRFJUX0FQUF9QQUNLQUdFICsgJy8nCi1EUlRfQVBQX0ZJTEVTX0RJUiA9IERFVklD RV9TT1VSQ0VfUk9PVF9ESVIKLURSVF9BUFBfQ0FDSEVfRElSID0gRFJUX0FQUF9ESVIgKyAnY2Fj aGUvJworRFJUX0FQUF9DQUNIRV9ESVIgPSBERVZJQ0VfRFJUX0RJUiArICdjYWNoZS8nCiAKICMg VGhpcyBvbmx5IHdvcmtzIGZvciBzaW5nbGUgY29yZSBkZXZpY2VzIHNvIGZhci4KICMgRklYTUU6 IEZpbmQgYSBzb2x1dGlvbiBmb3IgbXVsdGktY29yZSBkZXZpY2VzLgpAQCAtMjQxLDYgKzI0MCwx MCBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWRQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAg ICAgICAgICMgU2VlIGNvbW1lbnRzIGluIENocm9taXVtQW5kcm9pZERyaXZlci5zdGFydCgpLgog ICAgICAgICByZXR1cm4gQ2hyb21pdW1BbmRyb2lkRHJpdmVyKHNlbGYsIHdvcmtlcl9udW1iZXIs IHBpeGVsX3Rlc3RzPXNlbGYuZ2V0X29wdGlvbigncGl4ZWxfdGVzdHMnKSwgbm9fdGltZW91dD1u b190aW1lb3V0KQogCisgICAgZGVmIGRyaXZlcl9jbWRfbGluZShzZWxmKToKKyAgICAgICAgIyBP dmVycmlkZSB0byByZXR1cm4gdGhlIGFjdHVhbCBEdW1wUmVuZGVyVHJlZSBjb21tYW5kIGxpbmUu CisgICAgICAgIHJldHVybiBzZWxmLmNyZWF0ZV9kcml2ZXIoMCkuX2RydF9jbWRfbGluZShzZWxm LmdldF9vcHRpb24oJ3BpeGVsX3Rlc3RzJyksIFtdKQorCiAgICAgIyBPdmVycmlkZGVuIHByaXZh dGUgZnVuY3Rpb25zLgogCiAgICAgZGVmIF9idWlsZF9wYXRoKHNlbGYsICpjb21wcyk6CkBAIC0z MDcsOSArMzEwLDkgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIp OgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCB3b3JrZXJfbnVtYmVyLCBwaXhlbF90ZXN0 cywgbm9fdGltZW91dD1GYWxzZSk6CiAgICAgICAgIHN1cGVyKENocm9taXVtQW5kcm9pZERyaXZl ciwgc2VsZikuX19pbml0X18ocG9ydCwgd29ya2VyX251bWJlciwgcGl4ZWxfdGVzdHMsIG5vX3Rp bWVvdXQpCiAgICAgICAgIHNlbGYuX3BpeGVsX3Rlc3RzID0gcGl4ZWxfdGVzdHMKLSAgICAgICAg c2VsZi5faW5fZmlmb19wYXRoID0gRFJUX0FQUF9GSUxFU19ESVIgKyAnRHVtcFJlbmRlclRyZWUu aW4nCi0gICAgICAgIHNlbGYuX291dF9maWZvX3BhdGggPSBEUlRfQVBQX0ZJTEVTX0RJUiArICdE dW1wUmVuZGVyVHJlZS5vdXQnCi0gICAgICAgIHNlbGYuX2Vycl9maWZvX3BhdGggPSBEUlRfQVBQ X0ZJTEVTX0RJUiArICdEdW1wUmVuZGVyVHJlZS5lcnInCisgICAgICAgIHNlbGYuX2luX2ZpZm9f cGF0aCA9IERFVklDRV9EUlRfRElSICsgJ0R1bXBSZW5kZXJUcmVlLmluJworICAgICAgICBzZWxm Ll9vdXRfZmlmb19wYXRoID0gREVWSUNFX0RSVF9ESVIgKyAnRHVtcFJlbmRlclRyZWUub3V0Jwor ICAgICAgICBzZWxmLl9lcnJfZmlmb19wYXRoID0gREVWSUNFX0RSVF9ESVIgKyAnRHVtcFJlbmRl clRyZWUuZXJyJwogICAgICAgICBzZWxmLl9yZWFkX3N0ZG91dF9wcm9jZXNzID0gTm9uZQogICAg ICAgICBzZWxmLl9yZWFkX3N0ZGVycl9wcm9jZXNzID0gTm9uZQogICAgICAgICBzZWxmLl9mb3J3 YXJkZXJfcHJvY2VzcyA9IE5vbmUKQEAgLTMzMSw5ICszMzQsMTEgQEAgY2xhc3MgQ2hyb21pdW1B bmRyb2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIpOgogICAgICAgICAjIFJlcXVpcmVkIGJ5IHdlYmtp dF9zdXBwb3J0OjpHZXRXZWJLaXRSb290RGlyRmlsZVBhdGgoKS4KICAgICAgICAgIyBPdGhlciBk aXJlY3RvcmllcyB3aWxsIGJlIGNyZWF0ZWQgYXV0b21hdGljYWxseSBieSBhZGIgcHVzaC4KICAg ICAgICAgc2VsZi5fcnVuX2FkYl9jb21tYW5kKFsnc2hlbGwnLCAnbWtkaXInLCAnLXAnLCBERVZJ Q0VfU09VUkNFX1JPT1RfRElSICsgJ2Nocm9tZSddKQorCiAgICAgICAgICMgQWxsb3cgdGhlIER1 bXBSZW5kZXJUcmVlIGFwcCB0byBmdWxseSBhY2Nlc3MgdGhlIGRpcmVjdG9yeS4KLSAgICAgICAg IyBUaGUgbmF0aXZlIGNvZGUgbmVlZHMgdGhlIHBlcm1pc3Npb24gdG8gd3JpdGUgdGVtcG9yYXJ5 IGZpbGVzIGhlcmUuCi0gICAgICAgIHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxsJywgJ2No bW9kJywgJzc3NycsIERFVklDRV9TT1VSQ0VfUk9PVF9ESVJdKQorICAgICAgICAjIFRoZSBuYXRp dmUgY29kZSBuZWVkcyB0aGUgcGVybWlzc2lvbiB0byB3cml0ZSB0ZW1wb3JhcnkgZmlsZXMgYW5k IGNyZWF0ZSBwaXBlcyBoZXJlLgorICAgICAgICBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydzaGVs bCcsICdta2RpcicsICctcCcsIERFVklDRV9EUlRfRElSXSkKKyAgICAgICAgc2VsZi5fcnVuX2Fk Yl9jb21tYW5kKFsnc2hlbGwnLCAnY2htb2QnLCAnNzc3JywgREVWSUNFX0RSVF9ESVJdKQogCiAg ICAgICAgIHNlbGYuX3B1c2hfZXhlY3V0YWJsZSgpCiAgICAgICAgIHNlbGYuX3B1c2hfZm9udHMo KQpAQCAtMzU5LDYgKzM2NCwxMCBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVy LkRyaXZlcik6CiAgICAgICAgICAgICAgICAgcmFpc2UgQXNzZXJ0aW9uRXJyb3IoJ0ZhaWxlZCB0 byBpbnN0YWxsICVzIG9udG8gZGV2aWNlOiAlcycgJSAoZHJ0X2hvc3RfcGF0aCwgaW5zdGFsbF9y ZXN1bHQpKQogICAgICAgICAgICAgc2VsZi5fcHVzaF90b19kZXZpY2Uoc2VsZi5fcG9ydC5fYnVp bGRfcGF0aCgnRHVtcFJlbmRlclRyZWUucGFrJyksIERFVklDRV9EUlRfRElSICsgJ0R1bXBSZW5k ZXJUcmVlLnBhaycpCiAgICAgICAgICAgICBzZWxmLl9wdXNoX3RvX2RldmljZShzZWxmLl9wb3J0 Ll9idWlsZF9wYXRoKCdEdW1wUmVuZGVyVHJlZV9yZXNvdXJjZXMnKSwgREVWSUNFX0RSVF9ESVIg KyAnRHVtcFJlbmRlclRyZWVfcmVzb3VyY2VzJykKKyAgICAgICAgICAgICMgRklYTUU6IFRlbXBv cmFyaWx5IHB1c2ggcGFrIGFuZCByZXNvdXJjZXMgdW5kZXIgdGhlIG9yaWdpbmFsIC9kYXRhL2Ry dC8gZGlyZWN0b3J5LgorICAgICAgICAgICAgIyBSZW1vdmUgdGhlIGZvbGxvd2luZyB0d28gbGlu ZXMgYWZ0ZXIgbGFuZGluZyB0aGUgY2hyb21pdW0gc2lkZSBvZiBjaGFuZ2UuCisgICAgICAgICAg ICBzZWxmLl9wdXNoX3RvX2RldmljZShzZWxmLl9wb3J0Ll9idWlsZF9wYXRoKCdEdW1wUmVuZGVy VHJlZS5wYWsnKSwgJy9kYXRhL2RydC9EdW1wUmVuZGVyVHJlZS5wYWsnKQorICAgICAgICAgICAg c2VsZi5fcHVzaF90b19kZXZpY2Uoc2VsZi5fcG9ydC5fYnVpbGRfcGF0aCgnRHVtcFJlbmRlclRy ZWVfcmVzb3VyY2VzJyksICcvZGF0YS9kcnQvRHVtcFJlbmRlclRyZWVfcmVzb3VyY2VzJykKICAg ICAgICAgICAgIHNlbGYuX3B1c2hfdG9fZGV2aWNlKHNlbGYuX3BvcnQuX2J1aWxkX3BhdGgoJ2Fu ZHJvaWRfbWFpbl9mb250cy54bWwnKSwgREVWSUNFX0RSVF9ESVIgKyAnYW5kcm9pZF9tYWluX2Zv bnRzLnhtbCcpCiAgICAgICAgICAgICBzZWxmLl9wdXNoX3RvX2RldmljZShzZWxmLl9wb3J0Ll9i dWlsZF9wYXRoKCdhbmRyb2lkX2ZhbGxiYWNrX2ZvbnRzLnhtbCcpLCBERVZJQ0VfRFJUX0RJUiAr ICdhbmRyb2lkX2ZhbGxiYWNrX2ZvbnRzLnhtbCcpCiAgICAgICAgICAgICAjIFZlcnNpb24gY29u dHJvbCBvZiB0ZXN0IHJlc291cmNlcyBpcyBkZXBlbmRlbnQgb24gZXhlY3V0YWJsZXMsCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVt X2FuZHJvaWRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtX2FuZHJvaWRfdW5pdHRlc3QucHkKaW5kZXggNGYzMzFlNDVjYmQ1YmI3 Zjg3MDVlMDQwM2FhYjNkOWQ3ZjA5OWJhYi4uYzliNjkxOTJjYmNiMjUzYWM3MWY5MjRiMDJhOTA3 YWEzMmMyNzhmMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZF91bml0dGVzdC5weQpA QCAtMTEyLDYgKzExMiw3IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZFBvcnRUZXN0KGNocm9taXVt X3BvcnRfdGVzdGNhc2UuQ2hyb21pdW1Qb3J0VGVzdENhc2UpOgogICAgIGRlZiBtYWtlX3BvcnQo c2VsZiwgKiprd2FyZ3MpOgogICAgICAgICBwb3J0ID0gc3VwZXIoQ2hyb21pdW1BbmRyb2lkUG9y dFRlc3QsIHNlbGYpLm1ha2VfcG9ydCgqKmt3YXJncykKICAgICAgICAgc2VsZi5tb2NrX3J1bl9j b21tYW5kID0gTW9ja1J1bkNvbW1hbmQoKQorICAgICAgICBzZWxmLm1vY2tfcnVuX2NvbW1hbmQu bW9ja19vbmVfZGV2aWNlKCkKICAgICAgICAgcG9ydC5fZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2 ZTIocnVuX2NvbW1hbmRfZm49c2VsZi5tb2NrX3J1bl9jb21tYW5kLm1vY2tfcnVuX2NvbW1hbmRf Zm4pCiAgICAgICAgIHJldHVybiBwb3J0CiAKQEAgLTEyOCwxMCArMTI5LDYgQEAgY2xhc3MgQ2hy b21pdW1BbmRyb2lkUG9ydFRlc3QoY2hyb21pdW1fcG9ydF90ZXN0Y2FzZS5DaHJvbWl1bVBvcnRU ZXN0Q2FzZSk6CiAgICAgICAgICMgdXNpbmcgYSBjdXN0b20gZXhwZWN0YXRpb25zIGZpbGUuCiAg ICAgICAgIHBhc3MKIAotICAgIGRlZiB0ZXN0X2RyaXZlcl9jbWRfbGluZShzZWxmKToKLSAgICAg ICAgIyBPdmVycmlkaW5nIFBvcnRUZXN0Q2FzZS50ZXN0X2NtZF9saW5lKCkuIFVzZSBDaHJvbWl1 bUFuZHJvaWREcml2ZXJUZXN0LnRlc3RfY21kX2xpbmUoKSBpbnN0ZWFkLgotICAgICAgICByZXR1 cm4KLQogICAgIGRlZiB0ZXN0X2dldF9kZXZpY2VzX25vX2RldmljZShzZWxmKToKICAgICAgICAg cG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKICAgICAgICAgc2VsZi5tb2NrX3J1bl9jb21tYW5kLm1v Y2tfbm9fZGV2aWNlKCkKQEAgLTIzNSw5ICsyMzIsOSBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWRE cml2ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9kcnRfY21kX2xpbmUo c2VsZik6CiAgICAgICAgIGNtZF9saW5lID0gc2VsZi5kcml2ZXIuX2RydF9jbWRfbGluZShUcnVl LCBbJy0tYSddKQogICAgICAgICBzZWxmLmFzc2VydFRydWUoJy0tYScgaW4gY21kX2xpbmUpCi0g ICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnLS1pbi1maWZvPScgKyBjaHJvbWl1bV9hbmRyb2lkLkRS VF9BUFBfRklMRVNfRElSICsgJ0R1bXBSZW5kZXJUcmVlLmluJyBpbiBjbWRfbGluZSkKLSAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKCctLW91dC1maWZvPScgKyBjaHJvbWl1bV9hbmRyb2lkLkRSVF9B UFBfRklMRVNfRElSICsgJ0R1bXBSZW5kZXJUcmVlLm91dCcgaW4gY21kX2xpbmUpCi0gICAgICAg IHNlbGYuYXNzZXJ0VHJ1ZSgnLS1lcnItZmlmbz0nICsgY2hyb21pdW1fYW5kcm9pZC5EUlRfQVBQ X0ZJTEVTX0RJUiArICdEdW1wUmVuZGVyVHJlZS5lcnInIGluIGNtZF9saW5lKQorICAgICAgICBz ZWxmLmFzc2VydFRydWUoJy0taW4tZmlmbz0nICsgY2hyb21pdW1fYW5kcm9pZC5ERVZJQ0VfRFJU X0RJUiArICdEdW1wUmVuZGVyVHJlZS5pbicgaW4gY21kX2xpbmUpCisgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZSgnLS1vdXQtZmlmbz0nICsgY2hyb21pdW1fYW5kcm9pZC5ERVZJQ0VfRFJUX0RJUiAr ICdEdW1wUmVuZGVyVHJlZS5vdXQnIGluIGNtZF9saW5lKQorICAgICAgICBzZWxmLmFzc2VydFRy dWUoJy0tZXJyLWZpZm89JyArIGNocm9taXVtX2FuZHJvaWQuREVWSUNFX0RSVF9ESVIgKyAnRHVt cFJlbmRlclRyZWUuZXJyJyBpbiBjbWRfbGluZSkKIAogICAgIGRlZiB0ZXN0X3JlYWRfcHJvbXB0 KHNlbGYpOgogICAgICAgICBzZWxmLmRyaXZlci5fc2VydmVyX3Byb2Nlc3MgPSBkcml2ZXJfdW5p dHRlc3QuTW9ja1NlcnZlclByb2Nlc3MobGluZXM9Wydyb290QGFuZHJvaWQ6LyAjICddKQo= 156705 2012-08-06 09:26:58 -0700 2012-08-06 09:56:09 -0700 rebased for landing bug-91910-20120806092634.patch text/plain 10094 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0Nzc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmRiZTY1M2ZiMThmNWQwYzY5MTE0OTk2ZTE2MTFmYjZh ZTQxNDQ1YS4uODEzM2ZkYTdiZGY1NWQyZGMzODFjMjg1MjI5MTAzYmVmMzEzMGQ3YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDEyLTA4LTAzICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFN0b3JlIHRlc3QgZXhlY3V0YWJsZSwgZGF0 YSBhbmQgZm9udHMgaW4gL2RhdGEvbG9jYWwvdG1wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTkxMAorCisgICAgICAgIC9kYXRhL2xvY2FsL3RtcCBp cyBhIGRpcmVjdG9yeSB3aXRoIHBlcm1pc3Npb24gMDc3NyBieSBkZWZhdWx0LgorICAgICAgICBQ bGFjZSBEdW1wUmVuZGVyVHJlZSByZXNvdXJjZXMgaGVyZSBzbyB0aGF0IGJvdGggdGhlIG5hdGl2 ZSB0ZXN0IGFwcCBhbmQKKyAgICAgICAgdGhlIE5SV1Qgc2NyaXB0IGNhbiBhY2Nlc3MgdGhlbSBl dmVuIGlmIGFkYiBzaGVsbCBpc24ndCBydW5uaW5nIGFzIHJvb3QuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rl c3RTaGVsbEFuZHJvaWQuY3BwOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZFBv cnQuZHJpdmVyX2NtZF9saW5lKToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fX2lu aXRfXyk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXIuX3NldHVwX3Rlc3QpOgorICAg ICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9wdXNoX2V4ZWN1dGFibGUpOgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZF91bml0 dGVzdC5weToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZFBvcnRUZXN0Lm1ha2VfcG9ydCk6Cisg ICAgICAgIChDaHJvbWl1bUFuZHJvaWRQb3J0VGVzdC50ZXN0X2V4cGVjdGF0aW9uc19maWxlcyk6 CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXJUZXN0LnRlc3RfZHJ0X2NtZF9saW5lKToK KwogMjAxMi0wOC0wNiAgQmFsYXpzIEtlbGVtZW4gIDxrYmFsYXpzQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgV1RSIHNob3VsZCBiZSBhYmxlIHRvIGxvYWQgZXh0ZXJuYWwgcmVzb3VyY2VzCmRpZmYg LS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGxBbmRyb2lkLmNw cCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbEFuZHJvaWQuY3BwCmlu ZGV4IDVmMDRmZmY1YjFiZWY4ZDY5ZjY3MDkxOTI4OWNkNjk3MDI1MTJjOTQuLjgxZTZmZmI0N2Ni ZWZmMmQyOGRjYTdlOWJlNThhMjZiYzU0MDhlNzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbEFuZHJvaWQuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbEFuZHJvaWQuY3BwCkBAIC00NCw5ICs0NCwxMiBAQAog CiBuYW1lc3BhY2UgewogCi1jb25zdCBjaGFyIGZvbnRNYWluQ29uZmlnRmlsZVtdID0gIi9kYXRh L2RydC9hbmRyb2lkX21haW5fZm9udHMueG1sIjsKLWNvbnN0IGNoYXIgZm9udEZhbGxiYWNrQ29u ZmlnRmlsZVtdID0gIi9kYXRhL2RydC9hbmRyb2lkX2ZhbGxiYWNrX2ZvbnRzLnhtbCI7Ci1jb25z dCBjaGFyIGZvbnRzRGlyW10gPSAiL2RhdGEvZHJ0L2ZvbnRzLyI7CisvLyBNdXN0IGJlIHNhbWUg YXMgREVWSUNFX0RSVF9ESVIgaW4gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5LgorI2RlZmluZSBERVZJQ0VfRFJUX0RJUiAiL2RhdGEv bG9jYWwvdG1wL2RydC8iCisKK2NvbnN0IGNoYXIgZm9udE1haW5Db25maWdGaWxlW10gPSBERVZJ Q0VfRFJUX0RJUiAiYW5kcm9pZF9tYWluX2ZvbnRzLnhtbCI7Citjb25zdCBjaGFyIGZvbnRGYWxs YmFja0NvbmZpZ0ZpbGVbXSA9IERFVklDRV9EUlRfRElSICJhbmRyb2lkX2ZhbGxiYWNrX2ZvbnRz LnhtbCI7Citjb25zdCBjaGFyIGZvbnRzRGlyW10gPSBERVZJQ0VfRFJUX0RJUiAiZm9udHMvIjsK IAogY29uc3QgY2hhciBvcHRpb25JbkZJRk9bXSA9ICItLWluLWZpZm89IjsKIGNvbnN0IGNoYXIg b3B0aW9uT3V0RklGT1tdID0gIi0tb3V0LWZpZm89IjsKQEAgLTcyLDcgKzc1LDggQEAgdm9pZCBy ZW1vdmVBcmcoaW50IGluZGV4LCBpbnQqIGFyZ2MsIGNoYXIqKiogYXJndikKIHZvaWQgY3JlYXRl RklGTyhjb25zdCBjaGFyKiBmaWZvUGF0aCkKIHsKICAgICB1bmxpbmsoZmlmb1BhdGgpOwotICAg IGlmIChta2ZpZm8oZmlmb1BhdGgsIDA2MDApKSB7CisgICAgLy8gMDY2NiBpcyBydy1ydy1ydy0s IHRvIGFsbG93IGFkYiBzaGVsbCB0byByZWFkL3dyaXRlIHRoZSBmaWZvLgorICAgIGlmIChta2Zp Zm8oZmlmb1BhdGgsIDA2NjYpKSB7CiAgICAgICAgIGFuZHJvaWRMb2dFcnJvcigiRmFpbGVkIHRv IGNyZWF0ZSBmaWZvICVzOiAlc1xuIiwgZmlmb1BhdGgsIHN0cmVycm9yKGVycm5vKSk7CiAgICAg ICAgIGV4aXQoRVhJVF9GQUlMVVJFKTsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKaW5k ZXggNGY0ZjlkM2RlMzNjMWU5ODAwMTNkZTM2ODRmYzZkNWRlOTdhOTA5Mi4uNDNiZDJiMmU2NWQw ZmQ4MDBkYTU2NTkyZmI0ZmM3NWEwMGEzZTVjOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQpA QCAtNDQsMjEgKzQ0LDIwIEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAog IyBUaGUgcm9vdCBkaXJlY3RvcnkgZm9yIHRlc3QgcmVzb3VyY2VzLCB3aGljaCBoYXMgdGhlIHNh bWUgc3RydWN0dXJlIGFzIHRoZQogIyBzb3VyY2Ugcm9vdCBkaXJlY3Rvcnkgb2YgQ2hyb21pdW0u Ci0jIFRoaXMgcGF0aCBpcyBkZWZpbmVkIGluIGJhc2UvYmFzZV9wYXRoc19hbmRyb2lkLmNjIGFu ZAotIyB3ZWJraXQvc3VwcG9ydC9wbGF0Zm9ybV9zdXBwb3J0X2FuZHJvaWQuY2MuCisjIFRoaXMg cGF0aCBpcyBkZWZpbmVkIGluIENocm9taXVtJ3MgYmFzZS90ZXN0L3Rlc3Rfc3VwcG9ydF9hbmRy b2lkLmNjLgogREVWSUNFX1NPVVJDRV9ST09UX0RJUiA9ICcvZGF0YS9sb2NhbC90bXAvJwogQ09N TUFORF9MSU5FX0ZJTEUgPSBERVZJQ0VfU09VUkNFX1JPT1RfRElSICsgJ2Nocm9tZS1uYXRpdmUt dGVzdHMtY29tbWFuZC1saW5lJwogCiAjIFRoZSBkaXJlY3RvcnkgdG8gcHV0IHRvb2xzIGFuZCBy ZXNvdXJjZXMgb2YgRHVtcFJlbmRlclRyZWUuCi1ERVZJQ0VfRFJUX0RJUiA9ICcvZGF0YS9kcnQv JworIyBJZiBjaGFuZ2UgdGhpcywgbXVzdCBhbHNvIGNoYW5nZSBUb29scy9EdW1wUmVuZGVyVHJl ZS9jaHJvbWl1bS9UZXN0U2hlbGxBbmRyb2lkLmNwcAorIyBhbmQgQ2hyb21pdW0ncyB3ZWJraXQv c3VwcG9ydC9wbGF0Zm9ybV9zdXBwb3J0X2FuZHJvaWQuY2MuCitERVZJQ0VfRFJUX0RJUiA9IERF VklDRV9TT1VSQ0VfUk9PVF9ESVIgKyAnZHJ0LycKIERFVklDRV9GT1JXQVJERVJfUEFUSCA9IERF VklDRV9EUlRfRElSICsgJ2ZvcndhcmRlcicKIERFVklDRV9EUlRfU1RBTVBfUEFUSCA9IERFVklD RV9EUlRfRElSICsgJ0R1bXBSZW5kZXJUcmVlLnN0YW1wJwogCiBEUlRfQVBQX1BBQ0tBR0UgPSAn b3JnLmNocm9taXVtLm5hdGl2ZV90ZXN0JwogRFJUX0FDVElWSVRZX0ZVTExfTkFNRSA9IERSVF9B UFBfUEFDS0FHRSArICcvLkNocm9tZU5hdGl2ZVRlc3RBY3Rpdml0eScKLURSVF9BUFBfRElSID0g Jy9kYXRhL3VzZXIvMC8nICsgRFJUX0FQUF9QQUNLQUdFICsgJy8nCi1EUlRfQVBQX0ZJTEVTX0RJ UiA9IERFVklDRV9TT1VSQ0VfUk9PVF9ESVIKLURSVF9BUFBfQ0FDSEVfRElSID0gRFJUX0FQUF9E SVIgKyAnY2FjaGUvJworRFJUX0FQUF9DQUNIRV9ESVIgPSBERVZJQ0VfRFJUX0RJUiArICdjYWNo ZS8nCiAKICMgVGhpcyBvbmx5IHdvcmtzIGZvciBzaW5nbGUgY29yZSBkZXZpY2VzIHNvIGZhci4K ICMgRklYTUU6IEZpbmQgYSBzb2x1dGlvbiBmb3IgbXVsdGktY29yZSBkZXZpY2VzLgpAQCAtMjQx LDYgKzI0MCwxMCBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWRQb3J0KGNocm9taXVtLkNocm9taXVt UG9ydCk6CiAgICAgICAgICMgU2VlIGNvbW1lbnRzIGluIENocm9taXVtQW5kcm9pZERyaXZlci5z dGFydCgpLgogICAgICAgICByZXR1cm4gQ2hyb21pdW1BbmRyb2lkRHJpdmVyKHNlbGYsIHdvcmtl cl9udW1iZXIsIHBpeGVsX3Rlc3RzPXNlbGYuZ2V0X29wdGlvbigncGl4ZWxfdGVzdHMnKSwgbm9f dGltZW91dD1ub190aW1lb3V0KQogCisgICAgZGVmIGRyaXZlcl9jbWRfbGluZShzZWxmKToKKyAg ICAgICAgIyBPdmVycmlkZSB0byByZXR1cm4gdGhlIGFjdHVhbCBEdW1wUmVuZGVyVHJlZSBjb21t YW5kIGxpbmUuCisgICAgICAgIHJldHVybiBzZWxmLmNyZWF0ZV9kcml2ZXIoMCkuX2RydF9jbWRf bGluZShzZWxmLmdldF9vcHRpb24oJ3BpeGVsX3Rlc3RzJyksIFtdKQorCiAgICAgIyBPdmVycmlk ZGVuIHByaXZhdGUgZnVuY3Rpb25zLgogCiAgICAgZGVmIF9idWlsZF9wYXRoKHNlbGYsICpjb21w cyk6CkBAIC0zMDcsOSArMzEwLDkgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZl ci5Ecml2ZXIpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCB3b3JrZXJfbnVtYmVyLCBw aXhlbF90ZXN0cywgbm9fdGltZW91dD1GYWxzZSk6CiAgICAgICAgIHN1cGVyKENocm9taXVtQW5k cm9pZERyaXZlciwgc2VsZikuX19pbml0X18ocG9ydCwgd29ya2VyX251bWJlciwgcGl4ZWxfdGVz dHMsIG5vX3RpbWVvdXQpCiAgICAgICAgIHNlbGYuX3BpeGVsX3Rlc3RzID0gcGl4ZWxfdGVzdHMK LSAgICAgICAgc2VsZi5faW5fZmlmb19wYXRoID0gRFJUX0FQUF9GSUxFU19ESVIgKyAnRHVtcFJl bmRlclRyZWUuaW4nCi0gICAgICAgIHNlbGYuX291dF9maWZvX3BhdGggPSBEUlRfQVBQX0ZJTEVT X0RJUiArICdEdW1wUmVuZGVyVHJlZS5vdXQnCi0gICAgICAgIHNlbGYuX2Vycl9maWZvX3BhdGgg PSBEUlRfQVBQX0ZJTEVTX0RJUiArICdEdW1wUmVuZGVyVHJlZS5lcnInCisgICAgICAgIHNlbGYu X2luX2ZpZm9fcGF0aCA9IERFVklDRV9EUlRfRElSICsgJ0R1bXBSZW5kZXJUcmVlLmluJworICAg ICAgICBzZWxmLl9vdXRfZmlmb19wYXRoID0gREVWSUNFX0RSVF9ESVIgKyAnRHVtcFJlbmRlclRy ZWUub3V0JworICAgICAgICBzZWxmLl9lcnJfZmlmb19wYXRoID0gREVWSUNFX0RSVF9ESVIgKyAn RHVtcFJlbmRlclRyZWUuZXJyJwogICAgICAgICBzZWxmLl9yZWFkX3N0ZG91dF9wcm9jZXNzID0g Tm9uZQogICAgICAgICBzZWxmLl9yZWFkX3N0ZGVycl9wcm9jZXNzID0gTm9uZQogICAgICAgICBz ZWxmLl9mb3J3YXJkZXJfcHJvY2VzcyA9IE5vbmUKQEAgLTMzMSw5ICszMzQsMTEgQEAgY2xhc3Mg Q2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIpOgogICAgICAgICAjIFJlcXVpcmVk IGJ5IHdlYmtpdF9zdXBwb3J0OjpHZXRXZWJLaXRSb290RGlyRmlsZVBhdGgoKS4KICAgICAgICAg IyBPdGhlciBkaXJlY3RvcmllcyB3aWxsIGJlIGNyZWF0ZWQgYXV0b21hdGljYWxseSBieSBhZGIg cHVzaC4KICAgICAgICAgc2VsZi5fcnVuX2FkYl9jb21tYW5kKFsnc2hlbGwnLCAnbWtkaXInLCAn LXAnLCBERVZJQ0VfU09VUkNFX1JPT1RfRElSICsgJ2Nocm9tZSddKQorCiAgICAgICAgICMgQWxs b3cgdGhlIER1bXBSZW5kZXJUcmVlIGFwcCB0byBmdWxseSBhY2Nlc3MgdGhlIGRpcmVjdG9yeS4K LSAgICAgICAgIyBUaGUgbmF0aXZlIGNvZGUgbmVlZHMgdGhlIHBlcm1pc3Npb24gdG8gd3JpdGUg dGVtcG9yYXJ5IGZpbGVzIGhlcmUuCi0gICAgICAgIHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ3No ZWxsJywgJ2NobW9kJywgJzc3NycsIERFVklDRV9TT1VSQ0VfUk9PVF9ESVJdKQorICAgICAgICAj IFRoZSBuYXRpdmUgY29kZSBuZWVkcyB0aGUgcGVybWlzc2lvbiB0byB3cml0ZSB0ZW1wb3Jhcnkg ZmlsZXMgYW5kIGNyZWF0ZSBwaXBlcyBoZXJlLgorICAgICAgICBzZWxmLl9ydW5fYWRiX2NvbW1h bmQoWydzaGVsbCcsICdta2RpcicsICctcCcsIERFVklDRV9EUlRfRElSXSkKKyAgICAgICAgc2Vs Zi5fcnVuX2FkYl9jb21tYW5kKFsnc2hlbGwnLCAnY2htb2QnLCAnNzc3JywgREVWSUNFX0RSVF9E SVJdKQogCiAgICAgICAgIHNlbGYuX3B1c2hfZXhlY3V0YWJsZSgpCiAgICAgICAgIHNlbGYuX3B1 c2hfZm9udHMoKQpAQCAtMzU5LDYgKzM2NCwxMCBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2 ZXIoZHJpdmVyLkRyaXZlcik6CiAgICAgICAgICAgICAgICAgcmFpc2UgQXNzZXJ0aW9uRXJyb3Io J0ZhaWxlZCB0byBpbnN0YWxsICVzIG9udG8gZGV2aWNlOiAlcycgJSAoZHJ0X2hvc3RfcGF0aCwg aW5zdGFsbF9yZXN1bHQpKQogICAgICAgICAgICAgc2VsZi5fcHVzaF90b19kZXZpY2Uoc2VsZi5f cG9ydC5fYnVpbGRfcGF0aCgnRHVtcFJlbmRlclRyZWUucGFrJyksIERFVklDRV9EUlRfRElSICsg J0R1bXBSZW5kZXJUcmVlLnBhaycpCiAgICAgICAgICAgICBzZWxmLl9wdXNoX3RvX2RldmljZShz ZWxmLl9wb3J0Ll9idWlsZF9wYXRoKCdEdW1wUmVuZGVyVHJlZV9yZXNvdXJjZXMnKSwgREVWSUNF X0RSVF9ESVIgKyAnRHVtcFJlbmRlclRyZWVfcmVzb3VyY2VzJykKKyAgICAgICAgICAgICMgRklY TUU6IFRlbXBvcmFyaWx5IHB1c2ggcGFrIGFuZCByZXNvdXJjZXMgdW5kZXIgdGhlIG9yaWdpbmFs IC9kYXRhL2RydC8gZGlyZWN0b3J5LgorICAgICAgICAgICAgIyBSZW1vdmUgdGhlIGZvbGxvd2lu ZyB0d28gbGluZXMgYWZ0ZXIgbGFuZGluZyB0aGUgY2hyb21pdW0gc2lkZSBvZiBjaGFuZ2UuCisg ICAgICAgICAgICBzZWxmLl9wdXNoX3RvX2RldmljZShzZWxmLl9wb3J0Ll9idWlsZF9wYXRoKCdE dW1wUmVuZGVyVHJlZS5wYWsnKSwgJy9kYXRhL2RydC9EdW1wUmVuZGVyVHJlZS5wYWsnKQorICAg ICAgICAgICAgc2VsZi5fcHVzaF90b19kZXZpY2Uoc2VsZi5fcG9ydC5fYnVpbGRfcGF0aCgnRHVt cFJlbmRlclRyZWVfcmVzb3VyY2VzJyksICcvZGF0YS9kcnQvRHVtcFJlbmRlclRyZWVfcmVzb3Vy Y2VzJykKICAgICAgICAgICAgIHNlbGYuX3B1c2hfdG9fZGV2aWNlKHNlbGYuX3BvcnQuX2J1aWxk X3BhdGgoJ2FuZHJvaWRfbWFpbl9mb250cy54bWwnKSwgREVWSUNFX0RSVF9ESVIgKyAnYW5kcm9p ZF9tYWluX2ZvbnRzLnhtbCcpCiAgICAgICAgICAgICBzZWxmLl9wdXNoX3RvX2RldmljZShzZWxm Ll9wb3J0Ll9idWlsZF9wYXRoKCdhbmRyb2lkX2ZhbGxiYWNrX2ZvbnRzLnhtbCcpLCBERVZJQ0Vf RFJUX0RJUiArICdhbmRyb2lkX2ZhbGxiYWNrX2ZvbnRzLnhtbCcpCiAgICAgICAgICAgICAjIFZl cnNpb24gY29udHJvbCBvZiB0ZXN0IHJlc291cmNlcyBpcyBkZXBlbmRlbnQgb24gZXhlY3V0YWJs ZXMsCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX2FuZHJvaWRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWRfdW5pdHRlc3QucHkKaW5kZXggNGYzMzFl NDVjYmQ1YmI3Zjg3MDVlMDQwM2FhYjNkOWQ3ZjA5OWJhYi4uYzliNjkxOTJjYmNiMjUzYWM3MWY5 MjRiMDJhOTA3YWEzMmMyNzhmMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZF91bml0 dGVzdC5weQpAQCAtMTEyLDYgKzExMiw3IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZFBvcnRUZXN0 KGNocm9taXVtX3BvcnRfdGVzdGNhc2UuQ2hyb21pdW1Qb3J0VGVzdENhc2UpOgogICAgIGRlZiBt YWtlX3BvcnQoc2VsZiwgKiprd2FyZ3MpOgogICAgICAgICBwb3J0ID0gc3VwZXIoQ2hyb21pdW1B bmRyb2lkUG9ydFRlc3QsIHNlbGYpLm1ha2VfcG9ydCgqKmt3YXJncykKICAgICAgICAgc2VsZi5t b2NrX3J1bl9jb21tYW5kID0gTW9ja1J1bkNvbW1hbmQoKQorICAgICAgICBzZWxmLm1vY2tfcnVu X2NvbW1hbmQubW9ja19vbmVfZGV2aWNlKCkKICAgICAgICAgcG9ydC5fZXhlY3V0aXZlID0gTW9j a0V4ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49c2VsZi5tb2NrX3J1bl9jb21tYW5kLm1vY2tfcnVu X2NvbW1hbmRfZm4pCiAgICAgICAgIHJldHVybiBwb3J0CiAKQEAgLTEyOCwxMCArMTI5LDYgQEAg Y2xhc3MgQ2hyb21pdW1BbmRyb2lkUG9ydFRlc3QoY2hyb21pdW1fcG9ydF90ZXN0Y2FzZS5DaHJv bWl1bVBvcnRUZXN0Q2FzZSk6CiAgICAgICAgICMgdXNpbmcgYSBjdXN0b20gZXhwZWN0YXRpb25z IGZpbGUuCiAgICAgICAgIHBhc3MKIAotICAgIGRlZiB0ZXN0X2RyaXZlcl9jbWRfbGluZShzZWxm KToKLSAgICAgICAgIyBPdmVycmlkaW5nIFBvcnRUZXN0Q2FzZS50ZXN0X2NtZF9saW5lKCkuIFVz ZSBDaHJvbWl1bUFuZHJvaWREcml2ZXJUZXN0LnRlc3RfY21kX2xpbmUoKSBpbnN0ZWFkLgotICAg ICAgICByZXR1cm4KLQogICAgIGRlZiB0ZXN0X2dldF9kZXZpY2VzX25vX2RldmljZShzZWxmKToK ICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKICAgICAgICAgc2VsZi5tb2NrX3J1bl9j b21tYW5kLm1vY2tfbm9fZGV2aWNlKCkKQEAgLTIzNSw5ICsyMzIsOSBAQCBjbGFzcyBDaHJvbWl1 bUFuZHJvaWREcml2ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9kcnRf Y21kX2xpbmUoc2VsZik6CiAgICAgICAgIGNtZF9saW5lID0gc2VsZi5kcml2ZXIuX2RydF9jbWRf bGluZShUcnVlLCBbJy0tYSddKQogICAgICAgICBzZWxmLmFzc2VydFRydWUoJy0tYScgaW4gY21k X2xpbmUpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnLS1pbi1maWZvPScgKyBjaHJvbWl1bV9h bmRyb2lkLkRSVF9BUFBfRklMRVNfRElSICsgJ0R1bXBSZW5kZXJUcmVlLmluJyBpbiBjbWRfbGlu ZSkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCctLW91dC1maWZvPScgKyBjaHJvbWl1bV9hbmRy b2lkLkRSVF9BUFBfRklMRVNfRElSICsgJ0R1bXBSZW5kZXJUcmVlLm91dCcgaW4gY21kX2xpbmUp Ci0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnLS1lcnItZmlmbz0nICsgY2hyb21pdW1fYW5kcm9p ZC5EUlRfQVBQX0ZJTEVTX0RJUiArICdEdW1wUmVuZGVyVHJlZS5lcnInIGluIGNtZF9saW5lKQor ICAgICAgICBzZWxmLmFzc2VydFRydWUoJy0taW4tZmlmbz0nICsgY2hyb21pdW1fYW5kcm9pZC5E RVZJQ0VfRFJUX0RJUiArICdEdW1wUmVuZGVyVHJlZS5pbicgaW4gY21kX2xpbmUpCisgICAgICAg IHNlbGYuYXNzZXJ0VHJ1ZSgnLS1vdXQtZmlmbz0nICsgY2hyb21pdW1fYW5kcm9pZC5ERVZJQ0Vf RFJUX0RJUiArICdEdW1wUmVuZGVyVHJlZS5vdXQnIGluIGNtZF9saW5lKQorICAgICAgICBzZWxm LmFzc2VydFRydWUoJy0tZXJyLWZpZm89JyArIGNocm9taXVtX2FuZHJvaWQuREVWSUNFX0RSVF9E SVIgKyAnRHVtcFJlbmRlclRyZWUuZXJyJyBpbiBjbWRfbGluZSkKIAogICAgIGRlZiB0ZXN0X3Jl YWRfcHJvbXB0KHNlbGYpOgogICAgICAgICBzZWxmLmRyaXZlci5fc2VydmVyX3Byb2Nlc3MgPSBk cml2ZXJfdW5pdHRlc3QuTW9ja1NlcnZlclByb2Nlc3MobGluZXM9Wydyb290QGFuZHJvaWQ6LyAj ICddKQo= 156714 2012-08-06 09:56:11 -0700 2012-08-06 11:29:47 -0700 for landing bug-91910-20120806095548.patch text/plain 10274 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0Nzc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmRiZTY1M2ZiMThmNWQwYzY5MTE0OTk2ZTE2MTFmYjZh ZTQxNDQ1YS4uMDI5YmVlYzk2NDRiZWEzOWMzYTZjNjJlYjI2MjhhYjgzZWQxNDEyMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDEyLTA4LTAzICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFN0b3JlIHRlc3QgZXhlY3V0YWJsZSwgZGF0 YSBhbmQgZm9udHMgaW4gL2RhdGEvbG9jYWwvdG1wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTkxMAorCisgICAgICAgIC9kYXRhL2xvY2FsL3RtcCBp cyBhIGRpcmVjdG9yeSB3aXRoIHBlcm1pc3Npb24gMDc3NyBieSBkZWZhdWx0LgorICAgICAgICBQ bGFjZSBEdW1wUmVuZGVyVHJlZSByZXNvdXJjZXMgaGVyZSBzbyB0aGF0IGJvdGggdGhlIG5hdGl2 ZSB0ZXN0IGFwcCBhbmQKKyAgICAgICAgdGhlIE5SV1Qgc2NyaXB0IGNhbiBhY2Nlc3MgdGhlbSBl dmVuIGlmIGFkYiBzaGVsbCBpc24ndCBydW5uaW5nIGFzIHJvb3QuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rl c3RTaGVsbEFuZHJvaWQuY3BwOgorICAgICAgICAoY3JlYXRlRklGTyk6IFNldCBmaWZvIG1vZGUg dG8gMDY2NiB0byBhbGxvdyB1bnJvb3RlZCBhZGIgc2hlbGwgdG8gYWNjZXNzLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weToK KyAgICAgICAgKENocm9taXVtQW5kcm9pZFBvcnQuZHJpdmVyX2NtZF9saW5lKToKKyAgICAgICAg KENocm9taXVtQW5kcm9pZERyaXZlci5fX2luaXRfXyk6CisgICAgICAgIChDaHJvbWl1bUFuZHJv aWREcml2ZXIuX3NldHVwX3Rlc3QpOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9w dXNoX2V4ZWN1dGFibGUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW1fYW5kcm9pZF91bml0dGVzdC5weToKKyAgICAgICAgKENocm9taXVtQW5k cm9pZFBvcnRUZXN0Lm1ha2VfcG9ydCk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWRQb3J0VGVz dC50ZXN0X2V4cGVjdGF0aW9uc19maWxlcyk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2 ZXJUZXN0LnRlc3RfZHJ0X2NtZF9saW5lKToKKwogMjAxMi0wOC0wNiAgQmFsYXpzIEtlbGVtZW4g IDxrYmFsYXpzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgV1RSIHNob3VsZCBiZSBhYmxlIHRvIGxv YWQgZXh0ZXJuYWwgcmVzb3VyY2VzCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9UZXN0U2hlbGxBbmRyb2lkLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1Rlc3RTaGVsbEFuZHJvaWQuY3BwCmluZGV4IDVmMDRmZmY1YjFiZWY4ZDY5ZjY3MDkxOTI4 OWNkNjk3MDI1MTJjOTQuLjE4ODE1ODQ0MGJhNjgxNjkxYmZjOThmMTkyMmUwYzZlYjliZTRlOWMg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbEFuZHJv aWQuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RTaGVsbEFuZHJv aWQuY3BwCkBAIC00NCw5ICs0NCwxMiBAQAogCiBuYW1lc3BhY2UgewogCi1jb25zdCBjaGFyIGZv bnRNYWluQ29uZmlnRmlsZVtdID0gIi9kYXRhL2RydC9hbmRyb2lkX21haW5fZm9udHMueG1sIjsK LWNvbnN0IGNoYXIgZm9udEZhbGxiYWNrQ29uZmlnRmlsZVtdID0gIi9kYXRhL2RydC9hbmRyb2lk X2ZhbGxiYWNrX2ZvbnRzLnhtbCI7Ci1jb25zdCBjaGFyIGZvbnRzRGlyW10gPSAiL2RhdGEvZHJ0 L2ZvbnRzLyI7CisvLyBNdXN0IGJlIHNhbWUgYXMgREVWSUNFX0RSVF9ESVIgaW4gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5LgorI2Rl ZmluZSBERVZJQ0VfRFJUX0RJUiAiL2RhdGEvbG9jYWwvdG1wL2RydC8iCisKK2NvbnN0IGNoYXIg Zm9udE1haW5Db25maWdGaWxlW10gPSBERVZJQ0VfRFJUX0RJUiAiYW5kcm9pZF9tYWluX2ZvbnRz LnhtbCI7Citjb25zdCBjaGFyIGZvbnRGYWxsYmFja0NvbmZpZ0ZpbGVbXSA9IERFVklDRV9EUlRf RElSICJhbmRyb2lkX2ZhbGxiYWNrX2ZvbnRzLnhtbCI7Citjb25zdCBjaGFyIGZvbnRzRGlyW10g PSBERVZJQ0VfRFJUX0RJUiAiZm9udHMvIjsKIAogY29uc3QgY2hhciBvcHRpb25JbkZJRk9bXSA9 ICItLWluLWZpZm89IjsKIGNvbnN0IGNoYXIgb3B0aW9uT3V0RklGT1tdID0gIi0tb3V0LWZpZm89 IjsKQEAgLTcyLDcgKzc1LDkgQEAgdm9pZCByZW1vdmVBcmcoaW50IGluZGV4LCBpbnQqIGFyZ2Ms IGNoYXIqKiogYXJndikKIHZvaWQgY3JlYXRlRklGTyhjb25zdCBjaGFyKiBmaWZvUGF0aCkKIHsK ICAgICB1bmxpbmsoZmlmb1BhdGgpOwotICAgIGlmIChta2ZpZm8oZmlmb1BhdGgsIDA2MDApKSB7 CisgICAgLy8gMDY2NiBpcyBydy1ydy1ydy0sIHRvIGFsbG93IGFkYiBzaGVsbCB0byByZWFkL3dy aXRlIHRoZSBmaWZvLgorICAgIC8vIEV4cGxpY2l0bHkgY2FsbCBjaG1vZCB0byBlbnN1cmUgdGhl IG1vZGUgaXMgc2V0IGRlc3BpdGUgdW1hc2suCisgICAgaWYgKG1rZmlmbyhmaWZvUGF0aCwgMDY2 NikgfHwgY2htb2QoZmlmb1BhdGgsIDA2NjYpKSB7CiAgICAgICAgIGFuZHJvaWRMb2dFcnJvcigi RmFpbGVkIHRvIGNyZWF0ZSBmaWZvICVzOiAlc1xuIiwgZmlmb1BhdGgsIHN0cmVycm9yKGVycm5v KSk7CiAgICAgICAgIGV4aXQoRVhJVF9GQUlMVVJFKTsKICAgICB9CmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJv aWQucHkKaW5kZXggNGY0ZjlkM2RlMzNjMWU5ODAwMTNkZTM2ODRmYzZkNWRlOTdhOTA5Mi4uNDNi ZDJiMmU2NWQwZmQ4MDBkYTU2NTkyZmI0ZmM3NWEwMGEzZTVjOCAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5k cm9pZC5weQpAQCAtNDQsMjEgKzQ0LDIwIEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25h bWVfXykKIAogIyBUaGUgcm9vdCBkaXJlY3RvcnkgZm9yIHRlc3QgcmVzb3VyY2VzLCB3aGljaCBo YXMgdGhlIHNhbWUgc3RydWN0dXJlIGFzIHRoZQogIyBzb3VyY2Ugcm9vdCBkaXJlY3Rvcnkgb2Yg Q2hyb21pdW0uCi0jIFRoaXMgcGF0aCBpcyBkZWZpbmVkIGluIGJhc2UvYmFzZV9wYXRoc19hbmRy b2lkLmNjIGFuZAotIyB3ZWJraXQvc3VwcG9ydC9wbGF0Zm9ybV9zdXBwb3J0X2FuZHJvaWQuY2Mu CisjIFRoaXMgcGF0aCBpcyBkZWZpbmVkIGluIENocm9taXVtJ3MgYmFzZS90ZXN0L3Rlc3Rfc3Vw cG9ydF9hbmRyb2lkLmNjLgogREVWSUNFX1NPVVJDRV9ST09UX0RJUiA9ICcvZGF0YS9sb2NhbC90 bXAvJwogQ09NTUFORF9MSU5FX0ZJTEUgPSBERVZJQ0VfU09VUkNFX1JPT1RfRElSICsgJ2Nocm9t ZS1uYXRpdmUtdGVzdHMtY29tbWFuZC1saW5lJwogCiAjIFRoZSBkaXJlY3RvcnkgdG8gcHV0IHRv b2xzIGFuZCByZXNvdXJjZXMgb2YgRHVtcFJlbmRlclRyZWUuCi1ERVZJQ0VfRFJUX0RJUiA9ICcv ZGF0YS9kcnQvJworIyBJZiBjaGFuZ2UgdGhpcywgbXVzdCBhbHNvIGNoYW5nZSBUb29scy9EdW1w UmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0U2hlbGxBbmRyb2lkLmNwcAorIyBhbmQgQ2hyb21pdW0n cyB3ZWJraXQvc3VwcG9ydC9wbGF0Zm9ybV9zdXBwb3J0X2FuZHJvaWQuY2MuCitERVZJQ0VfRFJU X0RJUiA9IERFVklDRV9TT1VSQ0VfUk9PVF9ESVIgKyAnZHJ0LycKIERFVklDRV9GT1JXQVJERVJf UEFUSCA9IERFVklDRV9EUlRfRElSICsgJ2ZvcndhcmRlcicKIERFVklDRV9EUlRfU1RBTVBfUEFU SCA9IERFVklDRV9EUlRfRElSICsgJ0R1bXBSZW5kZXJUcmVlLnN0YW1wJwogCiBEUlRfQVBQX1BB Q0tBR0UgPSAnb3JnLmNocm9taXVtLm5hdGl2ZV90ZXN0JwogRFJUX0FDVElWSVRZX0ZVTExfTkFN RSA9IERSVF9BUFBfUEFDS0FHRSArICcvLkNocm9tZU5hdGl2ZVRlc3RBY3Rpdml0eScKLURSVF9B UFBfRElSID0gJy9kYXRhL3VzZXIvMC8nICsgRFJUX0FQUF9QQUNLQUdFICsgJy8nCi1EUlRfQVBQ X0ZJTEVTX0RJUiA9IERFVklDRV9TT1VSQ0VfUk9PVF9ESVIKLURSVF9BUFBfQ0FDSEVfRElSID0g RFJUX0FQUF9ESVIgKyAnY2FjaGUvJworRFJUX0FQUF9DQUNIRV9ESVIgPSBERVZJQ0VfRFJUX0RJ UiArICdjYWNoZS8nCiAKICMgVGhpcyBvbmx5IHdvcmtzIGZvciBzaW5nbGUgY29yZSBkZXZpY2Vz IHNvIGZhci4KICMgRklYTUU6IEZpbmQgYSBzb2x1dGlvbiBmb3IgbXVsdGktY29yZSBkZXZpY2Vz LgpAQCAtMjQxLDYgKzI0MCwxMCBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWRQb3J0KGNocm9taXVt LkNocm9taXVtUG9ydCk6CiAgICAgICAgICMgU2VlIGNvbW1lbnRzIGluIENocm9taXVtQW5kcm9p ZERyaXZlci5zdGFydCgpLgogICAgICAgICByZXR1cm4gQ2hyb21pdW1BbmRyb2lkRHJpdmVyKHNl bGYsIHdvcmtlcl9udW1iZXIsIHBpeGVsX3Rlc3RzPXNlbGYuZ2V0X29wdGlvbigncGl4ZWxfdGVz dHMnKSwgbm9fdGltZW91dD1ub190aW1lb3V0KQogCisgICAgZGVmIGRyaXZlcl9jbWRfbGluZShz ZWxmKToKKyAgICAgICAgIyBPdmVycmlkZSB0byByZXR1cm4gdGhlIGFjdHVhbCBEdW1wUmVuZGVy VHJlZSBjb21tYW5kIGxpbmUuCisgICAgICAgIHJldHVybiBzZWxmLmNyZWF0ZV9kcml2ZXIoMCku X2RydF9jbWRfbGluZShzZWxmLmdldF9vcHRpb24oJ3BpeGVsX3Rlc3RzJyksIFtdKQorCiAgICAg IyBPdmVycmlkZGVuIHByaXZhdGUgZnVuY3Rpb25zLgogCiAgICAgZGVmIF9idWlsZF9wYXRoKHNl bGYsICpjb21wcyk6CkBAIC0zMDcsOSArMzEwLDkgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJp dmVyKGRyaXZlci5Ecml2ZXIpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCB3b3JrZXJf bnVtYmVyLCBwaXhlbF90ZXN0cywgbm9fdGltZW91dD1GYWxzZSk6CiAgICAgICAgIHN1cGVyKENo cm9taXVtQW5kcm9pZERyaXZlciwgc2VsZikuX19pbml0X18ocG9ydCwgd29ya2VyX251bWJlciwg cGl4ZWxfdGVzdHMsIG5vX3RpbWVvdXQpCiAgICAgICAgIHNlbGYuX3BpeGVsX3Rlc3RzID0gcGl4 ZWxfdGVzdHMKLSAgICAgICAgc2VsZi5faW5fZmlmb19wYXRoID0gRFJUX0FQUF9GSUxFU19ESVIg KyAnRHVtcFJlbmRlclRyZWUuaW4nCi0gICAgICAgIHNlbGYuX291dF9maWZvX3BhdGggPSBEUlRf QVBQX0ZJTEVTX0RJUiArICdEdW1wUmVuZGVyVHJlZS5vdXQnCi0gICAgICAgIHNlbGYuX2Vycl9m aWZvX3BhdGggPSBEUlRfQVBQX0ZJTEVTX0RJUiArICdEdW1wUmVuZGVyVHJlZS5lcnInCisgICAg ICAgIHNlbGYuX2luX2ZpZm9fcGF0aCA9IERFVklDRV9EUlRfRElSICsgJ0R1bXBSZW5kZXJUcmVl LmluJworICAgICAgICBzZWxmLl9vdXRfZmlmb19wYXRoID0gREVWSUNFX0RSVF9ESVIgKyAnRHVt cFJlbmRlclRyZWUub3V0JworICAgICAgICBzZWxmLl9lcnJfZmlmb19wYXRoID0gREVWSUNFX0RS VF9ESVIgKyAnRHVtcFJlbmRlclRyZWUuZXJyJwogICAgICAgICBzZWxmLl9yZWFkX3N0ZG91dF9w cm9jZXNzID0gTm9uZQogICAgICAgICBzZWxmLl9yZWFkX3N0ZGVycl9wcm9jZXNzID0gTm9uZQog ICAgICAgICBzZWxmLl9mb3J3YXJkZXJfcHJvY2VzcyA9IE5vbmUKQEAgLTMzMSw5ICszMzQsMTEg QEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZlci5Ecml2ZXIpOgogICAgICAgICAj IFJlcXVpcmVkIGJ5IHdlYmtpdF9zdXBwb3J0OjpHZXRXZWJLaXRSb290RGlyRmlsZVBhdGgoKS4K ICAgICAgICAgIyBPdGhlciBkaXJlY3RvcmllcyB3aWxsIGJlIGNyZWF0ZWQgYXV0b21hdGljYWxs eSBieSBhZGIgcHVzaC4KICAgICAgICAgc2VsZi5fcnVuX2FkYl9jb21tYW5kKFsnc2hlbGwnLCAn bWtkaXInLCAnLXAnLCBERVZJQ0VfU09VUkNFX1JPT1RfRElSICsgJ2Nocm9tZSddKQorCiAgICAg ICAgICMgQWxsb3cgdGhlIER1bXBSZW5kZXJUcmVlIGFwcCB0byBmdWxseSBhY2Nlc3MgdGhlIGRp cmVjdG9yeS4KLSAgICAgICAgIyBUaGUgbmF0aXZlIGNvZGUgbmVlZHMgdGhlIHBlcm1pc3Npb24g dG8gd3JpdGUgdGVtcG9yYXJ5IGZpbGVzIGhlcmUuCi0gICAgICAgIHNlbGYuX3J1bl9hZGJfY29t bWFuZChbJ3NoZWxsJywgJ2NobW9kJywgJzc3NycsIERFVklDRV9TT1VSQ0VfUk9PVF9ESVJdKQor ICAgICAgICAjIFRoZSBuYXRpdmUgY29kZSBuZWVkcyB0aGUgcGVybWlzc2lvbiB0byB3cml0ZSB0 ZW1wb3JhcnkgZmlsZXMgYW5kIGNyZWF0ZSBwaXBlcyBoZXJlLgorICAgICAgICBzZWxmLl9ydW5f YWRiX2NvbW1hbmQoWydzaGVsbCcsICdta2RpcicsICctcCcsIERFVklDRV9EUlRfRElSXSkKKyAg ICAgICAgc2VsZi5fcnVuX2FkYl9jb21tYW5kKFsnc2hlbGwnLCAnY2htb2QnLCAnNzc3JywgREVW SUNFX0RSVF9ESVJdKQogCiAgICAgICAgIHNlbGYuX3B1c2hfZXhlY3V0YWJsZSgpCiAgICAgICAg IHNlbGYuX3B1c2hfZm9udHMoKQpAQCAtMzU5LDYgKzM2NCwxMCBAQCBjbGFzcyBDaHJvbWl1bUFu ZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAgICAgICAgICAgICAgICAgcmFpc2UgQXNzZXJ0 aW9uRXJyb3IoJ0ZhaWxlZCB0byBpbnN0YWxsICVzIG9udG8gZGV2aWNlOiAlcycgJSAoZHJ0X2hv c3RfcGF0aCwgaW5zdGFsbF9yZXN1bHQpKQogICAgICAgICAgICAgc2VsZi5fcHVzaF90b19kZXZp Y2Uoc2VsZi5fcG9ydC5fYnVpbGRfcGF0aCgnRHVtcFJlbmRlclRyZWUucGFrJyksIERFVklDRV9E UlRfRElSICsgJ0R1bXBSZW5kZXJUcmVlLnBhaycpCiAgICAgICAgICAgICBzZWxmLl9wdXNoX3Rv X2RldmljZShzZWxmLl9wb3J0Ll9idWlsZF9wYXRoKCdEdW1wUmVuZGVyVHJlZV9yZXNvdXJjZXMn KSwgREVWSUNFX0RSVF9ESVIgKyAnRHVtcFJlbmRlclRyZWVfcmVzb3VyY2VzJykKKyAgICAgICAg ICAgICMgRklYTUU6IFRlbXBvcmFyaWx5IHB1c2ggcGFrIGFuZCByZXNvdXJjZXMgdW5kZXIgdGhl IG9yaWdpbmFsIC9kYXRhL2RydC8gZGlyZWN0b3J5LgorICAgICAgICAgICAgIyBSZW1vdmUgdGhl IGZvbGxvd2luZyB0d28gbGluZXMgYWZ0ZXIgbGFuZGluZyB0aGUgY2hyb21pdW0gc2lkZSBvZiBj aGFuZ2UuCisgICAgICAgICAgICBzZWxmLl9wdXNoX3RvX2RldmljZShzZWxmLl9wb3J0Ll9idWls ZF9wYXRoKCdEdW1wUmVuZGVyVHJlZS5wYWsnKSwgJy9kYXRhL2RydC9EdW1wUmVuZGVyVHJlZS5w YWsnKQorICAgICAgICAgICAgc2VsZi5fcHVzaF90b19kZXZpY2Uoc2VsZi5fcG9ydC5fYnVpbGRf cGF0aCgnRHVtcFJlbmRlclRyZWVfcmVzb3VyY2VzJyksICcvZGF0YS9kcnQvRHVtcFJlbmRlclRy ZWVfcmVzb3VyY2VzJykKICAgICAgICAgICAgIHNlbGYuX3B1c2hfdG9fZGV2aWNlKHNlbGYuX3Bv cnQuX2J1aWxkX3BhdGgoJ2FuZHJvaWRfbWFpbl9mb250cy54bWwnKSwgREVWSUNFX0RSVF9ESVIg KyAnYW5kcm9pZF9tYWluX2ZvbnRzLnhtbCcpCiAgICAgICAgICAgICBzZWxmLl9wdXNoX3RvX2Rl dmljZShzZWxmLl9wb3J0Ll9idWlsZF9wYXRoKCdhbmRyb2lkX2ZhbGxiYWNrX2ZvbnRzLnhtbCcp LCBERVZJQ0VfRFJUX0RJUiArICdhbmRyb2lkX2ZhbGxiYWNrX2ZvbnRzLnhtbCcpCiAgICAgICAg ICAgICAjIFZlcnNpb24gY29udHJvbCBvZiB0ZXN0IHJlc291cmNlcyBpcyBkZXBlbmRlbnQgb24g ZXhlY3V0YWJsZXMsCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWRfdW5pdHRlc3QucHkKaW5k ZXggNGYzMzFlNDVjYmQ1YmI3Zjg3MDVlMDQwM2FhYjNkOWQ3ZjA5OWJhYi4uYzliNjkxOTJjYmNi MjUzYWM3MWY5MjRiMDJhOTA3YWEzMmMyNzhmMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkX3VuaXR0ZXN0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5k cm9pZF91bml0dGVzdC5weQpAQCAtMTEyLDYgKzExMiw3IEBAIGNsYXNzIENocm9taXVtQW5kcm9p ZFBvcnRUZXN0KGNocm9taXVtX3BvcnRfdGVzdGNhc2UuQ2hyb21pdW1Qb3J0VGVzdENhc2UpOgog ICAgIGRlZiBtYWtlX3BvcnQoc2VsZiwgKiprd2FyZ3MpOgogICAgICAgICBwb3J0ID0gc3VwZXIo Q2hyb21pdW1BbmRyb2lkUG9ydFRlc3QsIHNlbGYpLm1ha2VfcG9ydCgqKmt3YXJncykKICAgICAg ICAgc2VsZi5tb2NrX3J1bl9jb21tYW5kID0gTW9ja1J1bkNvbW1hbmQoKQorICAgICAgICBzZWxm Lm1vY2tfcnVuX2NvbW1hbmQubW9ja19vbmVfZGV2aWNlKCkKICAgICAgICAgcG9ydC5fZXhlY3V0 aXZlID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49c2VsZi5tb2NrX3J1bl9jb21tYW5k Lm1vY2tfcnVuX2NvbW1hbmRfZm4pCiAgICAgICAgIHJldHVybiBwb3J0CiAKQEAgLTEyOCwxMCAr MTI5LDYgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkUG9ydFRlc3QoY2hyb21pdW1fcG9ydF90ZXN0 Y2FzZS5DaHJvbWl1bVBvcnRUZXN0Q2FzZSk6CiAgICAgICAgICMgdXNpbmcgYSBjdXN0b20gZXhw ZWN0YXRpb25zIGZpbGUuCiAgICAgICAgIHBhc3MKIAotICAgIGRlZiB0ZXN0X2RyaXZlcl9jbWRf bGluZShzZWxmKToKLSAgICAgICAgIyBPdmVycmlkaW5nIFBvcnRUZXN0Q2FzZS50ZXN0X2NtZF9s aW5lKCkuIFVzZSBDaHJvbWl1bUFuZHJvaWREcml2ZXJUZXN0LnRlc3RfY21kX2xpbmUoKSBpbnN0 ZWFkLgotICAgICAgICByZXR1cm4KLQogICAgIGRlZiB0ZXN0X2dldF9kZXZpY2VzX25vX2Rldmlj ZShzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKICAgICAgICAgc2VsZi5t b2NrX3J1bl9jb21tYW5kLm1vY2tfbm9fZGV2aWNlKCkKQEAgLTIzNSw5ICsyMzIsOSBAQCBjbGFz cyBDaHJvbWl1bUFuZHJvaWREcml2ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYg dGVzdF9kcnRfY21kX2xpbmUoc2VsZik6CiAgICAgICAgIGNtZF9saW5lID0gc2VsZi5kcml2ZXIu X2RydF9jbWRfbGluZShUcnVlLCBbJy0tYSddKQogICAgICAgICBzZWxmLmFzc2VydFRydWUoJy0t YScgaW4gY21kX2xpbmUpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnLS1pbi1maWZvPScgKyBj aHJvbWl1bV9hbmRyb2lkLkRSVF9BUFBfRklMRVNfRElSICsgJ0R1bXBSZW5kZXJUcmVlLmluJyBp biBjbWRfbGluZSkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCctLW91dC1maWZvPScgKyBjaHJv bWl1bV9hbmRyb2lkLkRSVF9BUFBfRklMRVNfRElSICsgJ0R1bXBSZW5kZXJUcmVlLm91dCcgaW4g Y21kX2xpbmUpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnLS1lcnItZmlmbz0nICsgY2hyb21p dW1fYW5kcm9pZC5EUlRfQVBQX0ZJTEVTX0RJUiArICdEdW1wUmVuZGVyVHJlZS5lcnInIGluIGNt ZF9saW5lKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoJy0taW4tZmlmbz0nICsgY2hyb21pdW1f YW5kcm9pZC5ERVZJQ0VfRFJUX0RJUiArICdEdW1wUmVuZGVyVHJlZS5pbicgaW4gY21kX2xpbmUp CisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgnLS1vdXQtZmlmbz0nICsgY2hyb21pdW1fYW5kcm9p ZC5ERVZJQ0VfRFJUX0RJUiArICdEdW1wUmVuZGVyVHJlZS5vdXQnIGluIGNtZF9saW5lKQorICAg ICAgICBzZWxmLmFzc2VydFRydWUoJy0tZXJyLWZpZm89JyArIGNocm9taXVtX2FuZHJvaWQuREVW SUNFX0RSVF9ESVIgKyAnRHVtcFJlbmRlclRyZWUuZXJyJyBpbiBjbWRfbGluZSkKIAogICAgIGRl ZiB0ZXN0X3JlYWRfcHJvbXB0KHNlbGYpOgogICAgICAgICBzZWxmLmRyaXZlci5fc2VydmVyX3By b2Nlc3MgPSBkcml2ZXJfdW5pdHRlc3QuTW9ja1NlcnZlclByb2Nlc3MobGluZXM9Wydyb290QGFu ZHJvaWQ6LyAjICddKQo=