131322 2014-04-07 16:01:42 -0700 [iOS] Media controls should resize as the user zooms 2022-10-10 14:37:18 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 131319 1 dino dino ahmad.saleem792 calvaris cdumez commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim jer.noble kondapallykalyan philipj sergio webkit-bug-importer oldest_to_newest 998267 0 dino 2014-04-07 16:01:42 -0700 On iOS we want the media controls to remain at a constant size as the user zooms (or the viewport is set). <rdar://problem/15349818> 998375 1 228793 dino 2014-04-07 19:13:03 -0700 Created attachment 228793 Patch 998377 2 228793 dino 2014-04-07 19:13:43 -0700 Comment on attachment 228793 Patch Wrong patch :| 998380 3 228795 dino 2014-04-07 19:16:40 -0700 Created attachment 228795 Patch 998381 4 dino 2014-04-07 19:17:15 -0700 This patch will not compile without 131319 998661 5 228859 dino 2014-04-08 11:09:13 -0700 Created attachment 228859 Landing Patch 998680 6 228861 dino 2014-04-08 11:46:26 -0700 Created attachment 228861 Landing Patch 2 999324 7 228992 eric.carlson 2014-04-09 15:19:14 -0700 Created attachment 228992 Landing Patch 3 999350 8 228999 eric.carlson 2014-04-09 16:19:17 -0700 Created attachment 228999 Another patch for landing 999358 9 229000 dino 2014-04-09 16:54:53 -0700 Created attachment 229000 Patch THIS WILL WORK 999379 10 229000 commit-queue 2014-04-09 18:06:58 -0700 Comment on attachment 229000 Patch Clearing flags on attachment: 229000 Committed r167057: <http://trac.webkit.org/changeset/167057> 1904624 11 ahmad.saleem792 2022-10-10 14:36:58 -0700 Landed and didn't backed out: https://github.com/WebKit/WebKit/commit/ff603fd36643a06aa4abd949c7892c2e31cb203c Marking this as "RESOLVED FIXED". 1904625 12 webkit-bug-importer 2022-10-10 14:37:18 -0700 <rdar://problem/100997951> 228793 2014-04-07 19:13:03 -0700 2014-04-07 19:13:43 -0700 Patch bug-131322-20140408121241.patch text/plain 8775 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2ODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmFjZDllZTQxMjQ2OGQ0 OTlkOTY2ODAxM2Q3ODk1MTIyNjk1ODY0Mi4uNDZhNjk2ODYwMWUzNmJjMDdkMmIxMmQxZDQ3ZGNk OTRiYThjOTAyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE0LTA0LTA3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBBbGxvdyBlbGVtZW50cyB0byBy ZWdpc3RlciBmb3IgY2hhbmdlcyBpbiBwYWdlIHNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTb21lIHBhcnRzIG9mIFdlYkNvcmUgbmVlZCB0byBy ZWFjdCB0byBjaGFuZ2VzIGluIHRoZSBwYWdlCisgICAgICAgIHNjYWxlIGZhY3Rvciwgc3VjaCBh cyByZXNpemluZyB3aGVuIHRoZSB1c2VyIHpvb21zLiBBIGZvbGxvd3VwCisgICAgICAgIHBhdGNo IHdpbGwgZW5hYmxlIHRoaXMgZm9yIG1lZGlhIGNvbnRyb2xzIC0gdGhpcyBzaW1wbHkgbGF5cwor ICAgICAgICB0aGUgZ3JvdW5kd29yay4KKworICAgICAgICBBdCB0aGUgbW9tZW50IHdlIG9ubHkg YWxsb3cgSFRNTE1lZGlhRWxlbWVudHMgdG8gcmVnaXN0ZXIsIGJ1dCBpZgorICAgICAgICBuZWNl c3NhcnkgdGhpcyBjb3VsZCBiZSBleHBhbmRlZCBpbiB0aGUgZnV0dXJlLgorCisgICAgICAgICog ZG9tL0RvY3VtZW50LmNwcDogTmV3IG1ldGhvZHMgdG8ga2VlcCBhIGxpc3Qgb2YgSFRNTE1lZGlh RWxlbWVudHMgdGhhdAorICAgICAgICBhcmUgaW50ZXJlc3RlZCBpbiB1cGRhdGVzLgorICAgICAg ICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJlZ2lzdGVyRm9yUGFnZVNjYWxlRmFjdG9yQ2hhbmdlZENh bGxiYWNrcyk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6dW5yZWdpc3RlckZvclBhZ2VT Y2FsZUZhY3RvckNoYW5nZWRDYWxsYmFja3MpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6 OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQpOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5oOgorICAg ICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50OjpIVE1MTWVkaWFFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxN ZWRpYUVsZW1lbnQ6OnJlZ2lzdGVyV2l0aERvY3VtZW50KTogQWRkIG91cnNlbHZlcyB0byB0aGUK KyAgICAgICAgdGhlIGRvY3VtZW50J3MgcGFnZVNjYWxlIGNhbGxiYWNrLgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudDo6dW5yZWdpc3RlcldpdGhEb2N1bWVudCk6IFJlbW92ZSBv dXJzZWx2ZXMgZnJvbSB0aGUKKyAgICAgICAgdGhlIGRvY3VtZW50J3MgcGFnZVNjYWxlIGNhbGxi YWNrLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6c2V0TWVkaWFDb250cm9s c0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKTogQWRkIG91cnNlbHZlcyB0bworICAgICAgICB0aGUg Y2FsbGJhY2sgaWYgbmVjZXNzYXJ5LgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVu dDo6cGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCk6IFRoZSBjYWxsYmFjayBmdW5jdGlvbi4gRW1wdHkg Zm9yIG5vdy4KKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuaDoKKyAgICAgICAgKFdl YkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZh Y3Rvcik6IEFjY2Vzc29yLgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpQYWdlOjpzZXRQYWdlU2NhbGVGYWN0b3IpOiBUZWxsIGFsbCBkb2N1bWVudHMgdGhhdCB0 aGUgdXNlciBoYXMgem9vbWVkLgorCiAyMDE0LTA0LTA1ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5n QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgdW51c2VkIHR5cGUgY2FzdGluZyBoZWxwZXJz IGZvciBIVE1MVW5rbm93bkVsZW1lbnQuLi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDFl YjgwOTJiNmIyZjMzNmI5NzJkMTkzNDFiNmYyZmYwMzEwYThlNmQuLjk0MWUxZWVkMzhlYzI1NjQz YThiNDY0MjlmOTk4NDlmMGQ0NzY3ZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNDE5 NSw2ICs0MTk1LDI0IEBAIHZvaWQgRG9jdW1lbnQ6OmNhcHRpb25QcmVmZXJlbmNlc0NoYW5nZWQo KQogfQogI2VuZGlmCiAKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQordm9pZCBE b2N1bWVudDo6cmVnaXN0ZXJGb3JQYWdlU2NhbGVGYWN0b3JDaGFuZ2VkQ2FsbGJhY2tzKEhUTUxN ZWRpYUVsZW1lbnQqIGVsZW1lbnQpCit7CisgICAgbV9wYWdlU2NhbGVGYWN0b3JDaGFuZ2VkRWxl bWVudHMuYWRkKGVsZW1lbnQpOworfQorCit2b2lkIERvY3VtZW50Ojp1bnJlZ2lzdGVyRm9yUGFn ZVNjYWxlRmFjdG9yQ2hhbmdlZENhbGxiYWNrcyhIVE1MTWVkaWFFbGVtZW50KiBlbGVtZW50KQor eworICAgIG1fcGFnZVNjYWxlRmFjdG9yQ2hhbmdlZEVsZW1lbnRzLnJlbW92ZShlbGVtZW50KTsK K30KKwordm9pZCBEb2N1bWVudDo6cGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCgpCit7CisgICAgZm9y IChIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgOiBtX3BhZ2VTY2FsZUZhY3RvckNoYW5n ZWRFbGVtZW50cykKKyAgICAgICAgbWVkaWFFbGVtZW50LT5wYWdlU2NhbGVGYWN0b3JDaGFuZ2Vk KCk7Cit9CisjZW5kaWYKKwogdm9pZCBEb2N1bWVudDo6c2V0U2hvdWxkQ3JlYXRlUmVuZGVyZXJz KGJvb2wgZikKIHsKICAgICBtX2NyZWF0ZVJlbmRlcmVycyA9IGY7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5o CmluZGV4IGYxMWFjZjY4ZGQ5NWFiMWI3MjZjYzZlZjE3YjRjODIxZGE5OGExZmYuLmZhOTBmOGZh MGE0NTlmMGE0N2ViMGY3MjdiY2NiZThhY2Y1YWI2M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBA IC0xMDksNiArMTA5LDcgQEAgY2xhc3MgSFRNTEhlYWRFbGVtZW50OwogY2xhc3MgSFRNTElGcmFt ZUVsZW1lbnQ7CiBjbGFzcyBIVE1MSW1hZ2VFbGVtZW50OwogY2xhc3MgSFRNTE1hcEVsZW1lbnQ7 CitjbGFzcyBIVE1MTWVkaWFFbGVtZW50OwogY2xhc3MgSFRNTE5hbWVDb2xsZWN0aW9uOwogY2xh c3MgSFRNTFNjcmlwdEVsZW1lbnQ7CiBjbGFzcyBIaXRUZXN0UmVxdWVzdDsKQEAgLTEwNDAsNiAr MTA0MSwxMiBAQCBwdWJsaWM6CiAgICAgdm9pZCBjYXB0aW9uUHJlZmVyZW5jZXNDaGFuZ2VkKCk7 CiAjZW5kaWYKIAorI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCisgICAgdm9pZCBy ZWdpc3RlckZvclBhZ2VTY2FsZUZhY3RvckNoYW5nZWRDYWxsYmFja3MoSFRNTE1lZGlhRWxlbWVu dCopOworICAgIHZvaWQgdW5yZWdpc3RlckZvclBhZ2VTY2FsZUZhY3RvckNoYW5nZWRDYWxsYmFj a3MoSFRNTE1lZGlhRWxlbWVudCopOworICAgIHZvaWQgcGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCgp OworI2VuZGlmCisKICNpZiBFTkFCTEUoUEFHRV9WSVNJQklMSVRZX0FQSSkKICAgICB2b2lkIHJl Z2lzdGVyRm9yVmlzaWJpbGl0eVN0YXRlQ2hhbmdlZENhbGxiYWNrcyhFbGVtZW50Kik7CiAgICAg dm9pZCB1bnJlZ2lzdGVyRm9yVmlzaWJpbGl0eVN0YXRlQ2hhbmdlZENhbGxiYWNrcyhFbGVtZW50 Kik7CkBAIC0xNTMxLDYgKzE1MzgsMTAgQEAgcHJpdmF0ZToKICAgICBIYXNoU2V0PEVsZW1lbnQq PiBtX2NhcHRpb25QcmVmZXJlbmNlc0NoYW5nZWRFbGVtZW50czsKICNlbmRpZgogCisjaWYgRU5B QkxFKE1FRElBX0NPTlRST0xTX1NDUklQVCkKKyAgICBIYXNoU2V0PEhUTUxNZWRpYUVsZW1lbnQq PiBtX3BhZ2VTY2FsZUZhY3RvckNoYW5nZWRFbGVtZW50czsKKyNlbmRpZgorCiAjaWYgRU5BQkxF KFBBR0VfVklTSUJJTElUWV9BUEkpCiAgICAgSGFzaFNldDxFbGVtZW50Kj4gbV92aXNpYmlsaXR5 U3RhdGVDYWxsYmFja0VsZW1lbnRzOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcAppbmRleCA5NjVmNzU5MmQ3Zjk0M2I3NmE5NTBhMjMxZTY2MjAxYWUzZWU0 MzFiLi5lZjEwZjkwMjBmZTA2YjNiZjkxOTQ2MDkxM2EzMWQ2NTkyYWI3OGZhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTMzMCw2ICszMzAsOSBAQCBIVE1M TWVkaWFFbGVtZW50OjpIVE1MTWVkaWFFbGVtZW50KGNvbnN0IFF1YWxpZmllZE5hbWUmIHRhZ05h bWUsIERvY3VtZW50JiBkb2N1bQogI2lmIFBMQVRGT1JNKElPUykKICAgICAsIG1fcmVxdWVzdGlu Z1BsYXkoZmFsc2UpCiAjZW5kaWYKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQor ICAgICwgbV9tZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoZmFsc2UpCisjZW5k aWYKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAgICAgLCBtX3RyYWNrc0FyZVJlYWR5KHRydWUp CiAgICAgLCBtX2hhdmVWaXNpYmxlVGV4dFRyYWNrKGZhbHNlKQpAQCAtNDQ5LDYgKzQ1MiwxMSBA QCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnJlZ2lzdGVyV2l0aERvY3VtZW50KERvY3VtZW50JiBk b2N1bWVudCkKICAgICBkb2N1bWVudC5yZWdpc3RlckZvckNhcHRpb25QcmVmZXJlbmNlc0NoYW5n ZWRDYWxsYmFja3ModGhpcyk7CiAjZW5kaWYKIAorI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19T Q1JJUFQpCisgICAgaWYgKG1fbWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKQor ICAgICAgICBkb2N1bWVudC5yZWdpc3RlckZvclBhZ2VTY2FsZUZhY3RvckNoYW5nZWRDYWxsYmFj a3ModGhpcyk7CisjZW5kaWYKKwogICAgIGFkZEVsZW1lbnRUb0RvY3VtZW50TWFwKCp0aGlzLCBk b2N1bWVudCk7CiB9CiAKQEAgLTQ2OSw2ICs0NzcsMTEgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50 Ojp1bnJlZ2lzdGVyV2l0aERvY3VtZW50KERvY3VtZW50JiBkb2N1bWVudCkKICAgICBkb2N1bWVu dC51bnJlZ2lzdGVyRm9yQ2FwdGlvblByZWZlcmVuY2VzQ2hhbmdlZENhbGxiYWNrcyh0aGlzKTsK ICNlbmRpZgogCisjaWYgRU5BQkxFKE1FRElBX0NPTlRST0xTX1NDUklQVCkKKyAgICBpZiAobV9t ZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IpCisgICAgICAgIGRvY3VtZW50LnVu cmVnaXN0ZXJGb3JQYWdlU2NhbGVGYWN0b3JDaGFuZ2VkQ2FsbGJhY2tzKHRoaXMpOworI2VuZGlm CisKICAgICByZW1vdmVFbGVtZW50RnJvbURvY3VtZW50TWFwKCp0aGlzLCBkb2N1bWVudCk7CiB9 CiAKQEAgLTU5NzQsNiArNTk4NywyNCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRpZEFkZFVz ZXJBZ2VudFNoYWRvd1Jvb3QoU2hhZG93Um9vdCogcm9vdCkKICAgICBpZiAoZXhlYy0+aGFkRXhj ZXB0aW9uKCkpCiAgICAgICAgIGV4ZWMtPmNsZWFyRXhjZXB0aW9uKCk7CiB9CisKK3ZvaWQgSFRN TE1lZGlhRWxlbWVudDo6c2V0TWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKGJv b2wgZGVwZW5kc09uUGFnZVNjYWxlKQoreworICAgIExPRyhNZWRpYSwgIk1lZGlhRWxlbWVudDo6 c2V0TWVkaWFDb250cm9sc0RlcGVuZFBhZ2VTY2FsZUZhY3RvciA9ICVzIiwgYm9vbFN0cmluZyhk ZXBlbmRzT25QYWdlU2NhbGUpKTsKKyAgICBpZiAobV9tZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdl U2NhbGVGYWN0b3IgPT0gZGVwZW5kc09uUGFnZVNjYWxlKQorICAgICAgICByZXR1cm47CisKKyAg ICBtX21lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvciA9IGRlcGVuZHNPblBhZ2VT Y2FsZTsKKworICAgIGlmIChtX21lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvcikK KyAgICAgICAgZG9jdW1lbnQoKS5yZWdpc3RlckZvclBhZ2VTY2FsZUZhY3RvckNoYW5nZWRDYWxs YmFja3ModGhpcyk7CisgICAgZWxzZQorICAgICAgICBkb2N1bWVudCgpLnVucmVnaXN0ZXJGb3JQ YWdlU2NhbGVGYWN0b3JDaGFuZ2VkQ2FsbGJhY2tzKHRoaXMpOworfQorCit2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQoKQoreworfQogI2VuZGlmIC8vIEVOQUJM RShNRURJQV9DT05UUk9MU19TQ1JJUFQpCiAKIHVuc2lnbmVkIGxvbmcgbG9uZyBIVE1MTWVkaWFF bGVtZW50OjpmaWxlU2l6ZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5oCmluZGV4IDQ1Y2MwOTA2OWRlOGJiMjJjOWQ4MzhlYzBkOTk2MDg0YzQ0MGJkZTcuLjY3ODRl MTVlNjUzNjVkMTZiNmQxODE3NGM4YjNlMjdiOWM3ZDViY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5oCkBAIC00NTYsNiArNDU2LDEwIEBAIHB1YmxpYzoKICAgICBNZWRp YVBsYXllcjo6UHJlbG9hZCBwcmVsb2FkVmFsdWUoKSBjb25zdCB7IHJldHVybiBtX3ByZWxvYWQ7 IH0KICAgICBIVE1MTWVkaWFTZXNzaW9uJiBtZWRpYVNlc3Npb24oKSBjb25zdCB7IHJldHVybiAq bV9tZWRpYVNlc3Npb247IH0KIAorI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCisg ICAgdm9pZCBwYWdlU2NhbGVGYWN0b3JDaGFuZ2VkKCk7CisjZW5kaWYKKwogcHJvdGVjdGVkOgog ICAgIEhUTUxNZWRpYUVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50JiwgYm9v bCk7CiAgICAgdmlydHVhbCB+SFRNTE1lZGlhRWxlbWVudCgpOwpAQCAtNDgyLDYgKzQ4NiwxMSBA QCBwcm90ZWN0ZWQ6CiAKICAgICB2aXJ0dWFsIFJlbmRlclB0cjxSZW5kZXJFbGVtZW50PiBjcmVh dGVFbGVtZW50UmVuZGVyZXIoUGFzc1JlZjxSZW5kZXJTdHlsZT4pIG92ZXJyaWRlOwogCisjaWYg RU5BQkxFKE1FRElBX0NPTlRST0xTX1NDUklQVCkKKyAgICBib29sIG1lZGlhQ29udHJvbHNEZXBl bmRPblBhZ2VTY2FsZUZhY3RvcigpIGNvbnN0IHsgcmV0dXJuIG1fbWVkaWFDb250cm9sc0RlcGVu ZE9uUGFnZVNjYWxlRmFjdG9yOyB9CisgICAgdm9pZCBzZXRNZWRpYUNvbnRyb2xzRGVwZW5kT25Q YWdlU2NhbGVGYWN0b3IoYm9vbCk7CisjZW5kaWYKKwogcHJpdmF0ZToKICAgICB2b2lkIGNyZWF0 ZU1lZGlhUGxheWVyKCk7CiAKQEAgLTgyOCw2ICs4MzcsMTAgQEAgcHJpdmF0ZToKICAgICBib29s IG1fcmVxdWVzdGluZ1BsYXkgOiAxOwogI2VuZGlmCiAKKyNpZiBFTkFCTEUoTUVESUFfQ09OVFJP TFNfU0NSSVBUKQorICAgIGJvb2wgbV9tZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0 b3IgOiAxOworI2VuZGlmCisKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAgICAgYm9vbCBtX3Ry YWNrc0FyZVJlYWR5IDogMTsKICAgICBib29sIG1faGF2ZVZpc2libGVUZXh0VHJhY2sgOiAxOwpA QCAtODc3LDYgKzg5MCw3IEBAIHByaXZhdGU6CiAgICAgc2l6ZV90IG1fcmVwb3J0ZWRFeHRyYU1l bW9yeUNvc3Q7CiAKICNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQorICAgIGZyaWVu ZCBjbGFzcyBNZWRpYUNvbnRyb2xzSG9zdDsKICAgICBSZWZQdHI8TWVkaWFDb250cm9sc0hvc3Q+ IG1fbWVkaWFDb250cm9sc0hvc3Q7CiAgICAgUmVmUHRyPERPTVdyYXBwZXJXb3JsZD4gbV9pc29s YXRlZFdvcmxkOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAppbmRleCAyNWY3NjdhZTkxNzc0MDZk YTYyODkxZDM0MTExZTdkYzQ0NDk2ODZiLi4zYzI0YzA2YTFhYTVjNmQwMTk1YjFiZjRjNmJhMjhj MTI1MzA3NDdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTczMCw2ICs3MzAsMTEgQEAgdm9pZCBQ YWdlOjpzZXRQYWdlU2NhbGVGYWN0b3IoZmxvYXQgc2NhbGUsIGNvbnN0IEludFBvaW50JiBvcmln aW4pCiAgICAgICAgIGlmICghdmlldy0+ZGVsZWdhdGVzU2Nyb2xsaW5nKCkpCiAgICAgICAgICAg ICB2aWV3LT5zZXRTY3JvbGxQb3NpdGlvbihvcmlnaW4pOwogICAgIH0KKworI2lmIEVOQUJMRShN RURJQV9DT05UUk9MU19TQ1JJUFQpCisgICAgZm9yIChGcmFtZSogZnJhbWUgPSAmbWFpbkZyYW1l KCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0KCkpCisgICAgICAg IGZyYW1lLT5kb2N1bWVudCgpLT5wYWdlU2NhbGVGYWN0b3JDaGFuZ2VkKCk7CisjZW5kaWYKIH0K IAogdm9pZCBQYWdlOjpzZXREZXZpY2VTY2FsZUZhY3RvcihmbG9hdCBzY2FsZUZhY3RvcikK 228795 2014-04-07 19:16:40 -0700 2014-04-07 20:12:33 -0700 Patch bug-131322-20140408121618.patch text/plain 14235 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2ODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDZhNjk2ODYwMWUzNmJj MDdkMmIxMmQxZDQ3ZGNkOTRiYThjOTAyMC4uNzA2YTgyMWI0ZTgxNTYxZTE1YWYyZWVlYTZhMTRi NDVmNzc3ZjU3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ2IEBACiAyMDE0LTA0LTA3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAorICAgICAgICBbaU9TXSBNZWRpYSBjb250cm9s cyBzaG91bGQgcmVzaXplIGFzIHRoZSB1c2VyIHpvb21zCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMjIKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbiBpT1MgdGhlIG1lZGlhIGNvbnRyb2xzIHNob3Vs ZCByZW1haW4gdGhlIHNhbWUgc2l6ZQorICAgICAgICBpbmRlcGVuZGVudCBvZiB1c2VyIHpvb20u IEhhdmUgdGhlIEhUTUxNZWRpYUVsZW1lbnQgb3B0aW9uYWxseQorICAgICAgICByZWdpc3RlciBm b3IgdXBkYXRlcyBpbiB0aGUgcGFnZSBzY2FsZSB0byBhcHBseSBhbiBpbnZlcnNlCisgICAgICAg IHNjYWxlLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNI b3N0LmNwcDogTmV3IGV4cG9zZWQgcHJvcGVydHkgdGhhdCBjYWxscworICAgICAgICBiYWNrIGlu dG8gSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9y LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sc0hvc3Q6OmNvbnRyb2xzRGVwZW5kT25Q YWdlU2NhbGVGYWN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sc0hvc3Q6OnNl dENvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IpOgorICAgICAgICAqIE1vZHVsZXMvbWVk aWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5oOiBLZWVwIGEgcmVmZXJlbmNlIHRvIHRoZSBh Y3R1YWwKKyAgICAgICAgY29udHJvbHMgZnJvbSB0aGUgSmF2YVNjcmlwdCBzaWRlIHNvIHdlIGNh biB0YWxrIHRvIGl0IGxhdGVyLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sc0hvc3Q6 OmNvbnRyb2xsZXJKU1ZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0 OjpzZXRDb250cm9sbGVySlNWYWx1ZSk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xz L01lZGlhQ29udHJvbHNIb3N0LmlkbDogRXhwb3NlIGNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVG YWN0b3IuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lP Uy5jc3M6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCk6IFNw ZWNpZnkgdGhlIHRyYW5zZm9ybSBvcmlnaW4gc28gdGhhdAorICAgICAgICBzY2FsaW5nIHdpbGwg a2VlcCB0aGUgY29udHJvbHMgcGlubmVkIHRvIHRoZSBib3R0b20gbGVmdCBjb3JuZXIuCisgICAg ICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zdGFydC1wbGF5YmFjay1idXR0b24p OiBVcGRhdGUgdG8gdGhlIGNvcnJlY3Qgc2l6ZQorICAgICAgICBhbmQgcHJvdmlkZSBuZXcgYXJ0 d29yay4KKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXN0YXJ0LXBsYXli YWNrLWJ1dHRvbi5mYWlsZWQpOiBOZXcgYXJ0d29yay4KKyAgICAgICAgKiBNb2R1bGVzL21lZGlh Y29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5qczoKKyAgICAgICAgKENvbnRyb2xsZXJJT1MpOiBU ZWxsIHRoZSBob3N0IHRoYXQgdGhlc2UgY29udHJvbHMgY2FyZSBhYm91dCB0aGUgcGFnZSBzY2Fs ZS4KKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLmdldCBwYWdlU2NhbGVGYWN0b3Ip OiBOZXcgZ2V0dGVyLgorICAgICAgICAoQ29udHJvbGxlcklPUy5wcm90b3R5cGUuc2V0IHBhZ2VT Y2FsZUZhY3Rvcik6IFdoZW4gc2V0LCB1cGRhdGUgdGhlIHBsYXkgYnV0dG9uIGFuZCB0aGUgcGFu ZWwuCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudDo6ZW5zdXJlTWVkaWFDb250cm9sc0luamVjdGVkU2NyaXB0 KTogU21hbGwgbmFtaW5nIGNsZWFudXAuCisgICAgICAgIChzZXRQYWdlU2NhbGVGYWN0b3JQcm9w ZXJ0eSk6IFN0YXRpYyBoZWxwZXIgdG8gc2V0IGEgSlMgcHJvcGVydHkgdmFsdWUuCisgICAgICAg IChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjpkaWRBZGRVc2VyQWdlbnRTaGFkb3dSb290KTog S2VlcCBhIHJlZmVyZW5jZSB0byB0aGUgY29udHJvbHMgb2JqZWN0LAorICAgICAgICBhbmQgbWFr ZSBzdXJlIHRvIHNldCB0aGUgcGFnZSBzY2FsZSBmYWN0b3Igb24gdGhlIGNvbnRyb2xzLgorICAg ICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCk6 IEltcGxlbWVudCB0aGUgY2FsbGJhY2ssIHRlbGxpbmcKKyAgICAgICAgdGhlIGNvbnRyb2xzIG9i amVjdCB0aGF0IGl0IG5lZWRzIHRvIHJlbGF5b3V0LgorCisyMDE0LTA0LTA3ICBEZWFuIEphY2tz b24gIDxkaW5vQGFwcGxlLmNvbT4KKwogICAgICAgICBBbGxvdyBlbGVtZW50cyB0byByZWdpc3Rl ciBmb3IgY2hhbmdlcyBpbiBwYWdlIHNjYWxlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMTkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHAKaW5kZXggNzdh NzZlYTk4YWZhMDA1OWVkM2YwODczYWQ1M2M5YmY3MjY3ZjdmYy4uZmIyZGNiODgyZWRlNDY0ZWUw YTNlNzJmNGUxZjY5ZGFmNDQ1Nzc5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwCkBAIC0yMTQsNyAr MjE0LDE3IEBAIFN0cmluZyBNZWRpYUNvbnRyb2xzSG9zdDo6ZXh0ZXJuYWxEZXZpY2VUeXBlKCkg Y29uc3QKICAgICAKICAgICByZXR1cm4gdHlwZTsKIH0KLSAgICAKKworYm9vbCBNZWRpYUNvbnRy b2xzSG9zdDo6Y29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvcigpIGNvbnN0Cit7CisgICAg cmV0dXJuIG1fbWVkaWFFbGVtZW50LT5tZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0 b3IoKTsKK30KKwordm9pZCBNZWRpYUNvbnRyb2xzSG9zdDo6c2V0Q29udHJvbHNEZXBlbmRPblBh Z2VTY2FsZUZhY3Rvcihib29sIHZhbHVlKQoreworICAgIG1fbWVkaWFFbGVtZW50LT5zZXRNZWRp YUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IodmFsdWUpOworfQorCiB9CiAKICNlbmRp ZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlh Q29udHJvbHNIb3N0LmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVk aWFDb250cm9sc0hvc3QuaAppbmRleCAzMDY2ODY0OTNmNzJlNjJjZDEyMjVjNjBiM2QwY2ZhODFi YjYzOTFmLi4xMzlmNmNkODdmOWQwY2NmZjMyZTE1NDdkMDYxOTU4MjRlMTNjYzk4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hv c3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250 cm9sc0hvc3QuaApAQCAtMjksNiArMjksNyBAQAogI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19T Q1JJUFQpCiAKICNpbmNsdWRlICJTY3JpcHRTdGF0ZS5oIgorI2luY2x1ZGUgPGJpbmRpbmdzL1Nj cmlwdE9iamVjdC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAjaW5jbHVkZSA8d3Rm L1ZlY3Rvci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgpAQCAtNjUsMTEgKzY2 LDE4IEBAIHB1YmxpYzoKICAgICBTdHJpbmcgZXh0ZXJuYWxEZXZpY2VEaXNwbGF5TmFtZSgpIGNv bnN0OwogICAgIFN0cmluZyBleHRlcm5hbERldmljZVR5cGUoKSBjb25zdDsKIAorICAgIGJvb2wg Y29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvcigpIGNvbnN0OworICAgIHZvaWQgc2V0Q29u dHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rvcihib29sIHYpOworCisgICAgSlNDOjpKU1ZhbHVl IGNvbnRyb2xsZXJKU1ZhbHVlKCkgY29uc3QgeyByZXR1cm4gbV9jb250cm9sbGVyOyB9CisgICAg dm9pZCBzZXRDb250cm9sbGVySlNWYWx1ZShKU0M6OkpTVmFsdWUgY29udHJvbGxlcikgeyBtX2Nv bnRyb2xsZXIgPSBjb250cm9sbGVyOyB9CisKIHByaXZhdGU6CiAgICAgTWVkaWFDb250cm9sc0hv c3QoSFRNTE1lZGlhRWxlbWVudCopOwogCiAgICAgSFRNTE1lZGlhRWxlbWVudCogbV9tZWRpYUVs ZW1lbnQ7CiAgICAgUmVmUHRyPE1lZGlhQ29udHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQ+ IG1fdGV4dFRyYWNrQ29udGFpbmVyOworICAgIEpTQzo6SlNWYWx1ZSBtX2NvbnRyb2xsZXI7CiB9 OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMv TWVkaWFDb250cm9sc0hvc3QuaWRsIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRy b2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbAppbmRleCBiOGNjMDg2MDBjY2FjNmU5Y2UxOGQ2OGM2 YjVkZmQyOWVmNDk0ZWE1Li5kN2E2OGQ3NTBkYTU2OTVkMjg5M2VjYzc1NDQ0OWJlZjVlYjZlNjcw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFD b250cm9sc0hvc3QuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9s cy9NZWRpYUNvbnRyb2xzSG9zdC5pZGwKQEAgLTQ4LDQgKzQ4LDYgQEAgZW51bSBEZXZpY2VUeXBl IHsKIAogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgZXh0ZXJuYWxEZXZpY2VEaXNw bGF5TmFtZTsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgRGV2aWNlVHlwZSBleHRlcm5hbERldmlj ZVR5cGU7CisKKyAgICBhdHRyaWJ1dGUgYm9vbGVhbiBjb250cm9sc0RlcGVuZE9uUGFnZVNjYWxl RmFjdG9yOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250 cm9scy9tZWRpYUNvbnRyb2xzaU9TLmNzcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFj b250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmNzcwppbmRleCBkYTcyNzJhNjQ1MmNlYmY1YmJlN2Y3 MjE2YjkxMzkzYTc2YmZkOGQxLi5lNmU4NjEwYTRhYzllZWEyYTViZWUxYWJlZmJlOWMyNDQ5ZmRk NjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVk aWFDb250cm9sc2lPUy5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRy b2xzL21lZGlhQ29udHJvbHNpT1MuY3NzCkBAIC0xMjEsNiArMTIxLDcgQEAgYXVkaW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtcGFuZWwgewogICAgIC13ZWJraXQtdXNlci1zZWxlY3Q6IG5vbmU7 CiAKICAgICB0cmFuc2l0aW9uOiBvcGFjaXR5IDAuMjVzIGxpbmVhcjsKKyAgICAtd2Via2l0LXRy YW5zZm9ybS1vcmlnaW46IGJvdHRvbSBsZWZ0OwogfQogCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy1wYW5lbCB7CkBAIC0xNTQsMTkgKzE1NSwxOSBAQCBhdWRpbzo6LXdlYmtpdC1tZWRp YS1jb250cm9scy1zdGFydC1wbGF5YmFjay1idXR0b24gewogICAgIHBhZGRpbmc6IDA7CiAgICAg Ym9yZGVyOiAwOwogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKLSAgICB3aWR0aDogMTUwcHg7Ci0g ICAgaGVpZ2h0OiAxNTBweDsKLSAgICBsZWZ0OiBjYWxjKDUwJSAtIDc1cHgpOwotICAgIHRvcDog Y2FsYyg1MCUgLSA3NXB4KTsKKyAgICB3aWR0aDogNzJweDsKKyAgICBoZWlnaHQ6IDcycHg7Cisg ICAgbGVmdDogY2FsYyg1MCUgLSAzNnB4KTsKKyAgICB0b3A6IGNhbGMoNTAlIC0gMzZweCk7CiAg ICAgYmFja2dyb3VuZC1vcmlnaW46IGNvbnRlbnQtYm94OwogICAgIGJhY2tncm91bmQtcmVwZWF0 OiBuby1yZXBlYXQ7CiAgICAgYmFja2dyb3VuZC1wb3NpdGlvbjogY2VudGVyOwotICAgIGJhY2tn cm91bmQtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1sLDxzdmcgd2lkdGg9IjE0MCIgaGVp Z2h0PSIxNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGNpcmNsZSByPSI3 MCIgY3k9IjcwIiBjeD0iNzAiIGZpbGw9InJnYmEoMjQ3LCAyNDcsIDI0NywgLjgyKSIvPjxwYXRo IGQ9Ik0gNDgsMzQgdiA3MiBsIDYyLC0zNS41IHoiIGZpbGw9InJnYmEoMTI5LCAxMjksIDEyOSwg LjkpIi8+PC9zdmc+Jyk7CisgICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3N2 Zyt4bWwsPHN2ZyB2aWV3Qm94PSIwIDAgMTQ0IDE0NCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3Jn LzIwMDAvc3ZnIj48Y2lyY2xlIGN4PSI3MiIgY3k9IjcyIiByPSI3MCIgZmlsbD0icmdiYSgyNDcs IDI0NywgMjQ3LCAuODIpIi8+PHBhdGggZD0iTTQ4LDM2djc0TDEwOSw3NEw0OCwzNnoiIGZpbGw9 InJnYmEoMTI5LCAxMjksIDEyOSwgLjkpIi8+PC9zdmc+Jyk7CiB9CiAKIHZpZGVvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXN0YXJ0LXBsYXliYWNrLWJ1dHRvbi5mYWlsZWQsCiBhdWRpbzo6LXdl YmtpdC1tZWRpYS1jb250cm9scy1zdGFydC1wbGF5YmFjay1idXR0b24uZmFpbGVkIHsKLSAgICBi YWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHdpZHRoPSIxNDAi IGhlaWdodD0iMTQwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxjaXJjbGUg cj0iNzAiIGN5PSI3MCIgY3g9IjcwIiBmaWxsPSJyZ2JhKDI0NywgMjQ3LCAyNDcsIC44MikiLz48 ZyBmaWxsPSJyZ2JhKDEyOSwgMTI5LCAxMjksIC45KSI+PHBhdGggZD0iTSA0OCwzNCB2IDE3IGwg NDcsMjggbCAxNSwtOC41IHoiLz48cGF0aCBkPSJNIDE2LDM2IGwgMTEwLDY0IGwgLTIsNCBsIC0x MTAsLTY0IHoiLz48cGF0aCBkPSJNIDQ4LDYzIHYgNDMgbCAzNywtMjEuNSB6Ii8+PC9nPjwvc3Zn PicpOworICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1sLDxzdmcg dmlld0JveD0iMCAwIDE0NCAxNDQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+ PGNpcmNsZSBjeD0iNzIiIGN5PSI3MiIgcj0iNzAiIGZpbGw9InJnYmEoMjQ3LCAyNDcsIDI0Nywg LjgyKSIvPjxnIGZpbGw9InJnYmEoMTI5LCAxMjksIDEyOSwgLjkpIj48cmVjdCB4PSIxNCIgeT0i NzAuNCIgdHJhbnNmb3JtPSJtYXRyaXgoMC44NDkzIDAuNTI3OSAtMC41Mjc5IDAuODQ5MyA0OC44 NjE0IC0yNy4xNTk1KSIgd2lkdGg9IjExNiIgaGVpZ2h0PSIzLjIiLz48cG9seWdvbiBwb2ludHM9 IjEwOSw3NCA0OCwzNiA0OCw1Mi4zIDk1LjYsODEuOSAiLz48cG9seWdvbiBwb2ludHM9IjQ4LDEx MCA4Ny43LDg2LjYgNDgsNjEuOSAiLz48L2c+PC9zdmc+Jyk7CiB9CiAKIHZpZGVvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXBsYXktYnV0dG9uLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanMgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5qcwppbmRleCBiZDI3MWVm OWQyMzlhNjQxMGE0OGVlZmE2MWJhOTZiMDg4OTE3ZjVkLi5hY2ZiMWFhZGJkZGUyZjQ0YzdmNzZi ZmJmMTI4OWZiMTgzZTQ1YTk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5qcwpAQCAtNiwxMCArNiwxMyBAQCBm dW5jdGlvbiBjcmVhdGVDb250cm9scyhyb290LCB2aWRlbywgaG9zdCkKIGZ1bmN0aW9uIENvbnRy b2xsZXJJT1Mocm9vdCwgdmlkZW8sIGhvc3QpCiB7CiAgICAgdGhpcy5oYXNXaXJlbGVzc1BsYXli YWNrVGFyZ2V0cyA9IGZhbHNlOworICAgIHRoaXMuX3BhZ2VTY2FsZUZhY3RvciA9IDE7CiAgICAg Q29udHJvbGxlci5jYWxsKHRoaXMsIHJvb3QsIHZpZGVvLCBob3N0KTsKIAogICAgIHRoaXMudXBk YXRlV2lyZWxlc3NUYXJnZXRBdmFpbGFibGUoKTsKICAgICB0aGlzLnVwZGF0ZVdpcmVsZXNzUGxh eWJhY2tTdGF0dXMoKTsKKworICAgIGhvc3QuY29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rv ciA9IHRydWU7CiB9OwogCiAvKiBFbnVtcyAqLwpAQCAtNDAzLDYgKzQwNiwyNSBAQCBDb250cm9s bGVySU9TLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy52aWRlby53ZWJraXRTaG93UGxheWJh Y2tUYXJnZXRQaWNrZXIoKTsKICAgICAgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CiAgICAg fSwKKworICAgIGdldCBwYWdlU2NhbGVGYWN0b3IoKSB7CisgICAgICAgIHJldHVybiB0aGlzLl9w YWdlU2NhbGVGYWN0b3I7CisgICAgfSwKKworICAgIHNldCBwYWdlU2NhbGVGYWN0b3IobmV3U2Nh bGVGYWN0b3IpIHsKKyAgICAgICAgdGhpcy5fcGFnZVNjYWxlRmFjdG9yID0gbmV3U2NhbGVGYWN0 b3I7CisKKyAgICAgICAgaWYgKG5ld1NjYWxlRmFjdG9yKSB7CisgICAgICAgICAgICB2YXIgc2Nh bGVUcmFuc2Zvcm0gPSAic2NhbGUoIiArICgxIC8gbmV3U2NhbGVGYWN0b3IpICsgIikiOworICAg ICAgICAgICAgaWYgKHRoaXMuY29udHJvbHMuc3RhcnRQbGF5YmFja0J1dHRvbikKKyAgICAgICAg ICAgICAgICB0aGlzLmNvbnRyb2xzLnN0YXJ0UGxheWJhY2tCdXR0b24uc3R5bGUud2Via2l0VHJh bnNmb3JtID0gc2NhbGVUcmFuc2Zvcm07CisgICAgICAgICAgICBpZiAodGhpcy5jb250cm9scy5w YW5lbCkgeworICAgICAgICAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwuc3R5bGUud2lkdGgg PSAobmV3U2NhbGVGYWN0b3IgKiAxMDApICsgIiUiOworICAgICAgICAgICAgICAgIHRoaXMuY29u dHJvbHMucGFuZWwuc3R5bGUud2Via2l0VHJhbnNmb3JtID0gc2NhbGVUcmFuc2Zvcm07CisgICAg ICAgICAgICAgICAgdGhpcy51cGRhdGVQcm9ncmVzcygpOworICAgICAgICAgICAgfQorICAgICAg ICB9CisgICAgfQogfTsKIAogT2JqZWN0LmNyZWF0ZShDb250cm9sbGVyLnByb3RvdHlwZSkuZXh0 ZW5kKENvbnRyb2xsZXJJT1MucHJvdG90eXBlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCmluZGV4IGVmMTBmOTAyMGZlMDZiM2JmOTE5NDYwOTEzYTMxZDY1OTJhYjc4 ZmEuLjk3NWVkNGRmMTVjYmJiMWM1ODIyMzUwOWIyZjE3NzhkMDhjZTBlMTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtNTkxMSw2ICs1OTExLDcgQEAgRE9N V3JhcHBlcldvcmxkJiBIVE1MTWVkaWFFbGVtZW50OjplbnN1cmVJc29sYXRlZFdvcmxkKCkKIAog Ym9vbCBIVE1MTWVkaWFFbGVtZW50OjplbnN1cmVNZWRpYUNvbnRyb2xzSW5qZWN0ZWRTY3JpcHQo KQogeworICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlhQ29udHJv bHNJbmplY3RlZFNjcmlwdCIpOwogICAgIFBhZ2UqIHBhZ2UgPSBkb2N1bWVudCgpLnBhZ2UoKTsK ICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTU5MjQsOCArNTkyNSw4 IEBAIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6ZW5zdXJlTWVkaWFDb250cm9sc0luamVjdGVkU2Ny aXB0KCkKICAgICBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gSlNDOjpqc0Nhc3Q8 SlNET01HbG9iYWxPYmplY3QqPihzY3JpcHRDb250cm9sbGVyLmdsb2JhbE9iamVjdCh3b3JsZCkp OwogICAgIEpTQzo6RXhlY1N0YXRlKiBleGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7 CiAKLSAgICBKU0M6OkpTVmFsdWUgb3ZlcmxheVZhbHVlID0gZ2xvYmFsT2JqZWN0LT5nZXQoZXhl YywgSlNDOjpJZGVudGlmaWVyKGV4ZWMsICJjcmVhdGVDb250cm9scyIpKTsKLSAgICBpZiAob3Zl cmxheVZhbHVlLmlzRnVuY3Rpb24oKSkKKyAgICBKU0M6OkpTVmFsdWUgZnVuY3Rpb25WYWx1ZSA9 IGdsb2JhbE9iamVjdC0+Z2V0KGV4ZWMsIEpTQzo6SWRlbnRpZmllcihleGVjLCAiY3JlYXRlQ29u dHJvbHMiKSk7CisgICAgaWYgKGZ1bmN0aW9uVmFsdWUuaXNGdW5jdGlvbigpKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKIAogI2lmbmRlZiBOREVCVUcKQEAgLTU5NDMsOCArNTk0NCwxNiBAQCBib29s IEhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlhQ29udHJvbHNJbmplY3RlZFNjcmlwdCgpCiAg ICAgcmV0dXJuIHRydWU7CiB9CiAKK3N0YXRpYyB2b2lkIHNldFBhZ2VTY2FsZUZhY3RvclByb3Bl cnR5KEpTQzo6RXhlY1N0YXRlKiBleGVjLCBKU0M6OkpTVmFsdWUgY29udHJvbGxlclZhbHVlLCBm bG9hdCBwYWdlU2NhbGVGYWN0b3IpCit7CisgICAgSlNDOjpQdXRQcm9wZXJ0eVNsb3QgcHJvcGVy dHlTbG90KGNvbnRyb2xsZXJWYWx1ZSk7CisgICAgSlNDOjpKU09iamVjdCogY29udHJvbGxlck9i amVjdCA9IGNvbnRyb2xsZXJWYWx1ZS50b09iamVjdChleGVjKTsKKyAgICBjb250cm9sbGVyT2Jq ZWN0LT5tZXRob2RUYWJsZSgpLT5wdXQoY29udHJvbGxlck9iamVjdCwgZXhlYywgSlNDOjpJZGVu dGlmaWVyKGV4ZWMsICJwYWdlU2NhbGVGYWN0b3IiKSwgSlNDOjpqc051bWJlcihwYWdlU2NhbGVG YWN0b3IpLCBwcm9wZXJ0eVNsb3QpOworfQorCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRpZEFk ZFVzZXJBZ2VudFNoYWRvd1Jvb3QoU2hhZG93Um9vdCogcm9vdCkKIHsKKyAgICBMT0coTWVkaWEs ICJIVE1MTWVkaWFFbGVtZW50OjpkaWRBZGRVc2VyQWdlbnRTaGFkb3dSb290Iik7CiAjaWYgRU5B QkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8pCiAgICAgLy8gSmF2YVNjcmlwdCBjb250cm9scyBh cmUgbm90IGVuYWJsZWQgd2l0aCB0aGUgdmlkZW8gcGx1Z2luIHByb3h5LgogICAgIGlmIChzaG91 bGRVc2VWaWRlb1BsdWdpblByb3h5KCkpCkBAIC01OTY0LDkgKzU5NzMsMTcgQEAgdm9pZCBIVE1M TWVkaWFFbGVtZW50OjpkaWRBZGRVc2VyQWdlbnRTaGFkb3dSb290KFNoYWRvd1Jvb3QqIHJvb3Qp CiAgICAgSlNDOjpFeGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKTsK ICAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKGV4ZWMpOwogCi0gICAgLy8gSXQgaXMgZXhwZWN0 ZWQgdGhlIEpTIGZpbGUgcHJvdmlkZXMgYSBjcmVhdGVDb250cm9scyhzaGFkb3dSb290LCB2aWRl bywgbWVkaWFDb250cm9sc0hvc3QpIGZ1bmN0aW9uLgotICAgIEpTQzo6SlNWYWx1ZSBvdmVybGF5 VmFsdWUgPSBnbG9iYWxPYmplY3QtPmdldChleGVjLCBKU0M6OklkZW50aWZpZXIoZXhlYywgImNy ZWF0ZUNvbnRyb2xzIikpOwotICAgIGlmIChvdmVybGF5VmFsdWUuaXNVbmRlZmluZWRPck51bGwo KSkKKyAgICAvLyBUaGUgbWVkaWEgY29udHJvbHMgc2NyaXB0IG11c3QgcHJvdmlkZSBhIG1ldGhv ZCB3aXRoIHRoZSBmb2xsb3dpbmcgZGV0YWlscy4KKyAgICAvLyBOYW1lOiBjcmVhdGVDb250cm9s cworICAgIC8vIFBhcmFtZXRlcnM6CisgICAgLy8gICAgIDEuIFRoZSBTaGFkb3dSb290IGVsZW1l bnQgdGhhdCB3aWxsIGhvbGQgdGhlIGNvbnRyb2xzLgorICAgIC8vICAgICAyLiBUaGlzIG9iamVj dCAoYW5kIEhUTUxNZWRpYUVsZW1lbnQpLgorICAgIC8vICAgICAzLiBUaGUgTWVkaWFDb250cm9s c0hvc3Qgb2JqZWN0LgorICAgIC8vIFJldHVybiB2YWx1ZToKKyAgICAvLyAgICAgQSByZWZlcmVu Y2UgdG8gdGhlIGNyZWF0ZWQgbWVkaWEgY29udHJvbGxlciBpbnN0YW5jZS4KKworICAgIEpTQzo6 SlNWYWx1ZSBmdW5jdGlvblZhbHVlID0gZ2xvYmFsT2JqZWN0LT5nZXQoZXhlYywgSlNDOjpJZGVu dGlmaWVyKGV4ZWMsICJjcmVhdGVDb250cm9scyIpKTsKKyAgICBpZiAoZnVuY3Rpb25WYWx1ZS5p c1VuZGVmaW5lZE9yTnVsbCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoIW1fbWVkaWFD b250cm9sc0hvc3QpCkBAIC01OTc3LDEzICs1OTk0LDE3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVu dDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdChTaGFkb3dSb290KiByb290KQogICAgIGFyZ0xp c3QuYXBwZW5kKHRvSlMoZXhlYywgZ2xvYmFsT2JqZWN0LCB0aGlzKSk7CiAgICAgYXJnTGlzdC5h cHBlbmQodG9KUyhleGVjLCBnbG9iYWxPYmplY3QsIG1fbWVkaWFDb250cm9sc0hvc3QuZ2V0KCkp KTsKIAotICAgIEpTQzo6SlNPYmplY3QqIG92ZXJsYXkgPSBvdmVybGF5VmFsdWUudG9PYmplY3Qo ZXhlYyk7CisgICAgSlNDOjpKU09iamVjdCogZnVuY3Rpb24gPSBmdW5jdGlvblZhbHVlLnRvT2Jq ZWN0KGV4ZWMpOwogICAgIEpTQzo6Q2FsbERhdGEgY2FsbERhdGE7Ci0gICAgSlNDOjpDYWxsVHlw ZSBjYWxsVHlwZSA9IG92ZXJsYXktPm1ldGhvZFRhYmxlKCktPmdldENhbGxEYXRhKG92ZXJsYXks IGNhbGxEYXRhKTsKKyAgICBKU0M6OkNhbGxUeXBlIGNhbGxUeXBlID0gZnVuY3Rpb24tPm1ldGhv ZFRhYmxlKCktPmdldENhbGxEYXRhKGZ1bmN0aW9uLCBjYWxsRGF0YSk7CiAgICAgaWYgKGNhbGxU eXBlID09IEpTQzo6Q2FsbFR5cGVOb25lKQogICAgICAgICByZXR1cm47CiAKLSAgICBKU0M6OmNh bGwoZXhlYywgb3ZlcmxheSwgY2FsbFR5cGUsIGNhbGxEYXRhLCBnbG9iYWxPYmplY3QsIGFyZ0xp c3QpOworICAgIEpTQzo6SlNWYWx1ZSBjb250cm9sbGVyVmFsdWUgPSBKU0M6OmNhbGwoZXhlYywg ZnVuY3Rpb24sIGNhbGxUeXBlLCBjYWxsRGF0YSwgZ2xvYmFsT2JqZWN0LCBhcmdMaXN0KTsKKyAg ICBtX21lZGlhQ29udHJvbHNIb3N0LT5zZXRDb250cm9sbGVySlNWYWx1ZShjb250cm9sbGVyVmFs dWUpOworCisgICAgc2V0UGFnZVNjYWxlRmFjdG9yUHJvcGVydHkoZXhlYywgY29udHJvbGxlclZh bHVlLCBwYWdlLT5wYWdlU2NhbGVGYWN0b3IoKSk7CisKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0 aW9uKCkpCiAgICAgICAgIGV4ZWMtPmNsZWFyRXhjZXB0aW9uKCk7CiB9CkBAIC02MDA0LDYgKzYw MjUsMjAgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRNZWRpYUNvbnRyb2xzRGVwZW5kT25Q YWdlU2NhbGVGYWN0b3IoYm9vbCBkZXBlbmRzT25QYWcKIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50 OjpwYWdlU2NhbGVGYWN0b3JDaGFuZ2VkKCkKIHsKKyAgICBQYWdlKiBwYWdlID0gZG9jdW1lbnQo KS5wYWdlKCk7CisgICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm47CisKKyAgICBMT0coTWVk aWEsICJIVE1MTWVkaWFFbGVtZW50OjpwYWdlU2NhbGVGYWN0b3JDaGFuZ2VkID0gJWYiLCBwYWdl LT5wYWdlU2NhbGVGYWN0b3IoKSk7CisgICAgRE9NV3JhcHBlcldvcmxkJiB3b3JsZCA9IGVuc3Vy ZUlzb2xhdGVkV29ybGQoKTsKKyAgICBTY3JpcHRDb250cm9sbGVyJiBzY3JpcHRDb250cm9sbGVy ID0gcGFnZS0+bWFpbkZyYW1lKCkuc2NyaXB0KCk7CisgICAgSlNET01HbG9iYWxPYmplY3QqIGds b2JhbE9iamVjdCA9IEpTQzo6anNDYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oc2NyaXB0Q29udHJv bGxlci5nbG9iYWxPYmplY3Qod29ybGQpKTsKKyAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IGds b2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOworICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxvY2soZXhl Yyk7CisKKyAgICBKU0M6OkpTVmFsdWUgY29udHJvbGxlclZhbHVlID0gbV9tZWRpYUNvbnRyb2xz SG9zdC0+Y29udHJvbGxlckpTVmFsdWUoKTsKKworICAgIHNldFBhZ2VTY2FsZUZhY3RvclByb3Bl cnR5KGV4ZWMsIGNvbnRyb2xsZXJWYWx1ZSwgcGFnZS0+cGFnZVNjYWxlRmFjdG9yKCkpOwogfQog I2VuZGlmIC8vIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCiAK 228859 2014-04-08 11:09:13 -0700 2014-04-08 11:09:13 -0700 Landing Patch bug-131322-20140409040851.patch text/plain 14233 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2OTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTM5ZWZmOTY4MjlmNjEw MDk0NjU1YTU1Y2NkODNmOWQ5YThlYWE5OS4uYjEyY2UwOGQxODJlYThlMmFjNGUwZjI0YTMxYTk2 MGM3MmFiOGNkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ2IEBACiAyMDE0LTA0LTA3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAorICAgICAgICBbaU9TXSBNZWRpYSBjb250cm9s cyBzaG91bGQgcmVzaXplIGFzIHRoZSB1c2VyIHpvb21zCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMjIKKworICAgICAgICBSZXZpZXdlZCBieSBF cmljIENhcmxzb24uCisKKyAgICAgICAgT24gaU9TIHRoZSBtZWRpYSBjb250cm9scyBzaG91bGQg cmVtYWluIHRoZSBzYW1lIHNpemUKKyAgICAgICAgaW5kZXBlbmRlbnQgb2YgdXNlciB6b29tLiBI YXZlIHRoZSBIVE1MTWVkaWFFbGVtZW50IG9wdGlvbmFsbHkKKyAgICAgICAgcmVnaXN0ZXIgZm9y IHVwZGF0ZXMgaW4gdGhlIHBhZ2Ugc2NhbGUgdG8gYXBwbHkgYW4gaW52ZXJzZQorICAgICAgICBz Y2FsZS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9z dC5jcHA6IE5ldyBleHBvc2VkIHByb3BlcnR5IHRoYXQgY2FsbHMKKyAgICAgICAgYmFjayBpbnRv IEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rvci4K KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0Ojpjb250cm9sc0RlcGVuZE9uUGFn ZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0OjpzZXRD b250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlh Y29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaDogS2VlcCBhIHJlZmVyZW5jZSB0byB0aGUgYWN0 dWFsCisgICAgICAgIGNvbnRyb2xzIGZyb20gdGhlIEphdmFTY3JpcHQgc2lkZSBzbyB3ZSBjYW4g dGFsayB0byBpdCBsYXRlci4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0Ojpj b250cm9sbGVySlNWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xzSG9zdDo6 c2V0Q29udHJvbGxlckpTVmFsdWUpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9N ZWRpYUNvbnRyb2xzSG9zdC5pZGw6IEV4cG9zZSBjb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFj dG9yLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1Mu Y3NzOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwpOiBTcGVj aWZ5IHRoZSB0cmFuc2Zvcm0gb3JpZ2luIHNvIHRoYXQKKyAgICAgICAgc2NhbGluZyB3aWxsIGtl ZXAgdGhlIGNvbnRyb2xzIHBpbm5lZCB0byB0aGUgYm90dG9tIGxlZnQgY29ybmVyLgorICAgICAg ICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc3RhcnQtcGxheWJhY2stYnV0dG9uKTog VXBkYXRlIHRvIHRoZSBjb3JyZWN0IHNpemUKKyAgICAgICAgYW5kIHByb3ZpZGUgbmV3IGFydHdv cmsuCisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zdGFydC1wbGF5YmFj ay1idXR0b24uZmFpbGVkKTogTmV3IGFydHdvcmsuCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNv bnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanM6CisgICAgICAgIChDb250cm9sbGVySU9TKTogVGVs bCB0aGUgaG9zdCB0aGF0IHRoZXNlIGNvbnRyb2xzIGNhcmUgYWJvdXQgdGhlIHBhZ2Ugc2NhbGUu CisgICAgICAgIChDb250cm9sbGVySU9TLnByb3RvdHlwZS5nZXQgcGFnZVNjYWxlRmFjdG9yKTog TmV3IGdldHRlci4KKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLnNldCBwYWdlU2Nh bGVGYWN0b3IpOiBXaGVuIHNldCwgdXBkYXRlIHRoZSBwbGF5IGJ1dHRvbiBhbmQgdGhlIHBhbmVs LgorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlhQ29udHJvbHNJbmplY3RlZFNjcmlwdCk6 IFNtYWxsIG5hbWluZyBjbGVhbnVwLgorICAgICAgICAoc2V0UGFnZVNjYWxlRmFjdG9yUHJvcGVy dHkpOiBTdGF0aWMgaGVscGVyIHRvIHNldCBhIEpTIHByb3BlcnR5IHZhbHVlLgorICAgICAgICAo V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdCk6IEtl ZXAgYSByZWZlcmVuY2UgdG8gdGhlIGNvbnRyb2xzIG9iamVjdCwKKyAgICAgICAgYW5kIG1ha2Ug c3VyZSB0byBzZXQgdGhlIHBhZ2Ugc2NhbGUgZmFjdG9yIG9uIHRoZSBjb250cm9scy4KKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQpOiBJ bXBsZW1lbnQgdGhlIGNhbGxiYWNrLCB0ZWxsaW5nCisgICAgICAgIHRoZSBjb250cm9scyBvYmpl Y3QgdGhhdCBpdCBuZWVkcyB0byByZWxheW91dC4KKworMjAxNC0wNC0wNyAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CisKICAgICAgICAgQWxsb3cgZWxlbWVudHMgdG8gcmVnaXN0ZXIg Zm9yIGNoYW5nZXMgaW4gcGFnZSBzY2FsZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTMxMzE5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwCmluZGV4IDc3YTc2 ZWE5OGFmYTAwNTllZDNmMDg3M2FkNTNjOWJmNzI2N2Y3ZmMuLmZiMmRjYjg4MmVkZTQ2NGVlMGEz ZTcyZjRlMWY2OWRhZjQ0NTc3OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcApAQCAtMjE0LDcgKzIx NCwxNyBAQCBTdHJpbmcgTWVkaWFDb250cm9sc0hvc3Q6OmV4dGVybmFsRGV2aWNlVHlwZSgpIGNv bnN0CiAgICAgCiAgICAgcmV0dXJuIHR5cGU7CiB9Ci0gICAgCisKK2Jvb2wgTWVkaWFDb250cm9s c0hvc3Q6OmNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoKSBjb25zdAoreworICAgIHJl dHVybiBtX21lZGlhRWxlbWVudC0+bWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9y KCk7Cit9CisKK3ZvaWQgTWVkaWFDb250cm9sc0hvc3Q6OnNldENvbnRyb2xzRGVwZW5kT25QYWdl U2NhbGVGYWN0b3IoYm9vbCB2YWx1ZSkKK3sKKyAgICBtX21lZGlhRWxlbWVudC0+c2V0TWVkaWFD b250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKHZhbHVlKTsKK30KKwogfQogCiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNv bnRyb2xzSG9zdC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlh Q29udHJvbHNIb3N0LmgKaW5kZXggMzA2Njg2NDkzZjcyZTYyY2QxMjI1YzYwYjNkMGNmYTgxYmI2 MzkxZi4uMTM5ZjZjZDg3ZjlkMGNjZmYzMmUxNTQ3ZDA2MTk1ODI0ZTEzY2M5OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJv bHNIb3N0LmgKQEAgLTI5LDYgKzI5LDcgQEAKICNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NS SVBUKQogCiAjaW5jbHVkZSAiU2NyaXB0U3RhdGUuaCIKKyNpbmNsdWRlIDxiaW5kaW5ncy9TY3Jp cHRPYmplY3QuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9W ZWN0b3IuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KQEAgLTY1LDExICs2Niwx OCBAQCBwdWJsaWM6CiAgICAgU3RyaW5nIGV4dGVybmFsRGV2aWNlRGlzcGxheU5hbWUoKSBjb25z dDsKICAgICBTdHJpbmcgZXh0ZXJuYWxEZXZpY2VUeXBlKCkgY29uc3Q7CiAKKyAgICBib29sIGNv bnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoKSBjb25zdDsKKyAgICB2b2lkIHNldENvbnRy b2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoYm9vbCB2KTsKKworICAgIEpTQzo6SlNWYWx1ZSBj b250cm9sbGVySlNWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udHJvbGxlcjsgfQorICAgIHZv aWQgc2V0Q29udHJvbGxlckpTVmFsdWUoSlNDOjpKU1ZhbHVlIGNvbnRyb2xsZXIpIHsgbV9jb250 cm9sbGVyID0gY29udHJvbGxlcjsgfQorCiBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbHNIb3N0 KEhUTUxNZWRpYUVsZW1lbnQqKTsKIAogICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1fbWVkaWFFbGVt ZW50OwogICAgIFJlZlB0cjxNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50PiBt X3RleHRUcmFja0NvbnRhaW5lcjsKKyAgICBKU0M6OkpTVmFsdWUgbV9jb250cm9sbGVyOwogfTsK IAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01l ZGlhQ29udHJvbHNIb3N0LmlkbCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9s cy9NZWRpYUNvbnRyb2xzSG9zdC5pZGwKaW5kZXggYjhjYzA4NjAwY2NhYzZlOWNlMThkNjhjNmI1 ZGZkMjllZjQ5NGVhNS4uZDdhNjhkNzUwZGE1Njk1ZDI4OTNlY2M3NTQ0NDliZWY1ZWI2ZTY3MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29u dHJvbHNIb3N0LmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMv TWVkaWFDb250cm9sc0hvc3QuaWRsCkBAIC00OCw0ICs0OCw2IEBAIGVudW0gRGV2aWNlVHlwZSB7 CiAKICAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5nIGV4dGVybmFsRGV2aWNlRGlzcGxh eU5hbWU7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIERldmljZVR5cGUgZXh0ZXJuYWxEZXZpY2VU eXBlOworCisgICAgYXR0cmlidXRlIGJvb2xlYW4gY29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZh Y3RvcjsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJv bHMvbWVkaWFDb250cm9sc2lPUy5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29u dHJvbHMvbWVkaWFDb250cm9sc2lPUy5jc3MKaW5kZXggZGE3MjcyYTY0NTJjZWJmNWJiZTdmNzIx NmI5MTM5M2E3NmJmZDhkMS4uZTZlODYxMGE0YWM5ZWVhMmE1YmVlMWFiZWZiZTljMjQ0OWZkZDY3 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlh Q29udHJvbHNpT1MuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9s cy9tZWRpYUNvbnRyb2xzaU9TLmNzcwpAQCAtMTIxLDYgKzEyMSw3IEBAIGF1ZGlvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXBhbmVsIHsKICAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lOwog CiAgICAgdHJhbnNpdGlvbjogb3BhY2l0eSAwLjI1cyBsaW5lYXI7CisgICAgLXdlYmtpdC10cmFu c2Zvcm0tb3JpZ2luOiBib3R0b20gbGVmdDsKIH0KIAogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29u dHJvbHMtcGFuZWwgewpAQCAtMTU0LDE5ICsxNTUsMTkgQEAgYXVkaW86Oi13ZWJraXQtbWVkaWEt Y29udHJvbHMtc3RhcnQtcGxheWJhY2stYnV0dG9uIHsKICAgICBwYWRkaW5nOiAwOwogICAgIGJv cmRlcjogMDsKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7Ci0gICAgd2lkdGg6IDE1MHB4OwotICAg IGhlaWdodDogMTUwcHg7Ci0gICAgbGVmdDogY2FsYyg1MCUgLSA3NXB4KTsKLSAgICB0b3A6IGNh bGMoNTAlIC0gNzVweCk7CisgICAgd2lkdGg6IDcycHg7CisgICAgaGVpZ2h0OiA3MnB4OworICAg IGxlZnQ6IGNhbGMoNTAlIC0gMzZweCk7CisgICAgdG9wOiBjYWxjKDUwJSAtIDM2cHgpOwogICAg IGJhY2tncm91bmQtb3JpZ2luOiBjb250ZW50LWJveDsKICAgICBiYWNrZ3JvdW5kLXJlcGVhdDog bm8tcmVwZWF0OwogICAgIGJhY2tncm91bmQtcG9zaXRpb246IGNlbnRlcjsKLSAgICBiYWNrZ3Jv dW5kLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHdpZHRoPSIxNDAiIGhlaWdo dD0iMTQwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxjaXJjbGUgcj0iNzAi IGN5PSI3MCIgY3g9IjcwIiBmaWxsPSJyZ2JhKDI0NywgMjQ3LCAyNDcsIC44MikiLz48cGF0aCBk PSJNIDQ4LDM0IHYgNzIgbCA2MiwtMzUuNSB6IiBmaWxsPSJyZ2JhKDEyOSwgMTI5LCAxMjksIC45 KSIvPjwvc3ZnPicpOworICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9zdmcr eG1sLDxzdmcgdmlld0JveD0iMCAwIDE0NCAxNDQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8y MDAwL3N2ZyI+PGNpcmNsZSBjeD0iNzIiIGN5PSI3MiIgcj0iNzAiIGZpbGw9InJnYmEoMjQ3LCAy NDcsIDI0NywgLjgyKSIvPjxwYXRoIGQ9Ik00OCwzNnY3NEwxMDksNzRMNDgsMzZ6IiBmaWxsPSJy Z2JhKDEyOSwgMTI5LCAxMjksIC45KSIvPjwvc3ZnPicpOwogfQogCiB2aWRlbzo6LXdlYmtpdC1t ZWRpYS1jb250cm9scy1zdGFydC1wbGF5YmFjay1idXR0b24uZmFpbGVkLAogYXVkaW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtc3RhcnQtcGxheWJhY2stYnV0dG9uLmZhaWxlZCB7Ci0gICAgYmFj a2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB3aWR0aD0iMTQwIiBo ZWlnaHQ9IjE0MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48Y2lyY2xlIHI9 IjcwIiBjeT0iNzAiIGN4PSI3MCIgZmlsbD0icmdiYSgyNDcsIDI0NywgMjQ3LCAuODIpIi8+PGcg ZmlsbD0icmdiYSgxMjksIDEyOSwgMTI5LCAuOSkiPjxwYXRoIGQ9Ik0gNDgsMzQgdiAxNyBsIDQ3 LDI4IGwgMTUsLTguNSB6Ii8+PHBhdGggZD0iTSAxNiwzNiBsIDExMCw2NCBsIC0yLDQgbCAtMTEw LC02NCB6Ii8+PHBhdGggZD0iTSA0OCw2MyB2IDQzIGwgMzcsLTIxLjUgeiIvPjwvZz48L3N2Zz4n KTsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHZp ZXdCb3g9IjAgMCAxNDQgMTQ0IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxj aXJjbGUgY3g9IjcyIiBjeT0iNzIiIHI9IjcwIiBmaWxsPSJyZ2JhKDI0NywgMjQ3LCAyNDcsIC44 MikiLz48ZyBmaWxsPSJyZ2JhKDEyOSwgMTI5LCAxMjksIC45KSI+PHJlY3QgeD0iMTQiIHk9Ijcw LjQiIHRyYW5zZm9ybT0ibWF0cml4KDAuODQ5MyAwLjUyNzkgLTAuNTI3OSAwLjg0OTMgNDguODYx NCAtMjcuMTU5NSkiIHdpZHRoPSIxMTYiIGhlaWdodD0iMy4yIi8+PHBvbHlnb24gcG9pbnRzPSIx MDksNzQgNDgsMzYgNDgsNTIuMyA5NS42LDgxLjkgIi8+PHBvbHlnb24gcG9pbnRzPSI0OCwxMTAg ODcuNyw4Ni42IDQ4LDYxLjkgIi8+PC9nPjwvc3ZnPicpOwogfQogCiB2aWRlbzo6LXdlYmtpdC1t ZWRpYS1jb250cm9scy1wbGF5LWJ1dHRvbiwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmpzIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanMKaW5kZXggYmQyNzFlZjlk MjM5YTY0MTBhNDhlZWZhNjFiYTk2YjA4ODkxN2Y1ZC4uYWNmYjFhYWRiZGRlMmY0NGM3Zjc2YmZi ZjEyODlmYjE4M2U0NWE5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanMKQEAgLTYsMTAgKzYsMTMgQEAgZnVu Y3Rpb24gY3JlYXRlQ29udHJvbHMocm9vdCwgdmlkZW8sIGhvc3QpCiBmdW5jdGlvbiBDb250cm9s bGVySU9TKHJvb3QsIHZpZGVvLCBob3N0KQogewogICAgIHRoaXMuaGFzV2lyZWxlc3NQbGF5YmFj a1RhcmdldHMgPSBmYWxzZTsKKyAgICB0aGlzLl9wYWdlU2NhbGVGYWN0b3IgPSAxOwogICAgIENv bnRyb2xsZXIuY2FsbCh0aGlzLCByb290LCB2aWRlbywgaG9zdCk7CiAKICAgICB0aGlzLnVwZGF0 ZVdpcmVsZXNzVGFyZ2V0QXZhaWxhYmxlKCk7CiAgICAgdGhpcy51cGRhdGVXaXJlbGVzc1BsYXli YWNrU3RhdHVzKCk7CisKKyAgICBob3N0LmNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3Ig PSB0cnVlOwogfTsKIAogLyogRW51bXMgKi8KQEAgLTQwMyw2ICs0MDYsMjUgQEAgQ29udHJvbGxl cklPUy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMudmlkZW8ud2Via2l0U2hvd1BsYXliYWNr VGFyZ2V0UGlja2VyKCk7CiAgICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOwogICAgIH0s CisKKyAgICBnZXQgcGFnZVNjYWxlRmFjdG9yKCkgeworICAgICAgICByZXR1cm4gdGhpcy5fcGFn ZVNjYWxlRmFjdG9yOworICAgIH0sCisKKyAgICBzZXQgcGFnZVNjYWxlRmFjdG9yKG5ld1NjYWxl RmFjdG9yKSB7CisgICAgICAgIHRoaXMuX3BhZ2VTY2FsZUZhY3RvciA9IG5ld1NjYWxlRmFjdG9y OworCisgICAgICAgIGlmIChuZXdTY2FsZUZhY3RvcikgeworICAgICAgICAgICAgdmFyIHNjYWxl VHJhbnNmb3JtID0gInNjYWxlKCIgKyAoMSAvIG5ld1NjYWxlRmFjdG9yKSArICIpIjsKKyAgICAg ICAgICAgIGlmICh0aGlzLmNvbnRyb2xzLnN0YXJ0UGxheWJhY2tCdXR0b24pCisgICAgICAgICAg ICAgICAgdGhpcy5jb250cm9scy5zdGFydFBsYXliYWNrQnV0dG9uLnN0eWxlLndlYmtpdFRyYW5z Zm9ybSA9IHNjYWxlVHJhbnNmb3JtOworICAgICAgICAgICAgaWYgKHRoaXMuY29udHJvbHMucGFu ZWwpIHsKKyAgICAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLnBhbmVsLnN0eWxlLndpZHRoID0g KG5ld1NjYWxlRmFjdG9yICogMTAwKSArICIlIjsKKyAgICAgICAgICAgICAgICB0aGlzLmNvbnRy b2xzLnBhbmVsLnN0eWxlLndlYmtpdFRyYW5zZm9ybSA9IHNjYWxlVHJhbnNmb3JtOworICAgICAg ICAgICAgICAgIHRoaXMudXBkYXRlUHJvZ3Jlc3MoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQorICAgIH0KIH07CiAKIE9iamVjdC5jcmVhdGUoQ29udHJvbGxlci5wcm90b3R5cGUpLmV4dGVu ZChDb250cm9sbGVySU9TLnByb3RvdHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFF bGVtZW50LmNwcAppbmRleCA3OGQxNDkzMjlkOWVhMzY1N2NlNmI4ZjIyZjlkZWZmY2I2NTAzMjM4 Li5kYzA5MDczMjMzNDlhY2RkNWUyMWNjNWUyNDRiMjJkMjNkYTJiMWFkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTU5MTYsNiArNTkxNiw3IEBAIERPTVdy YXBwZXJXb3JsZCYgSFRNTE1lZGlhRWxlbWVudDo6ZW5zdXJlSXNvbGF0ZWRXb3JsZCgpCiAKIGJv b2wgSFRNTE1lZGlhRWxlbWVudDo6ZW5zdXJlTWVkaWFDb250cm9sc0luamVjdGVkU2NyaXB0KCkK IHsKKyAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjplbnN1cmVNZWRpYUNvbnRyb2xz SW5qZWN0ZWRTY3JpcHQiKTsKICAgICBQYWdlKiBwYWdlID0gZG9jdW1lbnQoKS5wYWdlKCk7CiAg ICAgaWYgKCFwYWdlKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC01OTI5LDggKzU5MzAsOCBA QCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlhQ29udHJvbHNJbmplY3RlZFNjcmlw dCgpCiAgICAgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCA9IEpTQzo6anNDYXN0PEpT RE9NR2xvYmFsT2JqZWN0Kj4oc2NyaXB0Q29udHJvbGxlci5nbG9iYWxPYmplY3Qod29ybGQpKTsK ICAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOwog Ci0gICAgSlNDOjpKU1ZhbHVlIG92ZXJsYXlWYWx1ZSA9IGdsb2JhbE9iamVjdC0+Z2V0KGV4ZWMs IEpTQzo6SWRlbnRpZmllcihleGVjLCAiY3JlYXRlQ29udHJvbHMiKSk7Ci0gICAgaWYgKG92ZXJs YXlWYWx1ZS5pc0Z1bmN0aW9uKCkpCisgICAgSlNDOjpKU1ZhbHVlIGZ1bmN0aW9uVmFsdWUgPSBn bG9iYWxPYmplY3QtPmdldChleGVjLCBKU0M6OklkZW50aWZpZXIoZXhlYywgImNyZWF0ZUNvbnRy b2xzIikpOworICAgIGlmIChmdW5jdGlvblZhbHVlLmlzRnVuY3Rpb24oKSkKICAgICAgICAgcmV0 dXJuIHRydWU7CiAKICNpZm5kZWYgTkRFQlVHCkBAIC01OTQ4LDggKzU5NDksMTYgQEAgYm9vbCBI VE1MTWVkaWFFbGVtZW50OjplbnN1cmVNZWRpYUNvbnRyb2xzSW5qZWN0ZWRTY3JpcHQoKQogICAg IHJldHVybiB0cnVlOwogfQogCitzdGF0aWMgdm9pZCBzZXRQYWdlU2NhbGVGYWN0b3JQcm9wZXJ0 eShKU0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNDOjpKU1ZhbHVlIGNvbnRyb2xsZXJWYWx1ZSwgZmxv YXQgcGFnZVNjYWxlRmFjdG9yKQoreworICAgIEpTQzo6UHV0UHJvcGVydHlTbG90IHByb3BlcnR5 U2xvdChjb250cm9sbGVyVmFsdWUpOworICAgIEpTQzo6SlNPYmplY3QqIGNvbnRyb2xsZXJPYmpl Y3QgPSBjb250cm9sbGVyVmFsdWUudG9PYmplY3QoZXhlYyk7CisgICAgY29udHJvbGxlck9iamVj dC0+bWV0aG9kVGFibGUoKS0+cHV0KGNvbnRyb2xsZXJPYmplY3QsIGV4ZWMsIEpTQzo6SWRlbnRp ZmllcihleGVjLCAicGFnZVNjYWxlRmFjdG9yIiksIEpTQzo6anNOdW1iZXIocGFnZVNjYWxlRmFj dG9yKSwgcHJvcGVydHlTbG90KTsKK30KKwogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpkaWRBZGRV c2VyQWdlbnRTaGFkb3dSb290KFNoYWRvd1Jvb3QqIHJvb3QpCiB7CisgICAgTE9HKE1lZGlhLCAi SFRNTE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdCIpOwogI2lmIEVOQUJM RShQTFVHSU5fUFJPWFlfRk9SX1ZJREVPKQogICAgIC8vIEphdmFTY3JpcHQgY29udHJvbHMgYXJl IG5vdCBlbmFibGVkIHdpdGggdGhlIHZpZGVvIHBsdWdpbiBwcm94eS4KICAgICBpZiAoc2hvdWxk VXNlVmlkZW9QbHVnaW5Qcm94eSgpKQpAQCAtNTk2OSw5ICs1OTc4LDE3IEBAIHZvaWQgSFRNTE1l ZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdChTaGFkb3dSb290KiByb290KQog ICAgIEpTQzo6RXhlY1N0YXRlKiBleGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAg ICAgSlNDOjpKU0xvY2tIb2xkZXIgbG9jayhleGVjKTsKIAotICAgIC8vIEl0IGlzIGV4cGVjdGVk IHRoZSBKUyBmaWxlIHByb3ZpZGVzIGEgY3JlYXRlQ29udHJvbHMoc2hhZG93Um9vdCwgdmlkZW8s IG1lZGlhQ29udHJvbHNIb3N0KSBmdW5jdGlvbi4KLSAgICBKU0M6OkpTVmFsdWUgb3ZlcmxheVZh bHVlID0gZ2xvYmFsT2JqZWN0LT5nZXQoZXhlYywgSlNDOjpJZGVudGlmaWVyKGV4ZWMsICJjcmVh dGVDb250cm9scyIpKTsKLSAgICBpZiAob3ZlcmxheVZhbHVlLmlzVW5kZWZpbmVkT3JOdWxsKCkp CisgICAgLy8gVGhlIG1lZGlhIGNvbnRyb2xzIHNjcmlwdCBtdXN0IHByb3ZpZGUgYSBtZXRob2Qg d2l0aCB0aGUgZm9sbG93aW5nIGRldGFpbHMuCisgICAgLy8gTmFtZTogY3JlYXRlQ29udHJvbHMK KyAgICAvLyBQYXJhbWV0ZXJzOgorICAgIC8vICAgICAxLiBUaGUgU2hhZG93Um9vdCBlbGVtZW50 IHRoYXQgd2lsbCBob2xkIHRoZSBjb250cm9scy4KKyAgICAvLyAgICAgMi4gVGhpcyBvYmplY3Qg KGFuZCBIVE1MTWVkaWFFbGVtZW50KS4KKyAgICAvLyAgICAgMy4gVGhlIE1lZGlhQ29udHJvbHNI b3N0IG9iamVjdC4KKyAgICAvLyBSZXR1cm4gdmFsdWU6CisgICAgLy8gICAgIEEgcmVmZXJlbmNl IHRvIHRoZSBjcmVhdGVkIG1lZGlhIGNvbnRyb2xsZXIgaW5zdGFuY2UuCisKKyAgICBKU0M6OkpT VmFsdWUgZnVuY3Rpb25WYWx1ZSA9IGdsb2JhbE9iamVjdC0+Z2V0KGV4ZWMsIEpTQzo6SWRlbnRp ZmllcihleGVjLCAiY3JlYXRlQ29udHJvbHMiKSk7CisgICAgaWYgKGZ1bmN0aW9uVmFsdWUuaXNV bmRlZmluZWRPck51bGwoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCFtX21lZGlhQ29u dHJvbHNIb3N0KQpAQCAtNTk4MiwxMyArNTk5OSwxNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OmRpZEFkZFVzZXJBZ2VudFNoYWRvd1Jvb3QoU2hhZG93Um9vdCogcm9vdCkKICAgICBhcmdMaXN0 LmFwcGVuZCh0b0pTKGV4ZWMsIGdsb2JhbE9iamVjdCwgdGhpcykpOwogICAgIGFyZ0xpc3QuYXBw ZW5kKHRvSlMoZXhlYywgZ2xvYmFsT2JqZWN0LCBtX21lZGlhQ29udHJvbHNIb3N0LmdldCgpKSk7 CiAKLSAgICBKU0M6OkpTT2JqZWN0KiBvdmVybGF5ID0gb3ZlcmxheVZhbHVlLnRvT2JqZWN0KGV4 ZWMpOworICAgIEpTQzo6SlNPYmplY3QqIGZ1bmN0aW9uID0gZnVuY3Rpb25WYWx1ZS50b09iamVj dChleGVjKTsKICAgICBKU0M6OkNhbGxEYXRhIGNhbGxEYXRhOwotICAgIEpTQzo6Q2FsbFR5cGUg Y2FsbFR5cGUgPSBvdmVybGF5LT5tZXRob2RUYWJsZSgpLT5nZXRDYWxsRGF0YShvdmVybGF5LCBj YWxsRGF0YSk7CisgICAgSlNDOjpDYWxsVHlwZSBjYWxsVHlwZSA9IGZ1bmN0aW9uLT5tZXRob2RU YWJsZSgpLT5nZXRDYWxsRGF0YShmdW5jdGlvbiwgY2FsbERhdGEpOwogICAgIGlmIChjYWxsVHlw ZSA9PSBKU0M6OkNhbGxUeXBlTm9uZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgSlNDOjpjYWxs KGV4ZWMsIG92ZXJsYXksIGNhbGxUeXBlLCBjYWxsRGF0YSwgZ2xvYmFsT2JqZWN0LCBhcmdMaXN0 KTsKKyAgICBKU0M6OkpTVmFsdWUgY29udHJvbGxlclZhbHVlID0gSlNDOjpjYWxsKGV4ZWMsIGZ1 bmN0aW9uLCBjYWxsVHlwZSwgY2FsbERhdGEsIGdsb2JhbE9iamVjdCwgYXJnTGlzdCk7CisgICAg bV9tZWRpYUNvbnRyb2xzSG9zdC0+c2V0Q29udHJvbGxlckpTVmFsdWUoY29udHJvbGxlclZhbHVl KTsKKworICAgIHNldFBhZ2VTY2FsZUZhY3RvclByb3BlcnR5KGV4ZWMsIGNvbnRyb2xsZXJWYWx1 ZSwgcGFnZS0+cGFnZVNjYWxlRmFjdG9yKCkpOworCiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlv bigpKQogICAgICAgICBleGVjLT5jbGVhckV4Y2VwdGlvbigpOwogfQpAQCAtNjAwOSw2ICs2MDMw LDIwIEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0TWVkaWFDb250cm9sc0RlcGVuZE9uUGFn ZVNjYWxlRmFjdG9yKGJvb2wgZGVwZW5kc09uUGFnCiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6 cGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCgpCiB7CisgICAgUGFnZSogcGFnZSA9IGRvY3VtZW50KCku cGFnZSgpOworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgTE9HKE1lZGlh LCAiSFRNTE1lZGlhRWxlbWVudDo6cGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCA9ICVmIiwgcGFnZS0+ cGFnZVNjYWxlRmFjdG9yKCkpOworICAgIERPTVdyYXBwZXJXb3JsZCYgd29ybGQgPSBlbnN1cmVJ c29sYXRlZFdvcmxkKCk7CisgICAgU2NyaXB0Q29udHJvbGxlciYgc2NyaXB0Q29udHJvbGxlciA9 IHBhZ2UtPm1haW5GcmFtZSgpLnNjcmlwdCgpOworICAgIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9i YWxPYmplY3QgPSBKU0M6OmpzQ2FzdDxKU0RPTUdsb2JhbE9iamVjdCo+KHNjcmlwdENvbnRyb2xs ZXIuZ2xvYmFsT2JqZWN0KHdvcmxkKSk7CisgICAgSlNDOjpFeGVjU3RhdGUqIGV4ZWMgPSBnbG9i YWxPYmplY3QtPmdsb2JhbEV4ZWMoKTsKKyAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKGV4ZWMp OworCisgICAgSlNDOjpKU1ZhbHVlIGNvbnRyb2xsZXJWYWx1ZSA9IG1fbWVkaWFDb250cm9sc0hv c3QtPmNvbnRyb2xsZXJKU1ZhbHVlKCk7CisKKyAgICBzZXRQYWdlU2NhbGVGYWN0b3JQcm9wZXJ0 eShleGVjLCBjb250cm9sbGVyVmFsdWUsIHBhZ2UtPnBhZ2VTY2FsZUZhY3RvcigpKTsKIH0KICNl bmRpZiAvLyBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQogCg== 228861 2014-04-08 11:46:26 -0700 2014-04-08 11:46:26 -0700 Landing Patch 2 bug-131322-20140409044604.patch text/plain 14515 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2OTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTM5ZWZmOTY4MjlmNjEw MDk0NjU1YTU1Y2NkODNmOWQ5YThlYWE5OS4uYjEyY2UwOGQxODJlYThlMmFjNGUwZjI0YTMxYTk2 MGM3MmFiOGNkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ2IEBACiAyMDE0LTA0LTA3ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAorICAgICAgICBbaU9TXSBNZWRpYSBjb250cm9s cyBzaG91bGQgcmVzaXplIGFzIHRoZSB1c2VyIHpvb21zCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMjIKKworICAgICAgICBSZXZpZXdlZCBieSBF cmljIENhcmxzb24uCisKKyAgICAgICAgT24gaU9TIHRoZSBtZWRpYSBjb250cm9scyBzaG91bGQg cmVtYWluIHRoZSBzYW1lIHNpemUKKyAgICAgICAgaW5kZXBlbmRlbnQgb2YgdXNlciB6b29tLiBI YXZlIHRoZSBIVE1MTWVkaWFFbGVtZW50IG9wdGlvbmFsbHkKKyAgICAgICAgcmVnaXN0ZXIgZm9y IHVwZGF0ZXMgaW4gdGhlIHBhZ2Ugc2NhbGUgdG8gYXBwbHkgYW4gaW52ZXJzZQorICAgICAgICBz Y2FsZS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9z dC5jcHA6IE5ldyBleHBvc2VkIHByb3BlcnR5IHRoYXQgY2FsbHMKKyAgICAgICAgYmFjayBpbnRv IEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rvci4K KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0Ojpjb250cm9sc0RlcGVuZE9uUGFn ZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0OjpzZXRD b250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlh Y29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaDogS2VlcCBhIHJlZmVyZW5jZSB0byB0aGUgYWN0 dWFsCisgICAgICAgIGNvbnRyb2xzIGZyb20gdGhlIEphdmFTY3JpcHQgc2lkZSBzbyB3ZSBjYW4g dGFsayB0byBpdCBsYXRlci4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0Ojpj b250cm9sbGVySlNWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xzSG9zdDo6 c2V0Q29udHJvbGxlckpTVmFsdWUpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9N ZWRpYUNvbnRyb2xzSG9zdC5pZGw6IEV4cG9zZSBjb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFj dG9yLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1Mu Y3NzOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwpOiBTcGVj aWZ5IHRoZSB0cmFuc2Zvcm0gb3JpZ2luIHNvIHRoYXQKKyAgICAgICAgc2NhbGluZyB3aWxsIGtl ZXAgdGhlIGNvbnRyb2xzIHBpbm5lZCB0byB0aGUgYm90dG9tIGxlZnQgY29ybmVyLgorICAgICAg ICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc3RhcnQtcGxheWJhY2stYnV0dG9uKTog VXBkYXRlIHRvIHRoZSBjb3JyZWN0IHNpemUKKyAgICAgICAgYW5kIHByb3ZpZGUgbmV3IGFydHdv cmsuCisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zdGFydC1wbGF5YmFj ay1idXR0b24uZmFpbGVkKTogTmV3IGFydHdvcmsuCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNv bnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanM6CisgICAgICAgIChDb250cm9sbGVySU9TKTogVGVs bCB0aGUgaG9zdCB0aGF0IHRoZXNlIGNvbnRyb2xzIGNhcmUgYWJvdXQgdGhlIHBhZ2Ugc2NhbGUu CisgICAgICAgIChDb250cm9sbGVySU9TLnByb3RvdHlwZS5nZXQgcGFnZVNjYWxlRmFjdG9yKTog TmV3IGdldHRlci4KKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLnNldCBwYWdlU2Nh bGVGYWN0b3IpOiBXaGVuIHNldCwgdXBkYXRlIHRoZSBwbGF5IGJ1dHRvbiBhbmQgdGhlIHBhbmVs LgorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlhQ29udHJvbHNJbmplY3RlZFNjcmlwdCk6 IFNtYWxsIG5hbWluZyBjbGVhbnVwLgorICAgICAgICAoc2V0UGFnZVNjYWxlRmFjdG9yUHJvcGVy dHkpOiBTdGF0aWMgaGVscGVyIHRvIHNldCBhIEpTIHByb3BlcnR5IHZhbHVlLgorICAgICAgICAo V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdCk6IEtl ZXAgYSByZWZlcmVuY2UgdG8gdGhlIGNvbnRyb2xzIG9iamVjdCwKKyAgICAgICAgYW5kIG1ha2Ug c3VyZSB0byBzZXQgdGhlIHBhZ2Ugc2NhbGUgZmFjdG9yIG9uIHRoZSBjb250cm9scy4KKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQpOiBJ bXBsZW1lbnQgdGhlIGNhbGxiYWNrLCB0ZWxsaW5nCisgICAgICAgIHRoZSBjb250cm9scyBvYmpl Y3QgdGhhdCBpdCBuZWVkcyB0byByZWxheW91dC4KKworMjAxNC0wNC0wNyAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CisKICAgICAgICAgQWxsb3cgZWxlbWVudHMgdG8gcmVnaXN0ZXIg Zm9yIGNoYW5nZXMgaW4gcGFnZSBzY2FsZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTMxMzE5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwCmluZGV4IDc3YTc2 ZWE5OGFmYTAwNTllZDNmMDg3M2FkNTNjOWJmNzI2N2Y3ZmMuLmY2MTBjNTI1MTMwNWUwOTRhYmZh MWZlOTg1MTlkNmQ0NmI2YzI3M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcApAQCAtNjYsNiArNjYs NyBAQCBQYXNzUmVmUHRyPE1lZGlhQ29udHJvbHNIb3N0PiBNZWRpYUNvbnRyb2xzSG9zdDo6Y3Jl YXRlKEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRQogCiBNZWRpYUNvbnRyb2xzSG9zdDo6TWVkaWFD b250cm9sc0hvc3QoSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50KQogICAgIDogbV9tZWRp YUVsZW1lbnQobWVkaWFFbGVtZW50KQorICAgICwgbV9jb250cm9sbGVyKEpTQzo6SlNWYWx1ZTo6 SlNOdWxsKQogewogICAgIEFTU0VSVChtZWRpYUVsZW1lbnQpOwogfQpAQCAtMjE0LDcgKzIxNSwx NyBAQCBTdHJpbmcgTWVkaWFDb250cm9sc0hvc3Q6OmV4dGVybmFsRGV2aWNlVHlwZSgpIGNvbnN0 CiAgICAgCiAgICAgcmV0dXJuIHR5cGU7CiB9Ci0gICAgCisKK2Jvb2wgTWVkaWFDb250cm9sc0hv c3Q6OmNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoKSBjb25zdAoreworICAgIHJldHVy biBtX21lZGlhRWxlbWVudC0+bWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKCk7 Cit9CisKK3ZvaWQgTWVkaWFDb250cm9sc0hvc3Q6OnNldENvbnRyb2xzRGVwZW5kT25QYWdlU2Nh bGVGYWN0b3IoYm9vbCB2YWx1ZSkKK3sKKyAgICBtX21lZGlhRWxlbWVudC0+c2V0TWVkaWFDb250 cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKHZhbHVlKTsKK30KKwogfQogCiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRy b2xzSG9zdC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29u dHJvbHNIb3N0LmgKaW5kZXggMzA2Njg2NDkzZjcyZTYyY2QxMjI1YzYwYjNkMGNmYTgxYmI2Mzkx Zi4uMTM5ZjZjZDg3ZjlkMGNjZmYzMmUxNTQ3ZDA2MTk1ODI0ZTEzY2M5OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmgK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNI b3N0LmgKQEAgLTI5LDYgKzI5LDcgQEAKICNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBU KQogCiAjaW5jbHVkZSAiU2NyaXB0U3RhdGUuaCIKKyNpbmNsdWRlIDxiaW5kaW5ncy9TY3JpcHRP YmplY3QuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0 b3IuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KQEAgLTY1LDExICs2NiwxOCBA QCBwdWJsaWM6CiAgICAgU3RyaW5nIGV4dGVybmFsRGV2aWNlRGlzcGxheU5hbWUoKSBjb25zdDsK ICAgICBTdHJpbmcgZXh0ZXJuYWxEZXZpY2VUeXBlKCkgY29uc3Q7CiAKKyAgICBib29sIGNvbnRy b2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoKSBjb25zdDsKKyAgICB2b2lkIHNldENvbnRyb2xz RGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoYm9vbCB2KTsKKworICAgIEpTQzo6SlNWYWx1ZSBjb250 cm9sbGVySlNWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udHJvbGxlcjsgfQorICAgIHZvaWQg c2V0Q29udHJvbGxlckpTVmFsdWUoSlNDOjpKU1ZhbHVlIGNvbnRyb2xsZXIpIHsgbV9jb250cm9s bGVyID0gY29udHJvbGxlcjsgfQorCiBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbHNIb3N0KEhU TUxNZWRpYUVsZW1lbnQqKTsKIAogICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1fbWVkaWFFbGVtZW50 OwogICAgIFJlZlB0cjxNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50PiBtX3Rl eHRUcmFja0NvbnRhaW5lcjsKKyAgICBKU0M6OkpTVmFsdWUgbV9jb250cm9sbGVyOwogfTsKIAog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlh Q29udHJvbHNIb3N0LmlkbCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9N ZWRpYUNvbnRyb2xzSG9zdC5pZGwKaW5kZXggYjhjYzA4NjAwY2NhYzZlOWNlMThkNjhjNmI1ZGZk MjllZjQ5NGVhNS4uZDdhNjhkNzUwZGE1Njk1ZDI4OTNlY2M3NTQ0NDliZWY1ZWI2ZTY3MCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJv bHNIb3N0LmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVk aWFDb250cm9sc0hvc3QuaWRsCkBAIC00OCw0ICs0OCw2IEBAIGVudW0gRGV2aWNlVHlwZSB7CiAK ICAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5nIGV4dGVybmFsRGV2aWNlRGlzcGxheU5h bWU7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIERldmljZVR5cGUgZXh0ZXJuYWxEZXZpY2VUeXBl OworCisgICAgYXR0cmlidXRlIGJvb2xlYW4gY29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rv cjsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMv bWVkaWFDb250cm9sc2lPUy5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJv bHMvbWVkaWFDb250cm9sc2lPUy5jc3MKaW5kZXggZGE3MjcyYTY0NTJjZWJmNWJiZTdmNzIxNmI5 MTM5M2E3NmJmZDhkMS4uZTZlODYxMGE0YWM5ZWVhMmE1YmVlMWFiZWZiZTljMjQ0OWZkZDY3ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29u dHJvbHNpT1MuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9t ZWRpYUNvbnRyb2xzaU9TLmNzcwpAQCAtMTIxLDYgKzEyMSw3IEBAIGF1ZGlvOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXBhbmVsIHsKICAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lOwogCiAg ICAgdHJhbnNpdGlvbjogb3BhY2l0eSAwLjI1cyBsaW5lYXI7CisgICAgLXdlYmtpdC10cmFuc2Zv cm0tb3JpZ2luOiBib3R0b20gbGVmdDsKIH0KIAogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJv bHMtcGFuZWwgewpAQCAtMTU0LDE5ICsxNTUsMTkgQEAgYXVkaW86Oi13ZWJraXQtbWVkaWEtY29u dHJvbHMtc3RhcnQtcGxheWJhY2stYnV0dG9uIHsKICAgICBwYWRkaW5nOiAwOwogICAgIGJvcmRl cjogMDsKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7Ci0gICAgd2lkdGg6IDE1MHB4OwotICAgIGhl aWdodDogMTUwcHg7Ci0gICAgbGVmdDogY2FsYyg1MCUgLSA3NXB4KTsKLSAgICB0b3A6IGNhbGMo NTAlIC0gNzVweCk7CisgICAgd2lkdGg6IDcycHg7CisgICAgaGVpZ2h0OiA3MnB4OworICAgIGxl ZnQ6IGNhbGMoNTAlIC0gMzZweCk7CisgICAgdG9wOiBjYWxjKDUwJSAtIDM2cHgpOwogICAgIGJh Y2tncm91bmQtb3JpZ2luOiBjb250ZW50LWJveDsKICAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8t cmVwZWF0OwogICAgIGJhY2tncm91bmQtcG9zaXRpb246IGNlbnRlcjsKLSAgICBiYWNrZ3JvdW5k LWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHdpZHRoPSIxNDAiIGhlaWdodD0i MTQwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxjaXJjbGUgcj0iNzAiIGN5 PSI3MCIgY3g9IjcwIiBmaWxsPSJyZ2JhKDI0NywgMjQ3LCAyNDcsIC44MikiLz48cGF0aCBkPSJN IDQ4LDM0IHYgNzIgbCA2MiwtMzUuNSB6IiBmaWxsPSJyZ2JhKDEyOSwgMTI5LCAxMjksIC45KSIv Pjwvc3ZnPicpOworICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1s LDxzdmcgdmlld0JveD0iMCAwIDE0NCAxNDQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw L3N2ZyI+PGNpcmNsZSBjeD0iNzIiIGN5PSI3MiIgcj0iNzAiIGZpbGw9InJnYmEoMjQ3LCAyNDcs IDI0NywgLjgyKSIvPjxwYXRoIGQ9Ik00OCwzNnY3NEwxMDksNzRMNDgsMzZ6IiBmaWxsPSJyZ2Jh KDEyOSwgMTI5LCAxMjksIC45KSIvPjwvc3ZnPicpOwogfQogCiB2aWRlbzo6LXdlYmtpdC1tZWRp YS1jb250cm9scy1zdGFydC1wbGF5YmFjay1idXR0b24uZmFpbGVkLAogYXVkaW86Oi13ZWJraXQt bWVkaWEtY29udHJvbHMtc3RhcnQtcGxheWJhY2stYnV0dG9uLmZhaWxlZCB7Ci0gICAgYmFja2dy b3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB3aWR0aD0iMTQwIiBoZWln aHQ9IjE0MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48Y2lyY2xlIHI9Ijcw IiBjeT0iNzAiIGN4PSI3MCIgZmlsbD0icmdiYSgyNDcsIDI0NywgMjQ3LCAuODIpIi8+PGcgZmls bD0icmdiYSgxMjksIDEyOSwgMTI5LCAuOSkiPjxwYXRoIGQ9Ik0gNDgsMzQgdiAxNyBsIDQ3LDI4 IGwgMTUsLTguNSB6Ii8+PHBhdGggZD0iTSAxNiwzNiBsIDExMCw2NCBsIC0yLDQgbCAtMTEwLC02 NCB6Ii8+PHBhdGggZD0iTSA0OCw2MyB2IDQzIGwgMzcsLTIxLjUgeiIvPjwvZz48L3N2Zz4nKTsK KyAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHZpZXdC b3g9IjAgMCAxNDQgMTQ0IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxjaXJj bGUgY3g9IjcyIiBjeT0iNzIiIHI9IjcwIiBmaWxsPSJyZ2JhKDI0NywgMjQ3LCAyNDcsIC44Miki Lz48ZyBmaWxsPSJyZ2JhKDEyOSwgMTI5LCAxMjksIC45KSI+PHJlY3QgeD0iMTQiIHk9IjcwLjQi IHRyYW5zZm9ybT0ibWF0cml4KDAuODQ5MyAwLjUyNzkgLTAuNTI3OSAwLjg0OTMgNDguODYxNCAt MjcuMTU5NSkiIHdpZHRoPSIxMTYiIGhlaWdodD0iMy4yIi8+PHBvbHlnb24gcG9pbnRzPSIxMDks NzQgNDgsMzYgNDgsNTIuMyA5NS42LDgxLjkgIi8+PHBvbHlnb24gcG9pbnRzPSI0OCwxMTAgODcu Nyw4Ni42IDQ4LDYxLjkgIi8+PC9nPjwvc3ZnPicpOwogfQogCiB2aWRlbzo6LXdlYmtpdC1tZWRp YS1jb250cm9scy1wbGF5LWJ1dHRvbiwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmpzIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanMKaW5kZXggYmQyNzFlZjlkMjM5 YTY0MTBhNDhlZWZhNjFiYTk2YjA4ODkxN2Y1ZC4uYWNmYjFhYWRiZGRlMmY0NGM3Zjc2YmZiZjEy ODlmYjE4M2U0NWE5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNv bnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanMKQEAgLTYsMTAgKzYsMTMgQEAgZnVuY3Rp b24gY3JlYXRlQ29udHJvbHMocm9vdCwgdmlkZW8sIGhvc3QpCiBmdW5jdGlvbiBDb250cm9sbGVy SU9TKHJvb3QsIHZpZGVvLCBob3N0KQogewogICAgIHRoaXMuaGFzV2lyZWxlc3NQbGF5YmFja1Rh cmdldHMgPSBmYWxzZTsKKyAgICB0aGlzLl9wYWdlU2NhbGVGYWN0b3IgPSAxOwogICAgIENvbnRy b2xsZXIuY2FsbCh0aGlzLCByb290LCB2aWRlbywgaG9zdCk7CiAKICAgICB0aGlzLnVwZGF0ZVdp cmVsZXNzVGFyZ2V0QXZhaWxhYmxlKCk7CiAgICAgdGhpcy51cGRhdGVXaXJlbGVzc1BsYXliYWNr U3RhdHVzKCk7CisKKyAgICBob3N0LmNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IgPSB0 cnVlOwogfTsKIAogLyogRW51bXMgKi8KQEAgLTQwMyw2ICs0MDYsMjUgQEAgQ29udHJvbGxlcklP Uy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMudmlkZW8ud2Via2l0U2hvd1BsYXliYWNrVGFy Z2V0UGlja2VyKCk7CiAgICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOwogICAgIH0sCisK KyAgICBnZXQgcGFnZVNjYWxlRmFjdG9yKCkgeworICAgICAgICByZXR1cm4gdGhpcy5fcGFnZVNj YWxlRmFjdG9yOworICAgIH0sCisKKyAgICBzZXQgcGFnZVNjYWxlRmFjdG9yKG5ld1NjYWxlRmFj dG9yKSB7CisgICAgICAgIHRoaXMuX3BhZ2VTY2FsZUZhY3RvciA9IG5ld1NjYWxlRmFjdG9yOwor CisgICAgICAgIGlmIChuZXdTY2FsZUZhY3RvcikgeworICAgICAgICAgICAgdmFyIHNjYWxlVHJh bnNmb3JtID0gInNjYWxlKCIgKyAoMSAvIG5ld1NjYWxlRmFjdG9yKSArICIpIjsKKyAgICAgICAg ICAgIGlmICh0aGlzLmNvbnRyb2xzLnN0YXJ0UGxheWJhY2tCdXR0b24pCisgICAgICAgICAgICAg ICAgdGhpcy5jb250cm9scy5zdGFydFBsYXliYWNrQnV0dG9uLnN0eWxlLndlYmtpdFRyYW5zZm9y bSA9IHNjYWxlVHJhbnNmb3JtOworICAgICAgICAgICAgaWYgKHRoaXMuY29udHJvbHMucGFuZWwp IHsKKyAgICAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLnBhbmVsLnN0eWxlLndpZHRoID0gKG5l d1NjYWxlRmFjdG9yICogMTAwKSArICIlIjsKKyAgICAgICAgICAgICAgICB0aGlzLmNvbnRyb2xz LnBhbmVsLnN0eWxlLndlYmtpdFRyYW5zZm9ybSA9IHNjYWxlVHJhbnNmb3JtOworICAgICAgICAg ICAgICAgIHRoaXMudXBkYXRlUHJvZ3Jlc3MoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQor ICAgIH0KIH07CiAKIE9iamVjdC5jcmVhdGUoQ29udHJvbGxlci5wcm90b3R5cGUpLmV4dGVuZChD b250cm9sbGVySU9TLnByb3RvdHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcAppbmRleCA3OGQxNDkzMjlkOWVhMzY1N2NlNmI4ZjIyZjlkZWZmY2I2NTAzMjM4Li5k YzA5MDczMjMzNDlhY2RkNWUyMWNjNWUyNDRiMjJkMjNkYTJiMWFkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKQEAgLTU5MTYsNiArNTkxNiw3IEBAIERPTVdyYXBw ZXJXb3JsZCYgSFRNTE1lZGlhRWxlbWVudDo6ZW5zdXJlSXNvbGF0ZWRXb3JsZCgpCiAKIGJvb2wg SFRNTE1lZGlhRWxlbWVudDo6ZW5zdXJlTWVkaWFDb250cm9sc0luamVjdGVkU2NyaXB0KCkKIHsK KyAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjplbnN1cmVNZWRpYUNvbnRyb2xzSW5q ZWN0ZWRTY3JpcHQiKTsKICAgICBQYWdlKiBwYWdlID0gZG9jdW1lbnQoKS5wYWdlKCk7CiAgICAg aWYgKCFwYWdlKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC01OTI5LDggKzU5MzAsOCBAQCBi b29sIEhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlhQ29udHJvbHNJbmplY3RlZFNjcmlwdCgp CiAgICAgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCA9IEpTQzo6anNDYXN0PEpTRE9N R2xvYmFsT2JqZWN0Kj4oc2NyaXB0Q29udHJvbGxlci5nbG9iYWxPYmplY3Qod29ybGQpKTsKICAg ICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOwogCi0g ICAgSlNDOjpKU1ZhbHVlIG92ZXJsYXlWYWx1ZSA9IGdsb2JhbE9iamVjdC0+Z2V0KGV4ZWMsIEpT Qzo6SWRlbnRpZmllcihleGVjLCAiY3JlYXRlQ29udHJvbHMiKSk7Ci0gICAgaWYgKG92ZXJsYXlW YWx1ZS5pc0Z1bmN0aW9uKCkpCisgICAgSlNDOjpKU1ZhbHVlIGZ1bmN0aW9uVmFsdWUgPSBnbG9i YWxPYmplY3QtPmdldChleGVjLCBKU0M6OklkZW50aWZpZXIoZXhlYywgImNyZWF0ZUNvbnRyb2xz IikpOworICAgIGlmIChmdW5jdGlvblZhbHVlLmlzRnVuY3Rpb24oKSkKICAgICAgICAgcmV0dXJu IHRydWU7CiAKICNpZm5kZWYgTkRFQlVHCkBAIC01OTQ4LDggKzU5NDksMTYgQEAgYm9vbCBIVE1M TWVkaWFFbGVtZW50OjplbnN1cmVNZWRpYUNvbnRyb2xzSW5qZWN0ZWRTY3JpcHQoKQogICAgIHJl dHVybiB0cnVlOwogfQogCitzdGF0aWMgdm9pZCBzZXRQYWdlU2NhbGVGYWN0b3JQcm9wZXJ0eShK U0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNDOjpKU1ZhbHVlIGNvbnRyb2xsZXJWYWx1ZSwgZmxvYXQg cGFnZVNjYWxlRmFjdG9yKQoreworICAgIEpTQzo6UHV0UHJvcGVydHlTbG90IHByb3BlcnR5U2xv dChjb250cm9sbGVyVmFsdWUpOworICAgIEpTQzo6SlNPYmplY3QqIGNvbnRyb2xsZXJPYmplY3Qg PSBjb250cm9sbGVyVmFsdWUudG9PYmplY3QoZXhlYyk7CisgICAgY29udHJvbGxlck9iamVjdC0+ bWV0aG9kVGFibGUoKS0+cHV0KGNvbnRyb2xsZXJPYmplY3QsIGV4ZWMsIEpTQzo6SWRlbnRpZmll cihleGVjLCAicGFnZVNjYWxlRmFjdG9yIiksIEpTQzo6anNOdW1iZXIocGFnZVNjYWxlRmFjdG9y KSwgcHJvcGVydHlTbG90KTsKK30KKwogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpkaWRBZGRVc2Vy QWdlbnRTaGFkb3dSb290KFNoYWRvd1Jvb3QqIHJvb3QpCiB7CisgICAgTE9HKE1lZGlhLCAiSFRN TE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdCIpOwogI2lmIEVOQUJMRShQ TFVHSU5fUFJPWFlfRk9SX1ZJREVPKQogICAgIC8vIEphdmFTY3JpcHQgY29udHJvbHMgYXJlIG5v dCBlbmFibGVkIHdpdGggdGhlIHZpZGVvIHBsdWdpbiBwcm94eS4KICAgICBpZiAoc2hvdWxkVXNl VmlkZW9QbHVnaW5Qcm94eSgpKQpAQCAtNTk2OSw5ICs1OTc4LDE3IEBAIHZvaWQgSFRNTE1lZGlh RWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdChTaGFkb3dSb290KiByb290KQogICAg IEpTQzo6RXhlY1N0YXRlKiBleGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAgICAg SlNDOjpKU0xvY2tIb2xkZXIgbG9jayhleGVjKTsKIAotICAgIC8vIEl0IGlzIGV4cGVjdGVkIHRo ZSBKUyBmaWxlIHByb3ZpZGVzIGEgY3JlYXRlQ29udHJvbHMoc2hhZG93Um9vdCwgdmlkZW8sIG1l ZGlhQ29udHJvbHNIb3N0KSBmdW5jdGlvbi4KLSAgICBKU0M6OkpTVmFsdWUgb3ZlcmxheVZhbHVl ID0gZ2xvYmFsT2JqZWN0LT5nZXQoZXhlYywgSlNDOjpJZGVudGlmaWVyKGV4ZWMsICJjcmVhdGVD b250cm9scyIpKTsKLSAgICBpZiAob3ZlcmxheVZhbHVlLmlzVW5kZWZpbmVkT3JOdWxsKCkpCisg ICAgLy8gVGhlIG1lZGlhIGNvbnRyb2xzIHNjcmlwdCBtdXN0IHByb3ZpZGUgYSBtZXRob2Qgd2l0 aCB0aGUgZm9sbG93aW5nIGRldGFpbHMuCisgICAgLy8gTmFtZTogY3JlYXRlQ29udHJvbHMKKyAg ICAvLyBQYXJhbWV0ZXJzOgorICAgIC8vICAgICAxLiBUaGUgU2hhZG93Um9vdCBlbGVtZW50IHRo YXQgd2lsbCBob2xkIHRoZSBjb250cm9scy4KKyAgICAvLyAgICAgMi4gVGhpcyBvYmplY3QgKGFu ZCBIVE1MTWVkaWFFbGVtZW50KS4KKyAgICAvLyAgICAgMy4gVGhlIE1lZGlhQ29udHJvbHNIb3N0 IG9iamVjdC4KKyAgICAvLyBSZXR1cm4gdmFsdWU6CisgICAgLy8gICAgIEEgcmVmZXJlbmNlIHRv IHRoZSBjcmVhdGVkIG1lZGlhIGNvbnRyb2xsZXIgaW5zdGFuY2UuCisKKyAgICBKU0M6OkpTVmFs dWUgZnVuY3Rpb25WYWx1ZSA9IGdsb2JhbE9iamVjdC0+Z2V0KGV4ZWMsIEpTQzo6SWRlbnRpZmll cihleGVjLCAiY3JlYXRlQ29udHJvbHMiKSk7CisgICAgaWYgKGZ1bmN0aW9uVmFsdWUuaXNVbmRl ZmluZWRPck51bGwoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCFtX21lZGlhQ29udHJv bHNIb3N0KQpAQCAtNTk4MiwxMyArNTk5OSwxNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRp ZEFkZFVzZXJBZ2VudFNoYWRvd1Jvb3QoU2hhZG93Um9vdCogcm9vdCkKICAgICBhcmdMaXN0LmFw cGVuZCh0b0pTKGV4ZWMsIGdsb2JhbE9iamVjdCwgdGhpcykpOwogICAgIGFyZ0xpc3QuYXBwZW5k KHRvSlMoZXhlYywgZ2xvYmFsT2JqZWN0LCBtX21lZGlhQ29udHJvbHNIb3N0LmdldCgpKSk7CiAK LSAgICBKU0M6OkpTT2JqZWN0KiBvdmVybGF5ID0gb3ZlcmxheVZhbHVlLnRvT2JqZWN0KGV4ZWMp OworICAgIEpTQzo6SlNPYmplY3QqIGZ1bmN0aW9uID0gZnVuY3Rpb25WYWx1ZS50b09iamVjdChl eGVjKTsKICAgICBKU0M6OkNhbGxEYXRhIGNhbGxEYXRhOwotICAgIEpTQzo6Q2FsbFR5cGUgY2Fs bFR5cGUgPSBvdmVybGF5LT5tZXRob2RUYWJsZSgpLT5nZXRDYWxsRGF0YShvdmVybGF5LCBjYWxs RGF0YSk7CisgICAgSlNDOjpDYWxsVHlwZSBjYWxsVHlwZSA9IGZ1bmN0aW9uLT5tZXRob2RUYWJs ZSgpLT5nZXRDYWxsRGF0YShmdW5jdGlvbiwgY2FsbERhdGEpOwogICAgIGlmIChjYWxsVHlwZSA9 PSBKU0M6OkNhbGxUeXBlTm9uZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgSlNDOjpjYWxsKGV4 ZWMsIG92ZXJsYXksIGNhbGxUeXBlLCBjYWxsRGF0YSwgZ2xvYmFsT2JqZWN0LCBhcmdMaXN0KTsK KyAgICBKU0M6OkpTVmFsdWUgY29udHJvbGxlclZhbHVlID0gSlNDOjpjYWxsKGV4ZWMsIGZ1bmN0 aW9uLCBjYWxsVHlwZSwgY2FsbERhdGEsIGdsb2JhbE9iamVjdCwgYXJnTGlzdCk7CisgICAgbV9t ZWRpYUNvbnRyb2xzSG9zdC0+c2V0Q29udHJvbGxlckpTVmFsdWUoY29udHJvbGxlclZhbHVlKTsK KworICAgIHNldFBhZ2VTY2FsZUZhY3RvclByb3BlcnR5KGV4ZWMsIGNvbnRyb2xsZXJWYWx1ZSwg cGFnZS0+cGFnZVNjYWxlRmFjdG9yKCkpOworCiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigp KQogICAgICAgICBleGVjLT5jbGVhckV4Y2VwdGlvbigpOwogfQpAQCAtNjAwOSw2ICs2MDMwLDIw IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0TWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNj YWxlRmFjdG9yKGJvb2wgZGVwZW5kc09uUGFnCiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cGFn ZVNjYWxlRmFjdG9yQ2hhbmdlZCgpCiB7CisgICAgUGFnZSogcGFnZSA9IGRvY3VtZW50KCkucGFn ZSgpOworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgTE9HKE1lZGlhLCAi SFRNTE1lZGlhRWxlbWVudDo6cGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCA9ICVmIiwgcGFnZS0+cGFn ZVNjYWxlRmFjdG9yKCkpOworICAgIERPTVdyYXBwZXJXb3JsZCYgd29ybGQgPSBlbnN1cmVJc29s YXRlZFdvcmxkKCk7CisgICAgU2NyaXB0Q29udHJvbGxlciYgc2NyaXB0Q29udHJvbGxlciA9IHBh Z2UtPm1haW5GcmFtZSgpLnNjcmlwdCgpOworICAgIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxP YmplY3QgPSBKU0M6OmpzQ2FzdDxKU0RPTUdsb2JhbE9iamVjdCo+KHNjcmlwdENvbnRyb2xsZXIu Z2xvYmFsT2JqZWN0KHdvcmxkKSk7CisgICAgSlNDOjpFeGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxP YmplY3QtPmdsb2JhbEV4ZWMoKTsKKyAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKGV4ZWMpOwor CisgICAgSlNDOjpKU1ZhbHVlIGNvbnRyb2xsZXJWYWx1ZSA9IG1fbWVkaWFDb250cm9sc0hvc3Qt PmNvbnRyb2xsZXJKU1ZhbHVlKCk7CisKKyAgICBzZXRQYWdlU2NhbGVGYWN0b3JQcm9wZXJ0eShl eGVjLCBjb250cm9sbGVyVmFsdWUsIHBhZ2UtPnBhZ2VTY2FsZUZhY3RvcigpKTsKIH0KICNlbmRp ZiAvLyBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQogCg== 228992 2014-04-09 15:19:14 -0700 2014-04-09 15:19:14 -0700 Landing Patch 3 patch_2.txt text/plain 13796 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzAyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ0IEBACisyMDE0LTA0LTA5ICBEZWFuIEph Y2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBNZWRpYSBjb250cm9scyBz aG91bGQgcmVzaXplIGFzIHRoZSB1c2VyIHpvb21zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMjIKKworICAgICAgICBSZXZpZXdlZCBieSBFcmlj IENhcmxzb24uCisKKyAgICAgICAgT24gaU9TIHRoZSBtZWRpYSBjb250cm9scyBzaG91bGQgcmVt YWluIHRoZSBzYW1lIHNpemUKKyAgICAgICAgaW5kZXBlbmRlbnQgb2YgdXNlciB6b29tLiBIYXZl IHRoZSBIVE1MTWVkaWFFbGVtZW50IG9wdGlvbmFsbHkKKyAgICAgICAgcmVnaXN0ZXIgZm9yIHVw ZGF0ZXMgaW4gdGhlIHBhZ2Ugc2NhbGUgdG8gYXBwbHkgYW4gaW52ZXJzZQorICAgICAgICBzY2Fs ZS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5j cHA6IE5ldyBleHBvc2VkIHByb3BlcnR5IHRoYXQgY2FsbHMKKyAgICAgICAgYmFjayBpbnRvIEhU TUxNZWRpYUVsZW1lbnQ6Om1lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rvci4KKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0Ojpjb250cm9sc0RlcGVuZE9uUGFnZVNj YWxlRmFjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0OjpzZXRDb250 cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhY29u dHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaDogS2VlcCBhIHJlZmVyZW5jZSB0byB0aGUgYWN0dWFs CisgICAgICAgIGNvbnRyb2xzIGZyb20gdGhlIEphdmFTY3JpcHQgc2lkZSBzbyB3ZSBjYW4gdGFs ayB0byBpdCBsYXRlci4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0Ojpjb250 cm9sbGVySlNWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xzSG9zdDo6c2V0 Q29udHJvbGxlckpTVmFsdWUpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9NZWRp YUNvbnRyb2xzSG9zdC5pZGw6IEV4cG9zZSBjb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9y LgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuY3Nz OgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwpOiBTcGVjaWZ5 IHRoZSB0cmFuc2Zvcm0gb3JpZ2luIHNvIHRoYXQKKyAgICAgICAgc2NhbGluZyB3aWxsIGtlZXAg dGhlIGNvbnRyb2xzIHBpbm5lZCB0byB0aGUgYm90dG9tIGxlZnQgY29ybmVyLgorICAgICAgICAo YXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc3RhcnQtcGxheWJhY2stYnV0dG9uKTogVXBk YXRlIHRvIHRoZSBjb3JyZWN0IHNpemUKKyAgICAgICAgYW5kIHByb3ZpZGUgbmV3IGFydHdvcmsu CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zdGFydC1wbGF5YmFjay1i dXR0b24uZmFpbGVkKTogTmV3IGFydHdvcmsuCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRy b2xzL21lZGlhQ29udHJvbHNpT1MuanM6CisgICAgICAgIChDb250cm9sbGVySU9TKTogVGVsbCB0 aGUgaG9zdCB0aGF0IHRoZXNlIGNvbnRyb2xzIGNhcmUgYWJvdXQgdGhlIHBhZ2Ugc2NhbGUuCisg ICAgICAgIChDb250cm9sbGVySU9TLnByb3RvdHlwZS5nZXQgcGFnZVNjYWxlRmFjdG9yKTogTmV3 IGdldHRlci4KKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLnNldCBwYWdlU2NhbGVG YWN0b3IpOiBXaGVuIHNldCwgdXBkYXRlIHRoZSBwbGF5IGJ1dHRvbiBhbmQgdGhlIHBhbmVsLgor CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlhQ29udHJvbHNJbmplY3RlZFNjcmlwdCk6IFNt YWxsIG5hbWluZyBjbGVhbnVwLgorICAgICAgICAoc2V0UGFnZVNjYWxlRmFjdG9yUHJvcGVydHkp OiBTdGF0aWMgaGVscGVyIHRvIHNldCBhIEpTIHByb3BlcnR5IHZhbHVlLgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdCk6IEtlZXAg YSByZWZlcmVuY2UgdG8gdGhlIGNvbnRyb2xzIG9iamVjdCwKKyAgICAgICAgYW5kIG1ha2Ugc3Vy ZSB0byBzZXQgdGhlIHBhZ2Ugc2NhbGUgZmFjdG9yIG9uIHRoZSBjb250cm9scy4KKyAgICAgICAg KFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQpOiBJbXBs ZW1lbnQgdGhlIGNhbGxiYWNrLCB0ZWxsaW5nCisgICAgICAgIHRoZSBjb250cm9scyBvYmplY3Qg dGhhdCBpdCBuZWVkcyB0byByZWxheW91dC4KKwogMjAxNC0wNC0wOSAgQnJlbmRhbiBMb25nICA8 Yi5sb25nQGNhYmxlbGFicy5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gRXhwb3NlIE1QRUct VFMgbWV0YWRhdGEKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9N ZWRpYUNvbnRyb2xzSG9zdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcAkocmV2aXNpb24gMTY3MDI1KQor KysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjYsNiArNjYsNyBAQCBQYXNzUmVmUHRyPE1lZGlhQ29u dHJvbHNIb3N0PiBNZWRpYUNvbnRyCiAKIE1lZGlhQ29udHJvbHNIb3N0OjpNZWRpYUNvbnRyb2xz SG9zdChIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQpCiAgICAgOiBtX21lZGlhRWxlbWVu dChtZWRpYUVsZW1lbnQpCisgICAgLCBtX2NvbnRyb2xsZXIoSlNDOjpKU1ZhbHVlKCkpCiB7CiAg ICAgQVNTRVJUKG1lZGlhRWxlbWVudCk7CiB9CkBAIC0yMTQsNyArMjE1LDE3IEBAIFN0cmluZyBN ZWRpYUNvbnRyb2xzSG9zdDo6ZXh0ZXJuYWxEZXZpY2UKICAgICAKICAgICByZXR1cm4gdHlwZTsK IH0KLSAgICAKKworYm9vbCBNZWRpYUNvbnRyb2xzSG9zdDo6Y29udHJvbHNEZXBlbmRPblBhZ2VT Y2FsZUZhY3RvcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fbWVkaWFFbGVtZW50LT5tZWRpYUNv bnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoKTsKK30KKwordm9pZCBNZWRpYUNvbnRyb2xz SG9zdDo6c2V0Q29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rvcihib29sIHZhbHVlKQorewor ICAgIG1fbWVkaWFFbGVtZW50LT5zZXRNZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0 b3IodmFsdWUpOworfQorCiB9CiAKICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmgJKHJldmlz aW9uIDE2NzAyNSkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRp YUNvbnRyb2xzSG9zdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw3IEBACiAjaWYgRU5B QkxFKE1FRElBX0NPTlRST0xTX1NDUklQVCkKIAogI2luY2x1ZGUgIlNjcmlwdFN0YXRlLmgiCisj aW5jbHVkZSA8YmluZGluZ3MvU2NyaXB0T2JqZWN0Lmg+CiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50 ZWQuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3Ry aW5nLmg+CkBAIC02NSwxMSArNjYsMTggQEAgcHVibGljOgogICAgIFN0cmluZyBleHRlcm5hbERl dmljZURpc3BsYXlOYW1lKCkgY29uc3Q7CiAgICAgU3RyaW5nIGV4dGVybmFsRGV2aWNlVHlwZSgp IGNvbnN0OwogCisgICAgYm9vbCBjb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKCkgY29u c3Q7CisgICAgdm9pZCBzZXRDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKGJvb2wgdik7 CisKKyAgICBKU0M6OkpTVmFsdWUgY29udHJvbGxlckpTVmFsdWUoKSBjb25zdCB7IHJldHVybiBt X2NvbnRyb2xsZXI7IH0KKyAgICB2b2lkIHNldENvbnRyb2xsZXJKU1ZhbHVlKEpTQzo6SlNWYWx1 ZSBjb250cm9sbGVyKSB7IG1fY29udHJvbGxlciA9IGNvbnRyb2xsZXI7IH0KKwogcHJpdmF0ZToK ICAgICBNZWRpYUNvbnRyb2xzSG9zdChIVE1MTWVkaWFFbGVtZW50Kik7CiAKICAgICBIVE1MTWVk aWFFbGVtZW50KiBtX21lZGlhRWxlbWVudDsKICAgICBSZWZQdHI8TWVkaWFDb250cm9sVGV4dFRy YWNrQ29udGFpbmVyRWxlbWVudD4gbV90ZXh0VHJhY2tDb250YWluZXI7CisgICAgSlNDOjpKU1Zh bHVlIG1fY29udHJvbGxlcjsKIH07CiAKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGwKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbAkocmV2 aXNpb24gMTY3MDI1KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01l ZGlhQ29udHJvbHNIb3N0LmlkbAkod29ya2luZyBjb3B5KQpAQCAtNDgsNCArNDgsNiBAQCBlbnVt IERldmljZVR5cGUgewogCiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIERPTVN0cmluZyBleHRlcm5h bERldmljZURpc3BsYXlOYW1lOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBEZXZpY2VUeXBlIGV4 dGVybmFsRGV2aWNlVHlwZTsKKworICAgIGF0dHJpYnV0ZSBib29sZWFuIGNvbnRyb2xzRGVwZW5k T25QYWdlU2NhbGVGYWN0b3I7CiB9OwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuY3NzCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmNzcwkocmV2aXNpb24g MTY3MDI1KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29u dHJvbHNpT1MuY3NzCSh3b3JraW5nIGNvcHkpCkBAIC0xMjEsNiArMTIxLDcgQEAgYXVkaW86Oi13 ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgewogICAgIC13ZWJraXQtdXNlci1zZWxlY3Q6IG5v bmU7CiAKICAgICB0cmFuc2l0aW9uOiBvcGFjaXR5IDAuMjVzIGxpbmVhcjsKKyAgICAtd2Via2l0 LXRyYW5zZm9ybS1vcmlnaW46IGJvdHRvbSBsZWZ0OwogfQogCiB2aWRlbzo6LXdlYmtpdC1tZWRp YS1jb250cm9scy1wYW5lbCB7CkBAIC0xNTQsMTkgKzE1NSwxOSBAQCBhdWRpbzo6LXdlYmtpdC1t ZWRpYS1jb250cm9scy1zdGFydC1wbGF5CiAgICAgcGFkZGluZzogMDsKICAgICBib3JkZXI6IDA7 CiAgICAgcG9zaXRpb246IGFic29sdXRlOwotICAgIHdpZHRoOiAxNTBweDsKLSAgICBoZWlnaHQ6 IDE1MHB4OwotICAgIGxlZnQ6IGNhbGMoNTAlIC0gNzVweCk7Ci0gICAgdG9wOiBjYWxjKDUwJSAt IDc1cHgpOworICAgIHdpZHRoOiA3MnB4OworICAgIGhlaWdodDogNzJweDsKKyAgICBsZWZ0OiBj YWxjKDUwJSAtIDM2cHgpOworICAgIHRvcDogY2FsYyg1MCUgLSAzNnB4KTsKICAgICBiYWNrZ3Jv dW5kLW9yaWdpbjogY29udGVudC1ib3g7CiAgICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVh dDsKICAgICBiYWNrZ3JvdW5kLXBvc2l0aW9uOiBjZW50ZXI7Ci0gICAgYmFja2dyb3VuZC1pbWFn ZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB3aWR0aD0iMTQwIiBoZWlnaHQ9IjE0MCIg eG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48Y2lyY2xlIHI9IjcwIiBjeT0iNzAi IGN4PSI3MCIgZmlsbD0icmdiYSgyNDcsIDI0NywgMjQ3LCAuODIpIi8+PHBhdGggZD0iTSA0OCwz NCB2IDcyIGwgNjIsLTM1LjUgeiIgZmlsbD0icmdiYSgxMjksIDEyOSwgMTI5LCAuOSkiLz48L3N2 Zz4nKTsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8c3Zn IHZpZXdCb3g9IjAgMCAxNDQgMTQ0IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmci PjxjaXJjbGUgY3g9IjcyIiBjeT0iNzIiIHI9IjcwIiBmaWxsPSJyZ2JhKDI0NywgMjQ3LCAyNDcs IC44MikiLz48cGF0aCBkPSJNNDgsMzZ2NzRMMTA5LDc0TDQ4LDM2eiIgZmlsbD0icmdiYSgxMjks IDEyOSwgMTI5LCAuOSkiLz48L3N2Zz4nKTsKIH0KIAogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29u dHJvbHMtc3RhcnQtcGxheWJhY2stYnV0dG9uLmZhaWxlZCwKIGF1ZGlvOjotd2Via2l0LW1lZGlh LWNvbnRyb2xzLXN0YXJ0LXBsYXliYWNrLWJ1dHRvbi5mYWlsZWQgewotICAgIGJhY2tncm91bmQt aW1hZ2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1sLDxzdmcgd2lkdGg9IjE0MCIgaGVpZ2h0PSIx NDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGNpcmNsZSByPSI3MCIgY3k9 IjcwIiBjeD0iNzAiIGZpbGw9InJnYmEoMjQ3LCAyNDcsIDI0NywgLjgyKSIvPjxnIGZpbGw9InJn YmEoMTI5LCAxMjksIDEyOSwgLjkpIj48cGF0aCBkPSJNIDQ4LDM0IHYgMTcgbCA0NywyOCBsIDE1 LC04LjUgeiIvPjxwYXRoIGQ9Ik0gMTYsMzYgbCAxMTAsNjQgbCAtMiw0IGwgLTExMCwtNjQgeiIv PjxwYXRoIGQ9Ik0gNDgsNjMgdiA0MyBsIDM3LC0yMS41IHoiLz48L2c+PC9zdmc+Jyk7CisgICAg YmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB2aWV3Qm94PSIw IDAgMTQ0IDE0NCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48Y2lyY2xlIGN4 PSI3MiIgY3k9IjcyIiByPSI3MCIgZmlsbD0icmdiYSgyNDcsIDI0NywgMjQ3LCAuODIpIi8+PGcg ZmlsbD0icmdiYSgxMjksIDEyOSwgMTI5LCAuOSkiPjxyZWN0IHg9IjE0IiB5PSI3MC40IiB0cmFu c2Zvcm09Im1hdHJpeCgwLjg0OTMgMC41Mjc5IC0wLjUyNzkgMC44NDkzIDQ4Ljg2MTQgLTI3LjE1 OTUpIiB3aWR0aD0iMTE2IiBoZWlnaHQ9IjMuMiIvPjxwb2x5Z29uIHBvaW50cz0iMTA5LDc0IDQ4 LDM2IDQ4LDUyLjMgOTUuNiw4MS45ICIvPjxwb2x5Z29uIHBvaW50cz0iNDgsMTEwIDg3LjcsODYu NiA0OCw2MS45ICIvPjwvZz48L3N2Zz4nKTsKIH0KIAogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29u dHJvbHMtcGxheS1idXR0b24sCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29u dHJvbHMvbWVkaWFDb250cm9sc2lPUy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5qcwkocmV2aXNpb24gMTY3MDI1 KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNp T1MuanMJKHdvcmtpbmcgY29weSkKQEAgLTYsMTAgKzYsMTMgQEAgZnVuY3Rpb24gY3JlYXRlQ29u dHJvbHMocm9vdCwgdmlkZW8sIGhvcwogZnVuY3Rpb24gQ29udHJvbGxlcklPUyhyb290LCB2aWRl bywgaG9zdCkKIHsKICAgICB0aGlzLmhhc1dpcmVsZXNzUGxheWJhY2tUYXJnZXRzID0gZmFsc2U7 CisgICAgdGhpcy5fcGFnZVNjYWxlRmFjdG9yID0gMTsKICAgICBDb250cm9sbGVyLmNhbGwodGhp cywgcm9vdCwgdmlkZW8sIGhvc3QpOwogCiAgICAgdGhpcy51cGRhdGVXaXJlbGVzc1RhcmdldEF2 YWlsYWJsZSgpOwogICAgIHRoaXMudXBkYXRlV2lyZWxlc3NQbGF5YmFja1N0YXR1cygpOworCisg ICAgaG9zdC5jb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yID0gdHJ1ZTsKIH07CiAKIC8q IEVudW1zICovCkBAIC00MDMsNiArNDA2LDI1IEBAIENvbnRyb2xsZXJJT1MucHJvdG90eXBlID0g ewogICAgICAgICB0aGlzLnZpZGVvLndlYmtpdFNob3dQbGF5YmFja1RhcmdldFBpY2tlcigpOwog ICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24oKTsKICAgICB9LAorCisgICAgZ2V0IHBhZ2VT Y2FsZUZhY3RvcigpIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3BhZ2VTY2FsZUZhY3RvcjsKKyAg ICB9LAorCisgICAgc2V0IHBhZ2VTY2FsZUZhY3RvcihuZXdTY2FsZUZhY3RvcikgeworICAgICAg ICB0aGlzLl9wYWdlU2NhbGVGYWN0b3IgPSBuZXdTY2FsZUZhY3RvcjsKKworICAgICAgICBpZiAo bmV3U2NhbGVGYWN0b3IpIHsKKyAgICAgICAgICAgIHZhciBzY2FsZVRyYW5zZm9ybSA9ICJzY2Fs ZSgiICsgKDEgLyBuZXdTY2FsZUZhY3RvcikgKyAiKSI7CisgICAgICAgICAgICBpZiAodGhpcy5j b250cm9scy5zdGFydFBsYXliYWNrQnV0dG9uKQorICAgICAgICAgICAgICAgIHRoaXMuY29udHJv bHMuc3RhcnRQbGF5YmFja0J1dHRvbi5zdHlsZS53ZWJraXRUcmFuc2Zvcm0gPSBzY2FsZVRyYW5z Zm9ybTsKKyAgICAgICAgICAgIGlmICh0aGlzLmNvbnRyb2xzLnBhbmVsKSB7CisgICAgICAgICAg ICAgICAgdGhpcy5jb250cm9scy5wYW5lbC5zdHlsZS53aWR0aCA9IChuZXdTY2FsZUZhY3RvciAq IDEwMCkgKyAiJSI7CisgICAgICAgICAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbC5zdHlsZS53 ZWJraXRUcmFuc2Zvcm0gPSBzY2FsZVRyYW5zZm9ybTsKKyAgICAgICAgICAgICAgICB0aGlzLnVw ZGF0ZVByb2dyZXNzKCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CiB9OwogCiBP YmplY3QuY3JlYXRlKENvbnRyb2xsZXIucHJvdG90eXBlKS5leHRlbmQoQ29udHJvbGxlcklPUy5w cm90b3R5cGUpOwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3Bw CShyZXZpc2lvbiAxNjcwMjUpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1l bnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01OTE4LDYgKzU5MTgsNyBAQCBET01XcmFwcGVyV29y bGQmIEhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyCiAKIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6ZW5z dXJlTWVkaWFDb250cm9sc0luamVjdGVkU2NyaXB0KCkKIHsKKyAgICBMT0coTWVkaWEsICJIVE1M TWVkaWFFbGVtZW50OjplbnN1cmVNZWRpYUNvbnRyb2xzSW5qZWN0ZWRTY3JpcHQiKTsKICAgICBQ YWdlKiBwYWdlID0gZG9jdW1lbnQoKS5wYWdlKCk7CiAgICAgaWYgKCFwYWdlKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CkBAIC01OTMxLDggKzU5MzIsOCBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6 OmVuc3VyZU1lZGlhQ29udHJvCiAgICAgSlNET01HbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCA9 IEpTQzo6anNDYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oc2NyaXB0Q29udHJvbGxlci5nbG9iYWxP YmplY3Qod29ybGQpKTsKICAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IGdsb2JhbE9iamVjdC0+ Z2xvYmFsRXhlYygpOwogCi0gICAgSlNDOjpKU1ZhbHVlIG92ZXJsYXlWYWx1ZSA9IGdsb2JhbE9i amVjdC0+Z2V0KGV4ZWMsIEpTQzo6SWRlbnRpZmllcihleGVjLCAiY3JlYXRlQ29udHJvbHMiKSk7 Ci0gICAgaWYgKG92ZXJsYXlWYWx1ZS5pc0Z1bmN0aW9uKCkpCisgICAgSlNDOjpKU1ZhbHVlIGZ1 bmN0aW9uVmFsdWUgPSBnbG9iYWxPYmplY3QtPmdldChleGVjLCBKU0M6OklkZW50aWZpZXIoZXhl YywgImNyZWF0ZUNvbnRyb2xzIikpOworICAgIGlmIChmdW5jdGlvblZhbHVlLmlzRnVuY3Rpb24o KSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICNpZm5kZWYgTkRFQlVHCkBAIC01OTUwLDggKzU5 NTEsMTYgQEAgYm9vbCBIVE1MTWVkaWFFbGVtZW50OjplbnN1cmVNZWRpYUNvbnRybwogICAgIHJl dHVybiB0cnVlOwogfQogCitzdGF0aWMgdm9pZCBzZXRQYWdlU2NhbGVGYWN0b3JQcm9wZXJ0eShK U0M6OkV4ZWNTdGF0ZSogZXhlYywgSlNDOjpKU1ZhbHVlIGNvbnRyb2xsZXJWYWx1ZSwgZmxvYXQg cGFnZVNjYWxlRmFjdG9yKQoreworICAgIEpTQzo6UHV0UHJvcGVydHlTbG90IHByb3BlcnR5U2xv dChjb250cm9sbGVyVmFsdWUpOworICAgIEpTQzo6SlNPYmplY3QqIGNvbnRyb2xsZXJPYmplY3Qg PSBjb250cm9sbGVyVmFsdWUudG9PYmplY3QoZXhlYyk7CisgICAgY29udHJvbGxlck9iamVjdC0+ bWV0aG9kVGFibGUoKS0+cHV0KGNvbnRyb2xsZXJPYmplY3QsIGV4ZWMsIEpTQzo6SWRlbnRpZmll cihleGVjLCAicGFnZVNjYWxlRmFjdG9yIiksIEpTQzo6anNOdW1iZXIocGFnZVNjYWxlRmFjdG9y KSwgcHJvcGVydHlTbG90KTsKK30KKwogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpkaWRBZGRVc2Vy QWdlbnRTaGFkb3dSb290KFNoYWRvd1Jvb3QqIHJvb3QpCiB7CisgICAgTE9HKE1lZGlhLCAiSFRN TE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdCIpOwogI2lmIEVOQUJMRShQ TFVHSU5fUFJPWFlfRk9SX1ZJREVPKQogICAgIC8vIEphdmFTY3JpcHQgY29udHJvbHMgYXJlIG5v dCBlbmFibGVkIHdpdGggdGhlIHZpZGVvIHBsdWdpbiBwcm94eS4KICAgICBpZiAoc2hvdWxkVXNl VmlkZW9QbHVnaW5Qcm94eSgpKQpAQCAtNTk3MSw5ICs1OTgwLDE3IEBAIHZvaWQgSFRNTE1lZGlh RWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2gKICAgICBKU0M6OkV4ZWNTdGF0ZSogZXhlYyA9IGds b2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOwogICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxvY2soZXhl Yyk7CiAKLSAgICAvLyBJdCBpcyBleHBlY3RlZCB0aGUgSlMgZmlsZSBwcm92aWRlcyBhIGNyZWF0 ZUNvbnRyb2xzKHNoYWRvd1Jvb3QsIHZpZGVvLCBtZWRpYUNvbnRyb2xzSG9zdCkgZnVuY3Rpb24u Ci0gICAgSlNDOjpKU1ZhbHVlIG92ZXJsYXlWYWx1ZSA9IGdsb2JhbE9iamVjdC0+Z2V0KGV4ZWMs IEpTQzo6SWRlbnRpZmllcihleGVjLCAiY3JlYXRlQ29udHJvbHMiKSk7Ci0gICAgaWYgKG92ZXJs YXlWYWx1ZS5pc1VuZGVmaW5lZE9yTnVsbCgpKQorICAgIC8vIFRoZSBtZWRpYSBjb250cm9scyBz Y3JpcHQgbXVzdCBwcm92aWRlIGEgbWV0aG9kIHdpdGggdGhlIGZvbGxvd2luZyBkZXRhaWxzLgor ICAgIC8vIE5hbWU6IGNyZWF0ZUNvbnRyb2xzCisgICAgLy8gUGFyYW1ldGVyczoKKyAgICAvLyAg ICAgMS4gVGhlIFNoYWRvd1Jvb3QgZWxlbWVudCB0aGF0IHdpbGwgaG9sZCB0aGUgY29udHJvbHMu CisgICAgLy8gICAgIDIuIFRoaXMgb2JqZWN0IChhbmQgSFRNTE1lZGlhRWxlbWVudCkuCisgICAg Ly8gICAgIDMuIFRoZSBNZWRpYUNvbnRyb2xzSG9zdCBvYmplY3QuCisgICAgLy8gUmV0dXJuIHZh bHVlOgorICAgIC8vICAgICBBIHJlZmVyZW5jZSB0byB0aGUgY3JlYXRlZCBtZWRpYSBjb250cm9s bGVyIGluc3RhbmNlLgorCisgICAgSlNDOjpKU1ZhbHVlIGZ1bmN0aW9uVmFsdWUgPSBnbG9iYWxP YmplY3QtPmdldChleGVjLCBKU0M6OklkZW50aWZpZXIoZXhlYywgImNyZWF0ZUNvbnRyb2xzIikp OworICAgIGlmIChmdW5jdGlvblZhbHVlLmlzVW5kZWZpbmVkT3JOdWxsKCkpCiAgICAgICAgIHJl dHVybjsKIAogICAgIGlmICghbV9tZWRpYUNvbnRyb2xzSG9zdCkKQEAgLTU5ODQsMTMgKzYwMDEs MTcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpkaWRBZGRVc2VyQWdlbnRTaAogICAgIGFyZ0xp c3QuYXBwZW5kKHRvSlMoZXhlYywgZ2xvYmFsT2JqZWN0LCB0aGlzKSk7CiAgICAgYXJnTGlzdC5h cHBlbmQodG9KUyhleGVjLCBnbG9iYWxPYmplY3QsIG1fbWVkaWFDb250cm9sc0hvc3QuZ2V0KCkp KTsKIAotICAgIEpTQzo6SlNPYmplY3QqIG92ZXJsYXkgPSBvdmVybGF5VmFsdWUudG9PYmplY3Qo ZXhlYyk7CisgICAgSlNDOjpKU09iamVjdCogZnVuY3Rpb24gPSBmdW5jdGlvblZhbHVlLnRvT2Jq ZWN0KGV4ZWMpOwogICAgIEpTQzo6Q2FsbERhdGEgY2FsbERhdGE7Ci0gICAgSlNDOjpDYWxsVHlw ZSBjYWxsVHlwZSA9IG92ZXJsYXktPm1ldGhvZFRhYmxlKCktPmdldENhbGxEYXRhKG92ZXJsYXks IGNhbGxEYXRhKTsKKyAgICBKU0M6OkNhbGxUeXBlIGNhbGxUeXBlID0gZnVuY3Rpb24tPm1ldGhv ZFRhYmxlKCktPmdldENhbGxEYXRhKGZ1bmN0aW9uLCBjYWxsRGF0YSk7CiAgICAgaWYgKGNhbGxU eXBlID09IEpTQzo6Q2FsbFR5cGVOb25lKQogICAgICAgICByZXR1cm47CiAKLSAgICBKU0M6OmNh bGwoZXhlYywgb3ZlcmxheSwgY2FsbFR5cGUsIGNhbGxEYXRhLCBnbG9iYWxPYmplY3QsIGFyZ0xp c3QpOworICAgIEpTQzo6SlNWYWx1ZSBjb250cm9sbGVyVmFsdWUgPSBKU0M6OmNhbGwoZXhlYywg ZnVuY3Rpb24sIGNhbGxUeXBlLCBjYWxsRGF0YSwgZ2xvYmFsT2JqZWN0LCBhcmdMaXN0KTsKKyAg ICBtX21lZGlhQ29udHJvbHNIb3N0LT5zZXRDb250cm9sbGVySlNWYWx1ZShjb250cm9sbGVyVmFs dWUpOworCisgICAgc2V0UGFnZVNjYWxlRmFjdG9yUHJvcGVydHkoZXhlYywgY29udHJvbGxlclZh bHVlLCBwYWdlLT5wYWdlU2NhbGVGYWN0b3IoKSk7CisKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0 aW9uKCkpCiAgICAgICAgIGV4ZWMtPmNsZWFyRXhjZXB0aW9uKCk7CiB9CkBAIC02MDExLDYgKzYw MzIsMjAgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRNZWRpYUNvbnRyb2xzRAogCiB2b2lk IEhUTUxNZWRpYUVsZW1lbnQ6OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQoKQogeworICAgIFBhZ2Uq IHBhZ2UgPSBkb2N1bWVudCgpLnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2UpCisgICAgICAgIHJldHVy bjsKKworICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OnBhZ2VTY2FsZUZhY3RvckNo YW5nZWQgPSAlZiIsIHBhZ2UtPnBhZ2VTY2FsZUZhY3RvcigpKTsKKyAgICBET01XcmFwcGVyV29y bGQmIHdvcmxkID0gZW5zdXJlSXNvbGF0ZWRXb3JsZCgpOworICAgIFNjcmlwdENvbnRyb2xsZXIm IHNjcmlwdENvbnRyb2xsZXIgPSBwYWdlLT5tYWluRnJhbWUoKS5zY3JpcHQoKTsKKyAgICBKU0RP TUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gSlNDOjpqc0Nhc3Q8SlNET01HbG9iYWxPYmpl Y3QqPihzY3JpcHRDb250cm9sbGVyLmdsb2JhbE9iamVjdCh3b3JsZCkpOworICAgIEpTQzo6RXhl Y1N0YXRlKiBleGVjID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CisgICAgSlNDOjpKU0xv Y2tIb2xkZXIgbG9jayhleGVjKTsKKworICAgIEpTQzo6SlNWYWx1ZSBjb250cm9sbGVyVmFsdWUg PSBtX21lZGlhQ29udHJvbHNIb3N0LT5jb250cm9sbGVySlNWYWx1ZSgpOworCisgICAgc2V0UGFn ZVNjYWxlRmFjdG9yUHJvcGVydHkoZXhlYywgY29udHJvbGxlclZhbHVlLCBwYWdlLT5wYWdlU2Nh bGVGYWN0b3IoKSk7CiB9CiAjZW5kaWYgLy8gRU5BQkxFKE1FRElBX0NPTlRST0xTX1NDUklQVCkK IAo= 228999 2014-04-09 16:19:17 -0700 2014-04-09 16:19:17 -0700 Another patch for landing patch_3.txt text/plain 13560 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NzAyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ0IEBACisyMDE0LTA0LTA5ICBEZWFuIEph Y2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBNZWRpYSBjb250cm9scyBz aG91bGQgcmVzaXplIGFzIHRoZSB1c2VyIHpvb21zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMjIKKworICAgICAgICBSZXZpZXdlZCBieSBFcmlj IENhcmxzb24uCisKKyAgICAgICAgT24gaU9TIHRoZSBtZWRpYSBjb250cm9scyBzaG91bGQgcmVt YWluIHRoZSBzYW1lIHNpemUKKyAgICAgICAgaW5kZXBlbmRlbnQgb2YgdXNlciB6b29tLiBIYXZl IHRoZSBIVE1MTWVkaWFFbGVtZW50IG9wdGlvbmFsbHkKKyAgICAgICAgcmVnaXN0ZXIgZm9yIHVw ZGF0ZXMgaW4gdGhlIHBhZ2Ugc2NhbGUgdG8gYXBwbHkgYW4gaW52ZXJzZQorICAgICAgICBzY2Fs ZS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5j cHA6IE5ldyBleHBvc2VkIHByb3BlcnR5IHRoYXQgY2FsbHMKKyAgICAgICAgYmFjayBpbnRvIEhU TUxNZWRpYUVsZW1lbnQ6Om1lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rvci4KKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0Ojpjb250cm9sc0RlcGVuZE9uUGFnZVNj YWxlRmFjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0OjpzZXRDb250 cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhY29u dHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaDogS2VlcCBhIHJlZmVyZW5jZSB0byB0aGUgYWN0dWFs CisgICAgICAgIGNvbnRyb2xzIGZyb20gdGhlIEphdmFTY3JpcHQgc2lkZSBzbyB3ZSBjYW4gdGFs ayB0byBpdCBsYXRlci4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0Ojpjb250 cm9sbGVySlNWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xzSG9zdDo6c2V0 Q29udHJvbGxlckpTVmFsdWUpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9NZWRp YUNvbnRyb2xzSG9zdC5pZGw6IEV4cG9zZSBjb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9y LgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuY3Nz OgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwpOiBTcGVjaWZ5 IHRoZSB0cmFuc2Zvcm0gb3JpZ2luIHNvIHRoYXQKKyAgICAgICAgc2NhbGluZyB3aWxsIGtlZXAg dGhlIGNvbnRyb2xzIHBpbm5lZCB0byB0aGUgYm90dG9tIGxlZnQgY29ybmVyLgorICAgICAgICAo YXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc3RhcnQtcGxheWJhY2stYnV0dG9uKTogVXBk YXRlIHRvIHRoZSBjb3JyZWN0IHNpemUKKyAgICAgICAgYW5kIHByb3ZpZGUgbmV3IGFydHdvcmsu CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zdGFydC1wbGF5YmFjay1i dXR0b24uZmFpbGVkKTogTmV3IGFydHdvcmsuCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRy b2xzL21lZGlhQ29udHJvbHNpT1MuanM6CisgICAgICAgIChDb250cm9sbGVySU9TKTogVGVsbCB0 aGUgaG9zdCB0aGF0IHRoZXNlIGNvbnRyb2xzIGNhcmUgYWJvdXQgdGhlIHBhZ2Ugc2NhbGUuCisg ICAgICAgIChDb250cm9sbGVySU9TLnByb3RvdHlwZS5nZXQgcGFnZVNjYWxlRmFjdG9yKTogTmV3 IGdldHRlci4KKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLnNldCBwYWdlU2NhbGVG YWN0b3IpOiBXaGVuIHNldCwgdXBkYXRlIHRoZSBwbGF5IGJ1dHRvbiBhbmQgdGhlIHBhbmVsLgor CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlhQ29udHJvbHNJbmplY3RlZFNjcmlwdCk6IFNt YWxsIG5hbWluZyBjbGVhbnVwLgorICAgICAgICAoc2V0UGFnZVNjYWxlRmFjdG9yUHJvcGVydHkp OiBTdGF0aWMgaGVscGVyIHRvIHNldCBhIEpTIHByb3BlcnR5IHZhbHVlLgorICAgICAgICAoV2Vi Q29yZTo6SFRNTE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdCk6IEtlZXAg YSByZWZlcmVuY2UgdG8gdGhlIGNvbnRyb2xzIG9iamVjdCwKKyAgICAgICAgYW5kIG1ha2Ugc3Vy ZSB0byBzZXQgdGhlIHBhZ2Ugc2NhbGUgZmFjdG9yIG9uIHRoZSBjb250cm9scy4KKyAgICAgICAg KFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQpOiBJbXBs ZW1lbnQgdGhlIGNhbGxiYWNrLCB0ZWxsaW5nCisgICAgICAgIHRoZSBjb250cm9scyBvYmplY3Qg dGhhdCBpdCBuZWVkcyB0byByZWxheW91dC4KKwogMjAxNC0wNC0wOSAgQnJlbmRhbiBMb25nICA8 Yi5sb25nQGNhYmxlbGFicy5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gRXhwb3NlIE1QRUct VFMgbWV0YWRhdGEKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9N ZWRpYUNvbnRyb2xzSG9zdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcAkocmV2aXNpb24gMTY3MDI1KQor KysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE0LDcgKzIxNCwxNyBAQCBTdHJpbmcgTWVkaWFDb250 cm9sc0hvc3Q6OmV4dGVybmFsRGV2aWNlCiAgICAgCiAgICAgcmV0dXJuIHR5cGU7CiB9Ci0gICAg CisKK2Jvb2wgTWVkaWFDb250cm9sc0hvc3Q6OmNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0 b3IoKSBjb25zdAoreworICAgIHJldHVybiBtX21lZGlhRWxlbWVudC0+bWVkaWFDb250cm9sc0Rl cGVuZE9uUGFnZVNjYWxlRmFjdG9yKCk7Cit9CisKK3ZvaWQgTWVkaWFDb250cm9sc0hvc3Q6OnNl dENvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoYm9vbCB2YWx1ZSkKK3sKKyAgICBtX21l ZGlhRWxlbWVudC0+c2V0TWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKHZhbHVl KTsKK30KKwogfQogCiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFj b250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5oCShyZXZpc2lvbiAxNjcw MjUpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9s c0hvc3QuaAkod29ya2luZyBjb3B5KQpAQCAtMjksNiArMjksNyBAQAogI2lmIEVOQUJMRShNRURJ QV9DT05UUk9MU19TQ1JJUFQpCiAKICNpbmNsdWRlICJTY3JpcHRTdGF0ZS5oIgorI2luY2x1ZGUg PGJpbmRpbmdzL1NjcmlwdE9iamVjdC5oPgogI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAj aW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgpA QCAtNjUsMTEgKzY2LDE4IEBAIHB1YmxpYzoKICAgICBTdHJpbmcgZXh0ZXJuYWxEZXZpY2VEaXNw bGF5TmFtZSgpIGNvbnN0OwogICAgIFN0cmluZyBleHRlcm5hbERldmljZVR5cGUoKSBjb25zdDsK IAorICAgIGJvb2wgY29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvcigpIGNvbnN0OworICAg IHZvaWQgc2V0Q29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rvcihib29sIHYpOworCisgICAg SlNDOjpKU1ZhbHVlIGNvbnRyb2xsZXJKU1ZhbHVlKCkgY29uc3QgeyByZXR1cm4gbV9jb250cm9s bGVyOyB9CisgICAgdm9pZCBzZXRDb250cm9sbGVySlNWYWx1ZShKU0M6OkpTVmFsdWUgY29udHJv bGxlcikgeyBtX2NvbnRyb2xsZXIgPSBjb250cm9sbGVyOyB9CisKIHByaXZhdGU6CiAgICAgTWVk aWFDb250cm9sc0hvc3QoSFRNTE1lZGlhRWxlbWVudCopOwogCiAgICAgSFRNTE1lZGlhRWxlbWVu dCogbV9tZWRpYUVsZW1lbnQ7CiAgICAgUmVmUHRyPE1lZGlhQ29udHJvbFRleHRUcmFja0NvbnRh aW5lckVsZW1lbnQ+IG1fdGV4dFRyYWNrQ29udGFpbmVyOworICAgIEpTQzo6SlNWYWx1ZSBtX2Nv bnRyb2xsZXI7CiB9OwogCiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29u dHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGwJKHJldmlzaW9uIDE2 NzAyNSkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRy b2xzSG9zdC5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDQgKzQ4LDYgQEAgZW51bSBEZXZpY2VU eXBlIHsKIAogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01TdHJpbmcgZXh0ZXJuYWxEZXZpY2VE aXNwbGF5TmFtZTsKICAgICByZWFkb25seSBhdHRyaWJ1dGUgRGV2aWNlVHlwZSBleHRlcm5hbERl dmljZVR5cGU7CisKKyAgICBhdHRyaWJ1dGUgYm9vbGVhbiBjb250cm9sc0RlcGVuZE9uUGFnZVNj YWxlRmFjdG9yOwogfTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9s cy9tZWRpYUNvbnRyb2xzaU9TLmNzcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5jc3MJKHJldmlzaW9uIDE2NzAyNSkK KysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9T LmNzcwkod29ya2luZyBjb3B5KQpAQCAtMTIxLDYgKzEyMSw3IEBAIGF1ZGlvOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXBhbmVsIHsKICAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lOwogCiAg ICAgdHJhbnNpdGlvbjogb3BhY2l0eSAwLjI1cyBsaW5lYXI7CisgICAgLXdlYmtpdC10cmFuc2Zv cm0tb3JpZ2luOiBib3R0b20gbGVmdDsKIH0KIAogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJv bHMtcGFuZWwgewpAQCAtMTU0LDE5ICsxNTUsMTkgQEAgYXVkaW86Oi13ZWJraXQtbWVkaWEtY29u dHJvbHMtc3RhcnQtcGxheQogICAgIHBhZGRpbmc6IDA7CiAgICAgYm9yZGVyOiAwOwogICAgIHBv c2l0aW9uOiBhYnNvbHV0ZTsKLSAgICB3aWR0aDogMTUwcHg7Ci0gICAgaGVpZ2h0OiAxNTBweDsK LSAgICBsZWZ0OiBjYWxjKDUwJSAtIDc1cHgpOwotICAgIHRvcDogY2FsYyg1MCUgLSA3NXB4KTsK KyAgICB3aWR0aDogNzJweDsKKyAgICBoZWlnaHQ6IDcycHg7CisgICAgbGVmdDogY2FsYyg1MCUg LSAzNnB4KTsKKyAgICB0b3A6IGNhbGMoNTAlIC0gMzZweCk7CiAgICAgYmFja2dyb3VuZC1vcmln aW46IGNvbnRlbnQtYm94OwogICAgIGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQ7CiAgICAg YmFja2dyb3VuZC1wb3NpdGlvbjogY2VudGVyOwotICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybCgn ZGF0YTppbWFnZS9zdmcreG1sLDxzdmcgd2lkdGg9IjE0MCIgaGVpZ2h0PSIxNDAiIHhtbG5zPSJo dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGNpcmNsZSByPSI3MCIgY3k9IjcwIiBjeD0iNzAi IGZpbGw9InJnYmEoMjQ3LCAyNDcsIDI0NywgLjgyKSIvPjxwYXRoIGQ9Ik0gNDgsMzQgdiA3MiBs IDYyLC0zNS41IHoiIGZpbGw9InJnYmEoMTI5LCAxMjksIDEyOSwgLjkpIi8+PC9zdmc+Jyk7Cisg ICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB2aWV3Qm94 PSIwIDAgMTQ0IDE0NCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48Y2lyY2xl IGN4PSI3MiIgY3k9IjcyIiByPSI3MCIgZmlsbD0icmdiYSgyNDcsIDI0NywgMjQ3LCAuODIpIi8+ PHBhdGggZD0iTTQ4LDM2djc0TDEwOSw3NEw0OCwzNnoiIGZpbGw9InJnYmEoMTI5LCAxMjksIDEy OSwgLjkpIi8+PC9zdmc+Jyk7CiB9CiAKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXN0 YXJ0LXBsYXliYWNrLWJ1dHRvbi5mYWlsZWQsCiBhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy1zdGFydC1wbGF5YmFjay1idXR0b24uZmFpbGVkIHsKLSAgICBiYWNrZ3JvdW5kLWltYWdlOiB1 cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHdpZHRoPSIxNDAiIGhlaWdodD0iMTQwIiB4bWxu cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxjaXJjbGUgcj0iNzAiIGN5PSI3MCIgY3g9 IjcwIiBmaWxsPSJyZ2JhKDI0NywgMjQ3LCAyNDcsIC44MikiLz48ZyBmaWxsPSJyZ2JhKDEyOSwg MTI5LCAxMjksIC45KSI+PHBhdGggZD0iTSA0OCwzNCB2IDE3IGwgNDcsMjggbCAxNSwtOC41IHoi Lz48cGF0aCBkPSJNIDE2LDM2IGwgMTEwLDY0IGwgLTIsNCBsIC0xMTAsLTY0IHoiLz48cGF0aCBk PSJNIDQ4LDYzIHYgNDMgbCAzNywtMjEuNSB6Ii8+PC9nPjwvc3ZnPicpOworICAgIGJhY2tncm91 bmQtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1sLDxzdmcgdmlld0JveD0iMCAwIDE0NCAx NDQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGNpcmNsZSBjeD0iNzIiIGN5 PSI3MiIgcj0iNzAiIGZpbGw9InJnYmEoMjQ3LCAyNDcsIDI0NywgLjgyKSIvPjxnIGZpbGw9InJn YmEoMTI5LCAxMjksIDEyOSwgLjkpIj48cmVjdCB4PSIxNCIgeT0iNzAuNCIgdHJhbnNmb3JtPSJt YXRyaXgoMC44NDkzIDAuNTI3OSAtMC41Mjc5IDAuODQ5MyA0OC44NjE0IC0yNy4xNTk1KSIgd2lk dGg9IjExNiIgaGVpZ2h0PSIzLjIiLz48cG9seWdvbiBwb2ludHM9IjEwOSw3NCA0OCwzNiA0OCw1 Mi4zIDk1LjYsODEuOSAiLz48cG9seWdvbiBwb2ludHM9IjQ4LDExMCA4Ny43LDg2LjYgNDgsNjEu OSAiLz48L2c+PC9zdmc+Jyk7CiB9CiAKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBs YXktYnV0dG9uLApJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21l ZGlhQ29udHJvbHNpT1MuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanMJKHJldmlzaW9uIDE2NzAyNSkKKysrIFNv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmpzCSh3 b3JraW5nIGNvcHkpCkBAIC02LDEwICs2LDEzIEBAIGZ1bmN0aW9uIGNyZWF0ZUNvbnRyb2xzKHJv b3QsIHZpZGVvLCBob3MKIGZ1bmN0aW9uIENvbnRyb2xsZXJJT1Mocm9vdCwgdmlkZW8sIGhvc3Qp CiB7CiAgICAgdGhpcy5oYXNXaXJlbGVzc1BsYXliYWNrVGFyZ2V0cyA9IGZhbHNlOworICAgIHRo aXMuX3BhZ2VTY2FsZUZhY3RvciA9IDE7CiAgICAgQ29udHJvbGxlci5jYWxsKHRoaXMsIHJvb3Qs IHZpZGVvLCBob3N0KTsKIAogICAgIHRoaXMudXBkYXRlV2lyZWxlc3NUYXJnZXRBdmFpbGFibGUo KTsKICAgICB0aGlzLnVwZGF0ZVdpcmVsZXNzUGxheWJhY2tTdGF0dXMoKTsKKworICAgIGhvc3Qu Y29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvciA9IHRydWU7CiB9OwogCiAvKiBFbnVtcyAq LwpAQCAtNDAzLDYgKzQwNiwyNSBAQCBDb250cm9sbGVySU9TLnByb3RvdHlwZSA9IHsKICAgICAg ICAgdGhpcy52aWRlby53ZWJraXRTaG93UGxheWJhY2tUYXJnZXRQaWNrZXIoKTsKICAgICAgICAg ZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CiAgICAgfSwKKworICAgIGdldCBwYWdlU2NhbGVGYWN0 b3IoKSB7CisgICAgICAgIHJldHVybiB0aGlzLl9wYWdlU2NhbGVGYWN0b3I7CisgICAgfSwKKwor ICAgIHNldCBwYWdlU2NhbGVGYWN0b3IobmV3U2NhbGVGYWN0b3IpIHsKKyAgICAgICAgdGhpcy5f cGFnZVNjYWxlRmFjdG9yID0gbmV3U2NhbGVGYWN0b3I7CisKKyAgICAgICAgaWYgKG5ld1NjYWxl RmFjdG9yKSB7CisgICAgICAgICAgICB2YXIgc2NhbGVUcmFuc2Zvcm0gPSAic2NhbGUoIiArICgx IC8gbmV3U2NhbGVGYWN0b3IpICsgIikiOworICAgICAgICAgICAgaWYgKHRoaXMuY29udHJvbHMu c3RhcnRQbGF5YmFja0J1dHRvbikKKyAgICAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLnN0YXJ0 UGxheWJhY2tCdXR0b24uc3R5bGUud2Via2l0VHJhbnNmb3JtID0gc2NhbGVUcmFuc2Zvcm07Cisg ICAgICAgICAgICBpZiAodGhpcy5jb250cm9scy5wYW5lbCkgeworICAgICAgICAgICAgICAgIHRo aXMuY29udHJvbHMucGFuZWwuc3R5bGUud2lkdGggPSAobmV3U2NhbGVGYWN0b3IgKiAxMDApICsg IiUiOworICAgICAgICAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwuc3R5bGUud2Via2l0VHJh bnNmb3JtID0gc2NhbGVUcmFuc2Zvcm07CisgICAgICAgICAgICAgICAgdGhpcy51cGRhdGVQcm9n cmVzcygpOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQogfTsKIAogT2JqZWN0LmNy ZWF0ZShDb250cm9sbGVyLnByb3RvdHlwZSkuZXh0ZW5kKENvbnRyb2xsZXJJT1MucHJvdG90eXBl KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNp b24gMTY3MDI1KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTkxOCw2ICs1OTE4LDcgQEAgRE9NV3JhcHBlcldvcmxkJiBIVE1M TWVkaWFFbGVtZW50OjplbnN1cgogCiBib29sIEhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlh Q29udHJvbHNJbmplY3RlZFNjcmlwdCgpCiB7CisgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxl bWVudDo6ZW5zdXJlTWVkaWFDb250cm9sc0luamVjdGVkU2NyaXB0Iik7CiAgICAgUGFnZSogcGFn ZSA9IGRvY3VtZW50KCkucGFnZSgpOwogICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwpAQCAtNTkzMSw4ICs1OTMyLDggQEAgYm9vbCBIVE1MTWVkaWFFbGVtZW50OjplbnN1cmVN ZWRpYUNvbnRybwogICAgIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBKU0M6Ompz Q2FzdDxKU0RPTUdsb2JhbE9iamVjdCo+KHNjcmlwdENvbnRyb2xsZXIuZ2xvYmFsT2JqZWN0KHdv cmxkKSk7CiAgICAgSlNDOjpFeGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxPYmplY3QtPmdsb2JhbEV4 ZWMoKTsKIAotICAgIEpTQzo6SlNWYWx1ZSBvdmVybGF5VmFsdWUgPSBnbG9iYWxPYmplY3QtPmdl dChleGVjLCBKU0M6OklkZW50aWZpZXIoZXhlYywgImNyZWF0ZUNvbnRyb2xzIikpOwotICAgIGlm IChvdmVybGF5VmFsdWUuaXNGdW5jdGlvbigpKQorICAgIEpTQzo6SlNWYWx1ZSBmdW5jdGlvblZh bHVlID0gZ2xvYmFsT2JqZWN0LT5nZXQoZXhlYywgSlNDOjpJZGVudGlmaWVyKGV4ZWMsICJjcmVh dGVDb250cm9scyIpKTsKKyAgICBpZiAoZnVuY3Rpb25WYWx1ZS5pc0Z1bmN0aW9uKCkpCiAgICAg ICAgIHJldHVybiB0cnVlOwogCiAjaWZuZGVmIE5ERUJVRwpAQCAtNTk1MCw4ICs1OTUxLDE2IEBA IGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6ZW5zdXJlTWVkaWFDb250cm8KICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAorc3RhdGljIHZvaWQgc2V0UGFnZVNjYWxlRmFjdG9yUHJvcGVydHkoSlNDOjpFeGVj U3RhdGUqIGV4ZWMsIEpTQzo6SlNWYWx1ZSBjb250cm9sbGVyVmFsdWUsIGZsb2F0IHBhZ2VTY2Fs ZUZhY3RvcikKK3sKKyAgICBKU0M6OlB1dFByb3BlcnR5U2xvdCBwcm9wZXJ0eVNsb3QoY29udHJv bGxlclZhbHVlKTsKKyAgICBKU0M6OkpTT2JqZWN0KiBjb250cm9sbGVyT2JqZWN0ID0gY29udHJv bGxlclZhbHVlLnRvT2JqZWN0KGV4ZWMpOworICAgIGNvbnRyb2xsZXJPYmplY3QtPm1ldGhvZFRh YmxlKCktPnB1dChjb250cm9sbGVyT2JqZWN0LCBleGVjLCBKU0M6OklkZW50aWZpZXIoZXhlYywg InBhZ2VTY2FsZUZhY3RvciIpLCBKU0M6OmpzTnVtYmVyKHBhZ2VTY2FsZUZhY3RvciksIHByb3Bl cnR5U2xvdCk7Cit9CisKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hh ZG93Um9vdChTaGFkb3dSb290KiByb290KQogeworICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVs ZW1lbnQ6OmRpZEFkZFVzZXJBZ2VudFNoYWRvd1Jvb3QiKTsKICNpZiBFTkFCTEUoUExVR0lOX1BS T1hZX0ZPUl9WSURFTykKICAgICAvLyBKYXZhU2NyaXB0IGNvbnRyb2xzIGFyZSBub3QgZW5hYmxl ZCB3aXRoIHRoZSB2aWRlbyBwbHVnaW4gcHJveHkuCiAgICAgaWYgKHNob3VsZFVzZVZpZGVvUGx1 Z2luUHJveHkoKSkKQEAgLTU5NzEsOSArNTk4MCwxNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6 OmRpZEFkZFVzZXJBZ2VudFNoCiAgICAgSlNDOjpFeGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxPYmpl Y3QtPmdsb2JhbEV4ZWMoKTsKICAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKGV4ZWMpOwogCi0g ICAgLy8gSXQgaXMgZXhwZWN0ZWQgdGhlIEpTIGZpbGUgcHJvdmlkZXMgYSBjcmVhdGVDb250cm9s cyhzaGFkb3dSb290LCB2aWRlbywgbWVkaWFDb250cm9sc0hvc3QpIGZ1bmN0aW9uLgotICAgIEpT Qzo6SlNWYWx1ZSBvdmVybGF5VmFsdWUgPSBnbG9iYWxPYmplY3QtPmdldChleGVjLCBKU0M6Oklk ZW50aWZpZXIoZXhlYywgImNyZWF0ZUNvbnRyb2xzIikpOwotICAgIGlmIChvdmVybGF5VmFsdWUu aXNVbmRlZmluZWRPck51bGwoKSkKKyAgICAvLyBUaGUgbWVkaWEgY29udHJvbHMgc2NyaXB0IG11 c3QgcHJvdmlkZSBhIG1ldGhvZCB3aXRoIHRoZSBmb2xsb3dpbmcgZGV0YWlscy4KKyAgICAvLyBO YW1lOiBjcmVhdGVDb250cm9scworICAgIC8vIFBhcmFtZXRlcnM6CisgICAgLy8gICAgIDEuIFRo ZSBTaGFkb3dSb290IGVsZW1lbnQgdGhhdCB3aWxsIGhvbGQgdGhlIGNvbnRyb2xzLgorICAgIC8v ICAgICAyLiBUaGlzIG9iamVjdCAoYW5kIEhUTUxNZWRpYUVsZW1lbnQpLgorICAgIC8vICAgICAz LiBUaGUgTWVkaWFDb250cm9sc0hvc3Qgb2JqZWN0LgorICAgIC8vIFJldHVybiB2YWx1ZToKKyAg ICAvLyAgICAgQSByZWZlcmVuY2UgdG8gdGhlIGNyZWF0ZWQgbWVkaWEgY29udHJvbGxlciBpbnN0 YW5jZS4KKworICAgIEpTQzo6SlNWYWx1ZSBmdW5jdGlvblZhbHVlID0gZ2xvYmFsT2JqZWN0LT5n ZXQoZXhlYywgSlNDOjpJZGVudGlmaWVyKGV4ZWMsICJjcmVhdGVDb250cm9scyIpKTsKKyAgICBp ZiAoZnVuY3Rpb25WYWx1ZS5pc1VuZGVmaW5lZE9yTnVsbCgpKQogICAgICAgICByZXR1cm47CiAK ICAgICBpZiAoIW1fbWVkaWFDb250cm9sc0hvc3QpCkBAIC01OTg0LDEzICs2MDAxLDE3IEBAIHZv aWQgSFRNTE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2gKICAgICBhcmdMaXN0LmFwcGVu ZCh0b0pTKGV4ZWMsIGdsb2JhbE9iamVjdCwgdGhpcykpOwogICAgIGFyZ0xpc3QuYXBwZW5kKHRv SlMoZXhlYywgZ2xvYmFsT2JqZWN0LCBtX21lZGlhQ29udHJvbHNIb3N0LmdldCgpKSk7CiAKLSAg ICBKU0M6OkpTT2JqZWN0KiBvdmVybGF5ID0gb3ZlcmxheVZhbHVlLnRvT2JqZWN0KGV4ZWMpOwor ICAgIEpTQzo6SlNPYmplY3QqIGZ1bmN0aW9uID0gZnVuY3Rpb25WYWx1ZS50b09iamVjdChleGVj KTsKICAgICBKU0M6OkNhbGxEYXRhIGNhbGxEYXRhOwotICAgIEpTQzo6Q2FsbFR5cGUgY2FsbFR5 cGUgPSBvdmVybGF5LT5tZXRob2RUYWJsZSgpLT5nZXRDYWxsRGF0YShvdmVybGF5LCBjYWxsRGF0 YSk7CisgICAgSlNDOjpDYWxsVHlwZSBjYWxsVHlwZSA9IGZ1bmN0aW9uLT5tZXRob2RUYWJsZSgp LT5nZXRDYWxsRGF0YShmdW5jdGlvbiwgY2FsbERhdGEpOwogICAgIGlmIChjYWxsVHlwZSA9PSBK U0M6OkNhbGxUeXBlTm9uZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgSlNDOjpjYWxsKGV4ZWMs IG92ZXJsYXksIGNhbGxUeXBlLCBjYWxsRGF0YSwgZ2xvYmFsT2JqZWN0LCBhcmdMaXN0KTsKKyAg ICBKU0M6OkpTVmFsdWUgY29udHJvbGxlclZhbHVlID0gSlNDOjpjYWxsKGV4ZWMsIGZ1bmN0aW9u LCBjYWxsVHlwZSwgY2FsbERhdGEsIGdsb2JhbE9iamVjdCwgYXJnTGlzdCk7CisgICAgbV9tZWRp YUNvbnRyb2xzSG9zdC0+c2V0Q29udHJvbGxlckpTVmFsdWUoY29udHJvbGxlclZhbHVlKTsKKwor ICAgIHNldFBhZ2VTY2FsZUZhY3RvclByb3BlcnR5KGV4ZWMsIGNvbnRyb2xsZXJWYWx1ZSwgcGFn ZS0+cGFnZVNjYWxlRmFjdG9yKCkpOworCiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQog ICAgICAgICBleGVjLT5jbGVhckV4Y2VwdGlvbigpOwogfQpAQCAtNjAxMSw2ICs2MDMyLDIwIEBA IHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6c2V0TWVkaWFDb250cm9sc0QKIAogdm9pZCBIVE1MTWVk aWFFbGVtZW50OjpwYWdlU2NhbGVGYWN0b3JDaGFuZ2VkKCkKIHsKKyAgICBQYWdlKiBwYWdlID0g ZG9jdW1lbnQoKS5wYWdlKCk7CisgICAgaWYgKCFwYWdlKQorICAgICAgICByZXR1cm47CisKKyAg ICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjpwYWdlU2NhbGVGYWN0b3JDaGFuZ2VkID0g JWYiLCBwYWdlLT5wYWdlU2NhbGVGYWN0b3IoKSk7CisgICAgRE9NV3JhcHBlcldvcmxkJiB3b3Js ZCA9IGVuc3VyZUlzb2xhdGVkV29ybGQoKTsKKyAgICBTY3JpcHRDb250cm9sbGVyJiBzY3JpcHRD b250cm9sbGVyID0gcGFnZS0+bWFpbkZyYW1lKCkuc2NyaXB0KCk7CisgICAgSlNET01HbG9iYWxP YmplY3QqIGdsb2JhbE9iamVjdCA9IEpTQzo6anNDYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oc2Ny aXB0Q29udHJvbGxlci5nbG9iYWxPYmplY3Qod29ybGQpKTsKKyAgICBKU0M6OkV4ZWNTdGF0ZSog ZXhlYyA9IGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOworICAgIEpTQzo6SlNMb2NrSG9sZGVy IGxvY2soZXhlYyk7CisKKyAgICBKU0M6OkpTVmFsdWUgY29udHJvbGxlclZhbHVlID0gbV9tZWRp YUNvbnRyb2xzSG9zdC0+Y29udHJvbGxlckpTVmFsdWUoKTsKKworICAgIHNldFBhZ2VTY2FsZUZh Y3RvclByb3BlcnR5KGV4ZWMsIGNvbnRyb2xsZXJWYWx1ZSwgcGFnZS0+cGFnZVNjYWxlRmFjdG9y KCkpOwogfQogI2VuZGlmIC8vIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCiAK 229000 2014-04-09 16:54:53 -0700 2014-04-09 18:06:58 -0700 Patch bug-131322-20140410095433.patch text/plain 14323 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2OTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTUwZWEyM2MzODQ5OThm NjNmMzljY2M1NjYyNzg4MjAzM2UxOGIzZC4uNWI4MjEzMDZlNTJhNTRmZTQxYjFlOGM3YjdlMDQw NTEwOTk2ZGE0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE0LTA0LTA5ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBNZWRpYSBjb250cm9s cyBzaG91bGQgcmVzaXplIGFzIHRoZSB1c2VyIHpvb21zCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzEzMjIKKworICAgICAgICBSZXZpZXdlZCBieSBF cmljIENhcmxzb24uCisKKyAgICAgICAgT24gaU9TIHRoZSBtZWRpYSBjb250cm9scyBzaG91bGQg cmVtYWluIHRoZSBzYW1lIHNpemUKKyAgICAgICAgaW5kZXBlbmRlbnQgb2YgdXNlciB6b29tLiBI YXZlIHRoZSBIVE1MTWVkaWFFbGVtZW50IG9wdGlvbmFsbHkKKyAgICAgICAgcmVnaXN0ZXIgZm9y IHVwZGF0ZXMgaW4gdGhlIHBhZ2Ugc2NhbGUgdG8gYXBwbHkgYW4gaW52ZXJzZQorICAgICAgICBz Y2FsZS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9z dC5jcHA6IE5ldyBleHBvc2VkIHByb3BlcnR5IHRoYXQgY2FsbHMKKyAgICAgICAgYmFjayBpbnRv IEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rvci4K KyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0Ojpjb250cm9sc0RlcGVuZE9uUGFn ZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0OjpzZXRD b250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlh Y29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaDogS2VlcCBhIHJlZmVyZW5jZSB0byB0aGUgYWN0 dWFsCisgICAgICAgIGNvbnRyb2xzIGZyb20gdGhlIEphdmFTY3JpcHQgc2lkZSBzbyB3ZSBjYW4g dGFsayB0byBpdCBsYXRlci4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0Ojpj b250cm9sbGVySlNWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xzSG9zdDo6 c2V0Q29udHJvbGxlckpTVmFsdWUpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9N ZWRpYUNvbnRyb2xzSG9zdC5pZGw6IEV4cG9zZSBjb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFj dG9yLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1Mu Y3NzOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwpOiBTcGVj aWZ5IHRoZSB0cmFuc2Zvcm0gb3JpZ2luIHNvIHRoYXQKKyAgICAgICAgc2NhbGluZyB3aWxsIGtl ZXAgdGhlIGNvbnRyb2xzIHBpbm5lZCB0byB0aGUgYm90dG9tIGxlZnQgY29ybmVyLgorICAgICAg ICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc3RhcnQtcGxheWJhY2stYnV0dG9uKTog VXBkYXRlIHRvIHRoZSBjb3JyZWN0IHNpemUKKyAgICAgICAgYW5kIHByb3ZpZGUgbmV3IGFydHdv cmsuCisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zdGFydC1wbGF5YmFj ay1idXR0b24uZmFpbGVkKTogTmV3IGFydHdvcmsuCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNv bnRyb2xzL21lZGlhQ29udHJvbHNpT1MuanM6CisgICAgICAgIChDb250cm9sbGVySU9TKTogVGVs bCB0aGUgaG9zdCB0aGF0IHRoZXNlIGNvbnRyb2xzIGNhcmUgYWJvdXQgdGhlIHBhZ2Ugc2NhbGUu CisgICAgICAgIChDb250cm9sbGVySU9TLnByb3RvdHlwZS5nZXQgcGFnZVNjYWxlRmFjdG9yKTog TmV3IGdldHRlci4KKyAgICAgICAgKENvbnRyb2xsZXJJT1MucHJvdG90eXBlLnNldCBwYWdlU2Nh bGVGYWN0b3IpOiBXaGVuIHNldCwgdXBkYXRlIHRoZSBwbGF5IGJ1dHRvbiBhbmQgdGhlIHBhbmVs LgorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmVuc3VyZU1lZGlhQ29udHJvbHNJbmplY3RlZFNjcmlwdCk6 IFNtYWxsIG5hbWluZyBjbGVhbnVwLgorICAgICAgICAoc2V0UGFnZVNjYWxlRmFjdG9yUHJvcGVy dHkpOiBTdGF0aWMgaGVscGVyIHRvIHNldCBhIEpTIHByb3BlcnR5IHZhbHVlLgorICAgICAgICAo V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFnZW50U2hhZG93Um9vdCk6IEtl ZXAgYSByZWZlcmVuY2UgdG8gdGhlIGNvbnRyb2xzIG9iamVjdCwKKyAgICAgICAgYW5kIG1ha2Ug c3VyZSB0byBzZXQgdGhlIHBhZ2Ugc2NhbGUgZmFjdG9yIG9uIHRoZSBjb250cm9scy4KKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnBhZ2VTY2FsZUZhY3RvckNoYW5nZWQpOiBJ bXBsZW1lbnQgdGhlIGNhbGxiYWNrLCB0ZWxsaW5nCisgICAgICAgIHRoZSBjb250cm9scyBvYmpl Y3QgdGhhdCBpdCBuZWVkcyB0byByZWxheW91dC4KKwogMjAxNC0wNC0wOCAgQW50dGkgS29pdmlz dG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGV4cG9zZWRSZWN0IGZyb20g VGlsZUNvbnRyb2xsZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFj b250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwCmluZGV4IDc3YTc2ZWE5OGFmYTAwNTll ZDNmMDg3M2FkNTNjOWJmNzI2N2Y3ZmMuLjFjZWYxNjIzMTUzZjhkM2RlNTFmZDI0N2E1ZTVkMDg1 NGE0YmIxNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9s cy9NZWRpYUNvbnRyb2xzSG9zdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcApAQCAtMzgsNiArMzgsNyBAQAogI2luY2x1 ZGUgIlBhZ2VHcm91cC5oIgogI2luY2x1ZGUgIlRleHRUcmFjay5oIgogI2luY2x1ZGUgIlRleHRU cmFja0xpc3QuaCIKKyNpbmNsdWRlIDxydW50aW1lL0pTQ0pTVmFsdWVJbmxpbmVzLmg+CiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMjE0LDcgKzIxNSwxNyBAQCBTdHJpbmcgTWVkaWFDb250 cm9sc0hvc3Q6OmV4dGVybmFsRGV2aWNlVHlwZSgpIGNvbnN0CiAgICAgCiAgICAgcmV0dXJuIHR5 cGU7CiB9Ci0gICAgCisKK2Jvb2wgTWVkaWFDb250cm9sc0hvc3Q6OmNvbnRyb2xzRGVwZW5kT25Q YWdlU2NhbGVGYWN0b3IoKSBjb25zdAoreworICAgIHJldHVybiBtX21lZGlhRWxlbWVudC0+bWVk aWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKCk7Cit9CisKK3ZvaWQgTWVkaWFDb250 cm9sc0hvc3Q6OnNldENvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoYm9vbCB2YWx1ZSkK K3sKKyAgICBtX21lZGlhRWxlbWVudC0+c2V0TWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxl RmFjdG9yKHZhbHVlKTsKK30KKwogfQogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5oIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmgKaW5kZXggMzA2 Njg2NDkzZjcyZTYyY2QxMjI1YzYwYjNkMGNmYTgxYmI2MzkxZi4uMTM5ZjZjZDg3ZjlkMGNjZmYz MmUxNTQ3ZDA2MTk1ODI0ZTEzY2M5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmgKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmgKQEAgLTI5LDYgKzI5LDcg QEAKICNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQogCiAjaW5jbHVkZSAiU2NyaXB0 U3RhdGUuaCIKKyNpbmNsdWRlIDxiaW5kaW5ncy9TY3JpcHRPYmplY3QuaD4KICNpbmNsdWRlIDx3 dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KICNpbmNsdWRlIDx3dGYv dGV4dC9XVEZTdHJpbmcuaD4KQEAgLTY1LDExICs2NiwxOCBAQCBwdWJsaWM6CiAgICAgU3RyaW5n IGV4dGVybmFsRGV2aWNlRGlzcGxheU5hbWUoKSBjb25zdDsKICAgICBTdHJpbmcgZXh0ZXJuYWxE ZXZpY2VUeXBlKCkgY29uc3Q7CiAKKyAgICBib29sIGNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVG YWN0b3IoKSBjb25zdDsKKyAgICB2b2lkIHNldENvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0 b3IoYm9vbCB2KTsKKworICAgIEpTQzo6SlNWYWx1ZSBjb250cm9sbGVySlNWYWx1ZSgpIGNvbnN0 IHsgcmV0dXJuIG1fY29udHJvbGxlcjsgfQorICAgIHZvaWQgc2V0Q29udHJvbGxlckpTVmFsdWUo SlNDOjpKU1ZhbHVlIGNvbnRyb2xsZXIpIHsgbV9jb250cm9sbGVyID0gY29udHJvbGxlcjsgfQor CiBwcml2YXRlOgogICAgIE1lZGlhQ29udHJvbHNIb3N0KEhUTUxNZWRpYUVsZW1lbnQqKTsKIAog ICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1fbWVkaWFFbGVtZW50OwogICAgIFJlZlB0cjxNZWRpYUNv bnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50PiBtX3RleHRUcmFja0NvbnRhaW5lcjsKKyAg ICBKU0M6OkpTVmFsdWUgbV9jb250cm9sbGVyOwogfTsKIAogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbCBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGwK aW5kZXggYjhjYzA4NjAwY2NhYzZlOWNlMThkNjhjNmI1ZGZkMjllZjQ5NGVhNS4uZDdhNjhkNzUw ZGE1Njk1ZDI4OTNlY2M3NTQ0NDliZWY1ZWI2ZTY3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaWRsCkBA IC00OCw0ICs0OCw2IEBAIGVudW0gRGV2aWNlVHlwZSB7CiAKICAgICByZWFkb25seSBhdHRyaWJ1 dGUgRE9NU3RyaW5nIGV4dGVybmFsRGV2aWNlRGlzcGxheU5hbWU7CiAgICAgcmVhZG9ubHkgYXR0 cmlidXRlIERldmljZVR5cGUgZXh0ZXJuYWxEZXZpY2VUeXBlOworCisgICAgYXR0cmlidXRlIGJv b2xlYW4gY29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3RvcjsKIH07CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5jc3Mg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc2lPUy5j c3MKaW5kZXggZGE3MjcyYTY0NTJjZWJmNWJiZTdmNzIxNmI5MTM5M2E3NmJmZDhkMS4uZTZlODYx MGE0YWM5ZWVhMmE1YmVlMWFiZWZiZTljMjQ0OWZkZDY3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNpT1MuY3NzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzaU9TLmNzcwpA QCAtMTIxLDYgKzEyMSw3IEBAIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsIHsK ICAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lOwogCiAgICAgdHJhbnNpdGlvbjogb3BhY2l0 eSAwLjI1cyBsaW5lYXI7CisgICAgLXdlYmtpdC10cmFuc2Zvcm0tb3JpZ2luOiBib3R0b20gbGVm dDsKIH0KIAogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgewpAQCAtMTU0LDE5 ICsxNTUsMTkgQEAgYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc3RhcnQtcGxheWJhY2st YnV0dG9uIHsKICAgICBwYWRkaW5nOiAwOwogICAgIGJvcmRlcjogMDsKICAgICBwb3NpdGlvbjog YWJzb2x1dGU7Ci0gICAgd2lkdGg6IDE1MHB4OwotICAgIGhlaWdodDogMTUwcHg7Ci0gICAgbGVm dDogY2FsYyg1MCUgLSA3NXB4KTsKLSAgICB0b3A6IGNhbGMoNTAlIC0gNzVweCk7CisgICAgd2lk dGg6IDcycHg7CisgICAgaGVpZ2h0OiA3MnB4OworICAgIGxlZnQ6IGNhbGMoNTAlIC0gMzZweCk7 CisgICAgdG9wOiBjYWxjKDUwJSAtIDM2cHgpOwogICAgIGJhY2tncm91bmQtb3JpZ2luOiBjb250 ZW50LWJveDsKICAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OwogICAgIGJhY2tncm91 bmQtcG9zaXRpb246IGNlbnRlcjsKLSAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2RhdGE6aW1h Z2Uvc3ZnK3htbCw8c3ZnIHdpZHRoPSIxNDAiIGhlaWdodD0iMTQwIiB4bWxucz0iaHR0cDovL3d3 dy53My5vcmcvMjAwMC9zdmciPjxjaXJjbGUgcj0iNzAiIGN5PSI3MCIgY3g9IjcwIiBmaWxsPSJy Z2JhKDI0NywgMjQ3LCAyNDcsIC44MikiLz48cGF0aCBkPSJNIDQ4LDM0IHYgNzIgbCA2MiwtMzUu NSB6IiBmaWxsPSJyZ2JhKDEyOSwgMTI5LCAxMjksIC45KSIvPjwvc3ZnPicpOworICAgIGJhY2tn cm91bmQtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1sLDxzdmcgdmlld0JveD0iMCAwIDE0 NCAxNDQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGNpcmNsZSBjeD0iNzIi IGN5PSI3MiIgcj0iNzAiIGZpbGw9InJnYmEoMjQ3LCAyNDcsIDI0NywgLjgyKSIvPjxwYXRoIGQ9 Ik00OCwzNnY3NEwxMDksNzRMNDgsMzZ6IiBmaWxsPSJyZ2JhKDEyOSwgMTI5LCAxMjksIC45KSIv Pjwvc3ZnPicpOwogfQogCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zdGFydC1wbGF5 YmFjay1idXR0b24uZmFpbGVkLAogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc3RhcnQt cGxheWJhY2stYnV0dG9uLmZhaWxlZCB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRh OmltYWdlL3N2Zyt4bWwsPHN2ZyB3aWR0aD0iMTQwIiBoZWlnaHQ9IjE0MCIgeG1sbnM9Imh0dHA6 Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48Y2lyY2xlIHI9IjcwIiBjeT0iNzAiIGN4PSI3MCIgZmls bD0icmdiYSgyNDcsIDI0NywgMjQ3LCAuODIpIi8+PGcgZmlsbD0icmdiYSgxMjksIDEyOSwgMTI5 LCAuOSkiPjxwYXRoIGQ9Ik0gNDgsMzQgdiAxNyBsIDQ3LDI4IGwgMTUsLTguNSB6Ii8+PHBhdGgg ZD0iTSAxNiwzNiBsIDExMCw2NCBsIC0yLDQgbCAtMTEwLC02NCB6Ii8+PHBhdGggZD0iTSA0OCw2 MyB2IDQzIGwgMzcsLTIxLjUgeiIvPjwvZz48L3N2Zz4nKTsKKyAgICBiYWNrZ3JvdW5kLWltYWdl OiB1cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHZpZXdCb3g9IjAgMCAxNDQgMTQ0IiB4bWxu cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxjaXJjbGUgY3g9IjcyIiBjeT0iNzIiIHI9 IjcwIiBmaWxsPSJyZ2JhKDI0NywgMjQ3LCAyNDcsIC44MikiLz48ZyBmaWxsPSJyZ2JhKDEyOSwg MTI5LCAxMjksIC45KSI+PHJlY3QgeD0iMTQiIHk9IjcwLjQiIHRyYW5zZm9ybT0ibWF0cml4KDAu ODQ5MyAwLjUyNzkgLTAuNTI3OSAwLjg0OTMgNDguODYxNCAtMjcuMTU5NSkiIHdpZHRoPSIxMTYi IGhlaWdodD0iMy4yIi8+PHBvbHlnb24gcG9pbnRzPSIxMDksNzQgNDgsMzYgNDgsNTIuMyA5NS42 LDgxLjkgIi8+PHBvbHlnb24gcG9pbnRzPSI0OCwxMTAgODcuNyw4Ni42IDQ4LDYxLjkgIi8+PC9n Pjwvc3ZnPicpOwogfQogCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wbGF5LWJ1dHRv biwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRp YUNvbnRyb2xzaU9TLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21l ZGlhQ29udHJvbHNpT1MuanMKaW5kZXggYmQyNzFlZjlkMjM5YTY0MTBhNDhlZWZhNjFiYTk2YjA4 ODkxN2Y1ZC4uYWNmYjFhYWRiZGRlMmY0NGM3Zjc2YmZiZjEyODlmYjE4M2U0NWE5NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNp T1MuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29u dHJvbHNpT1MuanMKQEAgLTYsMTAgKzYsMTMgQEAgZnVuY3Rpb24gY3JlYXRlQ29udHJvbHMocm9v dCwgdmlkZW8sIGhvc3QpCiBmdW5jdGlvbiBDb250cm9sbGVySU9TKHJvb3QsIHZpZGVvLCBob3N0 KQogewogICAgIHRoaXMuaGFzV2lyZWxlc3NQbGF5YmFja1RhcmdldHMgPSBmYWxzZTsKKyAgICB0 aGlzLl9wYWdlU2NhbGVGYWN0b3IgPSAxOwogICAgIENvbnRyb2xsZXIuY2FsbCh0aGlzLCByb290 LCB2aWRlbywgaG9zdCk7CiAKICAgICB0aGlzLnVwZGF0ZVdpcmVsZXNzVGFyZ2V0QXZhaWxhYmxl KCk7CiAgICAgdGhpcy51cGRhdGVXaXJlbGVzc1BsYXliYWNrU3RhdHVzKCk7CisKKyAgICBob3N0 LmNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IgPSB0cnVlOwogfTsKIAogLyogRW51bXMg Ki8KQEAgLTQwMyw2ICs0MDYsMjUgQEAgQ29udHJvbGxlcklPUy5wcm90b3R5cGUgPSB7CiAgICAg ICAgIHRoaXMudmlkZW8ud2Via2l0U2hvd1BsYXliYWNrVGFyZ2V0UGlja2VyKCk7CiAgICAgICAg IGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOwogICAgIH0sCisKKyAgICBnZXQgcGFnZVNjYWxlRmFj dG9yKCkgeworICAgICAgICByZXR1cm4gdGhpcy5fcGFnZVNjYWxlRmFjdG9yOworICAgIH0sCisK KyAgICBzZXQgcGFnZVNjYWxlRmFjdG9yKG5ld1NjYWxlRmFjdG9yKSB7CisgICAgICAgIHRoaXMu X3BhZ2VTY2FsZUZhY3RvciA9IG5ld1NjYWxlRmFjdG9yOworCisgICAgICAgIGlmIChuZXdTY2Fs ZUZhY3RvcikgeworICAgICAgICAgICAgdmFyIHNjYWxlVHJhbnNmb3JtID0gInNjYWxlKCIgKyAo MSAvIG5ld1NjYWxlRmFjdG9yKSArICIpIjsKKyAgICAgICAgICAgIGlmICh0aGlzLmNvbnRyb2xz LnN0YXJ0UGxheWJhY2tCdXR0b24pCisgICAgICAgICAgICAgICAgdGhpcy5jb250cm9scy5zdGFy dFBsYXliYWNrQnV0dG9uLnN0eWxlLndlYmtpdFRyYW5zZm9ybSA9IHNjYWxlVHJhbnNmb3JtOwor ICAgICAgICAgICAgaWYgKHRoaXMuY29udHJvbHMucGFuZWwpIHsKKyAgICAgICAgICAgICAgICB0 aGlzLmNvbnRyb2xzLnBhbmVsLnN0eWxlLndpZHRoID0gKG5ld1NjYWxlRmFjdG9yICogMTAwKSAr ICIlIjsKKyAgICAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLnBhbmVsLnN0eWxlLndlYmtpdFRy YW5zZm9ybSA9IHNjYWxlVHJhbnNmb3JtOworICAgICAgICAgICAgICAgIHRoaXMudXBkYXRlUHJv Z3Jlc3MoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KIH07CiAKIE9iamVjdC5j cmVhdGUoQ29udHJvbGxlci5wcm90b3R5cGUpLmV4dGVuZChDb250cm9sbGVySU9TLnByb3RvdHlw ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAppbmRleCA4NjRjZTcw ZTE0YmY1MmFlNzNlZWIxOTRiYzRhNTYwOWIyZjNhZTc5Li41YjBjNjI3MzFlNjA3NTc4Mjk5M2Fh MjE1NDUxMTdhMjQzOTMwMjJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxN ZWRpYUVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVu dC5jcHAKQEAgLTU5MTgsNiArNTkxOCw3IEBAIERPTVdyYXBwZXJXb3JsZCYgSFRNTE1lZGlhRWxl bWVudDo6ZW5zdXJlSXNvbGF0ZWRXb3JsZCgpCiAKIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6ZW5z dXJlTWVkaWFDb250cm9sc0luamVjdGVkU2NyaXB0KCkKIHsKKyAgICBMT0coTWVkaWEsICJIVE1M TWVkaWFFbGVtZW50OjplbnN1cmVNZWRpYUNvbnRyb2xzSW5qZWN0ZWRTY3JpcHQiKTsKICAgICBQ YWdlKiBwYWdlID0gZG9jdW1lbnQoKS5wYWdlKCk7CiAgICAgaWYgKCFwYWdlKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CkBAIC01OTMxLDggKzU5MzIsOCBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6 OmVuc3VyZU1lZGlhQ29udHJvbHNJbmplY3RlZFNjcmlwdCgpCiAgICAgSlNET01HbG9iYWxPYmpl Y3QqIGdsb2JhbE9iamVjdCA9IEpTQzo6anNDYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oc2NyaXB0 Q29udHJvbGxlci5nbG9iYWxPYmplY3Qod29ybGQpKTsKICAgICBKU0M6OkV4ZWNTdGF0ZSogZXhl YyA9IGdsb2JhbE9iamVjdC0+Z2xvYmFsRXhlYygpOwogCi0gICAgSlNDOjpKU1ZhbHVlIG92ZXJs YXlWYWx1ZSA9IGdsb2JhbE9iamVjdC0+Z2V0KGV4ZWMsIEpTQzo6SWRlbnRpZmllcihleGVjLCAi Y3JlYXRlQ29udHJvbHMiKSk7Ci0gICAgaWYgKG92ZXJsYXlWYWx1ZS5pc0Z1bmN0aW9uKCkpCisg ICAgSlNDOjpKU1ZhbHVlIGZ1bmN0aW9uVmFsdWUgPSBnbG9iYWxPYmplY3QtPmdldChleGVjLCBK U0M6OklkZW50aWZpZXIoZXhlYywgImNyZWF0ZUNvbnRyb2xzIikpOworICAgIGlmIChmdW5jdGlv blZhbHVlLmlzRnVuY3Rpb24oKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICNpZm5kZWYgTkRF QlVHCkBAIC01OTUwLDggKzU5NTEsMTYgQEAgYm9vbCBIVE1MTWVkaWFFbGVtZW50OjplbnN1cmVN ZWRpYUNvbnRyb2xzSW5qZWN0ZWRTY3JpcHQoKQogICAgIHJldHVybiB0cnVlOwogfQogCitzdGF0 aWMgdm9pZCBzZXRQYWdlU2NhbGVGYWN0b3JQcm9wZXJ0eShKU0M6OkV4ZWNTdGF0ZSogZXhlYywg SlNDOjpKU1ZhbHVlIGNvbnRyb2xsZXJWYWx1ZSwgZmxvYXQgcGFnZVNjYWxlRmFjdG9yKQorewor ICAgIEpTQzo6UHV0UHJvcGVydHlTbG90IHByb3BlcnR5U2xvdChjb250cm9sbGVyVmFsdWUpOwor ICAgIEpTQzo6SlNPYmplY3QqIGNvbnRyb2xsZXJPYmplY3QgPSBjb250cm9sbGVyVmFsdWUudG9P YmplY3QoZXhlYyk7CisgICAgY29udHJvbGxlck9iamVjdC0+bWV0aG9kVGFibGUoKS0+cHV0KGNv bnRyb2xsZXJPYmplY3QsIGV4ZWMsIEpTQzo6SWRlbnRpZmllcihleGVjLCAicGFnZVNjYWxlRmFj dG9yIiksIEpTQzo6anNOdW1iZXIocGFnZVNjYWxlRmFjdG9yKSwgcHJvcGVydHlTbG90KTsKK30K Kwogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpkaWRBZGRVc2VyQWdlbnRTaGFkb3dSb290KFNoYWRv d1Jvb3QqIHJvb3QpCiB7CisgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6ZGlkQWRk VXNlckFnZW50U2hhZG93Um9vdCIpOwogI2lmIEVOQUJMRShQTFVHSU5fUFJPWFlfRk9SX1ZJREVP KQogICAgIC8vIEphdmFTY3JpcHQgY29udHJvbHMgYXJlIG5vdCBlbmFibGVkIHdpdGggdGhlIHZp ZGVvIHBsdWdpbiBwcm94eS4KICAgICBpZiAoc2hvdWxkVXNlVmlkZW9QbHVnaW5Qcm94eSgpKQpA QCAtNTk3MSw5ICs1OTgwLDE3IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6ZGlkQWRkVXNlckFn ZW50U2hhZG93Um9vdChTaGFkb3dSb290KiByb290KQogICAgIEpTQzo6RXhlY1N0YXRlKiBleGVj ID0gZ2xvYmFsT2JqZWN0LT5nbG9iYWxFeGVjKCk7CiAgICAgSlNDOjpKU0xvY2tIb2xkZXIgbG9j ayhleGVjKTsKIAotICAgIC8vIEl0IGlzIGV4cGVjdGVkIHRoZSBKUyBmaWxlIHByb3ZpZGVzIGEg Y3JlYXRlQ29udHJvbHMoc2hhZG93Um9vdCwgdmlkZW8sIG1lZGlhQ29udHJvbHNIb3N0KSBmdW5j dGlvbi4KLSAgICBKU0M6OkpTVmFsdWUgb3ZlcmxheVZhbHVlID0gZ2xvYmFsT2JqZWN0LT5nZXQo ZXhlYywgSlNDOjpJZGVudGlmaWVyKGV4ZWMsICJjcmVhdGVDb250cm9scyIpKTsKLSAgICBpZiAo b3ZlcmxheVZhbHVlLmlzVW5kZWZpbmVkT3JOdWxsKCkpCisgICAgLy8gVGhlIG1lZGlhIGNvbnRy b2xzIHNjcmlwdCBtdXN0IHByb3ZpZGUgYSBtZXRob2Qgd2l0aCB0aGUgZm9sbG93aW5nIGRldGFp bHMuCisgICAgLy8gTmFtZTogY3JlYXRlQ29udHJvbHMKKyAgICAvLyBQYXJhbWV0ZXJzOgorICAg IC8vICAgICAxLiBUaGUgU2hhZG93Um9vdCBlbGVtZW50IHRoYXQgd2lsbCBob2xkIHRoZSBjb250 cm9scy4KKyAgICAvLyAgICAgMi4gVGhpcyBvYmplY3QgKGFuZCBIVE1MTWVkaWFFbGVtZW50KS4K KyAgICAvLyAgICAgMy4gVGhlIE1lZGlhQ29udHJvbHNIb3N0IG9iamVjdC4KKyAgICAvLyBSZXR1 cm4gdmFsdWU6CisgICAgLy8gICAgIEEgcmVmZXJlbmNlIHRvIHRoZSBjcmVhdGVkIG1lZGlhIGNv bnRyb2xsZXIgaW5zdGFuY2UuCisKKyAgICBKU0M6OkpTVmFsdWUgZnVuY3Rpb25WYWx1ZSA9IGds b2JhbE9iamVjdC0+Z2V0KGV4ZWMsIEpTQzo6SWRlbnRpZmllcihleGVjLCAiY3JlYXRlQ29udHJv bHMiKSk7CisgICAgaWYgKGZ1bmN0aW9uVmFsdWUuaXNVbmRlZmluZWRPck51bGwoKSkKICAgICAg ICAgcmV0dXJuOwogCiAgICAgaWYgKCFtX21lZGlhQ29udHJvbHNIb3N0KQpAQCAtNTk4NCwxMyAr NjAwMSwxNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmRpZEFkZFVzZXJBZ2VudFNoYWRvd1Jv b3QoU2hhZG93Um9vdCogcm9vdCkKICAgICBhcmdMaXN0LmFwcGVuZCh0b0pTKGV4ZWMsIGdsb2Jh bE9iamVjdCwgdGhpcykpOwogICAgIGFyZ0xpc3QuYXBwZW5kKHRvSlMoZXhlYywgZ2xvYmFsT2Jq ZWN0LCBtX21lZGlhQ29udHJvbHNIb3N0LmdldCgpKSk7CiAKLSAgICBKU0M6OkpTT2JqZWN0KiBv dmVybGF5ID0gb3ZlcmxheVZhbHVlLnRvT2JqZWN0KGV4ZWMpOworICAgIEpTQzo6SlNPYmplY3Qq IGZ1bmN0aW9uID0gZnVuY3Rpb25WYWx1ZS50b09iamVjdChleGVjKTsKICAgICBKU0M6OkNhbGxE YXRhIGNhbGxEYXRhOwotICAgIEpTQzo6Q2FsbFR5cGUgY2FsbFR5cGUgPSBvdmVybGF5LT5tZXRo b2RUYWJsZSgpLT5nZXRDYWxsRGF0YShvdmVybGF5LCBjYWxsRGF0YSk7CisgICAgSlNDOjpDYWxs VHlwZSBjYWxsVHlwZSA9IGZ1bmN0aW9uLT5tZXRob2RUYWJsZSgpLT5nZXRDYWxsRGF0YShmdW5j dGlvbiwgY2FsbERhdGEpOwogICAgIGlmIChjYWxsVHlwZSA9PSBKU0M6OkNhbGxUeXBlTm9uZSkK ICAgICAgICAgcmV0dXJuOwogCi0gICAgSlNDOjpjYWxsKGV4ZWMsIG92ZXJsYXksIGNhbGxUeXBl LCBjYWxsRGF0YSwgZ2xvYmFsT2JqZWN0LCBhcmdMaXN0KTsKKyAgICBKU0M6OkpTVmFsdWUgY29u dHJvbGxlclZhbHVlID0gSlNDOjpjYWxsKGV4ZWMsIGZ1bmN0aW9uLCBjYWxsVHlwZSwgY2FsbERh dGEsIGdsb2JhbE9iamVjdCwgYXJnTGlzdCk7CisgICAgbV9tZWRpYUNvbnRyb2xzSG9zdC0+c2V0 Q29udHJvbGxlckpTVmFsdWUoY29udHJvbGxlclZhbHVlKTsKKworICAgIHNldFBhZ2VTY2FsZUZh Y3RvclByb3BlcnR5KGV4ZWMsIGNvbnRyb2xsZXJWYWx1ZSwgcGFnZS0+cGFnZVNjYWxlRmFjdG9y KCkpOworCiAgICAgaWYgKGV4ZWMtPmhhZEV4Y2VwdGlvbigpKQogICAgICAgICBleGVjLT5jbGVh ckV4Y2VwdGlvbigpOwogfQpAQCAtNjAxMSw2ICs2MDMyLDIwIEBAIHZvaWQgSFRNTE1lZGlhRWxl bWVudDo6c2V0TWVkaWFDb250cm9sc0RlcGVuZE9uUGFnZVNjYWxlRmFjdG9yKGJvb2wgZGVwZW5k c09uUGFnCiAKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cGFnZVNjYWxlRmFjdG9yQ2hhbmdlZCgp CiB7CisgICAgUGFnZSogcGFnZSA9IGRvY3VtZW50KCkucGFnZSgpOworICAgIGlmICghcGFnZSkK KyAgICAgICAgcmV0dXJuOworCisgICAgTE9HKE1lZGlhLCAiSFRNTE1lZGlhRWxlbWVudDo6cGFn ZVNjYWxlRmFjdG9yQ2hhbmdlZCA9ICVmIiwgcGFnZS0+cGFnZVNjYWxlRmFjdG9yKCkpOworICAg IERPTVdyYXBwZXJXb3JsZCYgd29ybGQgPSBlbnN1cmVJc29sYXRlZFdvcmxkKCk7CisgICAgU2Ny aXB0Q29udHJvbGxlciYgc2NyaXB0Q29udHJvbGxlciA9IHBhZ2UtPm1haW5GcmFtZSgpLnNjcmlw dCgpOworICAgIEpTRE9NR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBKU0M6OmpzQ2FzdDxK U0RPTUdsb2JhbE9iamVjdCo+KHNjcmlwdENvbnRyb2xsZXIuZ2xvYmFsT2JqZWN0KHdvcmxkKSk7 CisgICAgSlNDOjpFeGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxPYmplY3QtPmdsb2JhbEV4ZWMoKTsK KyAgICBKU0M6OkpTTG9ja0hvbGRlciBsb2NrKGV4ZWMpOworCisgICAgSlNDOjpKU1ZhbHVlIGNv bnRyb2xsZXJWYWx1ZSA9IG1fbWVkaWFDb250cm9sc0hvc3QtPmNvbnRyb2xsZXJKU1ZhbHVlKCk7 CisKKyAgICBzZXRQYWdlU2NhbGVGYWN0b3JQcm9wZXJ0eShleGVjLCBjb250cm9sbGVyVmFsdWUs IHBhZ2UtPnBhZ2VTY2FsZUZhY3RvcigpKTsKIH0KICNlbmRpZiAvLyBFTkFCTEUoTUVESUFfQ09O VFJPTFNfU0NSSVBUKQogCg==