182937 2018-02-19 12:52:57 -0800 [Modern Media Controls] Implement a compact set of media controls 2018-02-19 16:37:48 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts commit-queue eric.carlson thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1400460 0 graouts 2018-02-19 12:52:57 -0800 In some circumstances we want to show a super simple compact set of media controls where we only have a play/pause button and an invalid placard. 1400461 1 webkit-bug-importer 2018-02-19 13:00:12 -0800 <rdar://problem/37682257> 1400462 2 334179 graouts 2018-02-19 13:02:32 -0800 Created attachment 334179 Patch 1400498 3 334179 commit-queue 2018-02-19 14:11:21 -0800 Comment on attachment 334179 Patch Rejecting attachment 334179 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 334179, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: rdparty/autoinstalled/mechanize/_urllib2_fork.py", line 332, in _call_chain result = func(*args) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_urllib2_fork.py", line 1170, in https_open return self.do_open(conn_factory, req) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_urllib2_fork.py", line 1118, in do_open raise URLError(err) urllib2.URLError: <urlopen error [Errno 60] Operation timed out> Full output: http://webkit-queues.webkit.org/results/6577867 1400555 4 graouts 2018-02-19 16:37:48 -0800 Committed r228718: <https://trac.webkit.org/changeset/228718> 334179 2018-02-19 13:02:32 -0800 2018-02-19 14:11:21 -0800 Patch bug-182937-20180219130231.patch text/plain 31519 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGEwMTcxYzFlYmZiNTdm ZDMxZjdiYzYyYzRjMzlhYzBjNzc4MmVhZi4uZTk4YjUyMmY0YWY0MTg2OTUyZTNiNjI5NWI3MmIx MDI3MDc1YmUzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU5IEBACisyMDE4LTAyLTE5ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gSW1wbGVtZW50IGEgY29tcGFjdCBzZXQgb2YgbWVkaWEgY29udHJvbHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjkzNworICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMzc2ODIyNTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2UgYWRkIGEgbmV3IHR5cGUgb2YgbWVkaWEgY29udHJvbHMg dXNlZCB3aGVuIHdlIG5lZWQgc3RyaXBwZWQgZG93biBhbmQgY29tcGFjdCBjb250cm9scy4gVGhl IG5ldworICAgICAgICBDb21wYWN0TWVkaWFDb250cm9scyBvbmx5IHNob3cgYSBwbGF5L3BhdXNl IGJ1dHRvbiBhbmQgYW4gaW52YWxpZCBwbGFjYXJkIGFuZCBkaXNyZWdhcmQgYWxsIG1lZGlhCisg ICAgICAgIGV2ZW50cyB0aGF0IGFyZSBub3QgcmVsZXZhbnQgdG8gdGhlIGRpc3BsYXkgb2YgdGhl c2UgY29udHJvbHMuCisKKyAgICAgICAgVG8gZGlzdGluZ3Vpc2ggY2FzZXMgd2hlcmUgd2UgbmVl ZCB0byBzaG93IGNvbXBhY3QgbWVkaWEgY29udHJvbHMsIHdlIGV4cG9zZSBhIG5ldyBwcm9wZXJ0 eSBvbgorICAgICAgICBNZWRpYUNvbnRyb2xzSG9zdCBjYWxsZWQgImNvbXBhY3RNb2RlIi4KKwor ICAgICAgICBUZXN0czogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbXBhY3QtbWVkaWEt Y29udHJvbHMvY29tcGFjdC1tZWRpYS1jb250cm9scy1jb25zdHJ1Y3Rvci5odG1sCisgICAgICAg ICAgICAgICBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29tcGFjdC1tZWRpYS1jb250cm9s cy9jb21wYWN0LW1lZGlhLWNvbnRyb2xzLWxheW91dC5odG1sCisKKyAgICAgICAgKiBNb2R1bGVz L21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFDb250cm9sc0hvc3Q6OmJhc2U2NFN0cmluZ0Zvckljb25OYW1lQW5kVHlwZSBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xzSG9zdDo6Y29tcGFjdE1vZGUgY29uc3Qp OgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5oOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sc0hvc3Q6OnNldFNpbXVsYXRlQ29tcGFjdE1v ZGUpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5p ZGw6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvY29t cGFjdC1tZWRpYS1jb250cm9scy5qczogQWRkZWQuCisgICAgICAgIChDb21wYWN0TWVkaWFDb250 cm9scy5wcm90b3R5cGUuZ2V0IHNjYWxlRmFjdG9yKToKKyAgICAgICAgKENvbXBhY3RNZWRpYUNv bnRyb2xzLnByb3RvdHlwZS5zZXQgc2NhbGVGYWN0b3IpOgorICAgICAgICAoQ29tcGFjdE1lZGlh Q29udHJvbHMucHJvdG90eXBlLmdldCBzaG91bGRDZW50ZXJDb250cm9sc1ZlcnRpY2FsbHkpOgor ICAgICAgICAoQ29tcGFjdE1lZGlhQ29udHJvbHMucHJvdG90eXBlLnNldCBzaG91bGRDZW50ZXJD b250cm9sc1ZlcnRpY2FsbHkpOgorICAgICAgICAoQ29tcGFjdE1lZGlhQ29udHJvbHMucHJvdG90 eXBlLmdldCBwbGFjYXJkKToKKyAgICAgICAgKENvbXBhY3RNZWRpYUNvbnRyb2xzLnByb3RvdHlw ZS5zZXQgcGxhY2FyZCk6CisgICAgICAgIChDb21wYWN0TWVkaWFDb250cm9scy5wcm90b3R5cGUu bGF5b3V0KToKKyAgICAgICAgKENvbXBhY3RNZWRpYUNvbnRyb2xzLnByb3RvdHlwZS5jb21taXRQ cm9wZXJ0eSk6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJv bHMvaWNvbi1zZXJ2aWNlLmpzOgorICAgICAgICAoY29uc3QuaWNvblNlcnZpY2UubmV3Lkljb25T ZXJ2aWNlLnByb3RvdHlwZS5fZmlsZU5hbWVBbmRQbGF0Zm9ybUZvckljb25BbmRMYXlvdXRUcmFp dHMpOgorICAgICAgICAoY29uc3QuaWNvblNlcnZpY2UubmV3Lkljb25TZXJ2aWNlKToKKyAgICAg ICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9pbmxpbmUtbWVkaWEt Y29udHJvbHMuanM6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29u dHJvbHMvbGF5b3V0LWl0ZW0uanM6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvanMtZmlsZXM6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv bWFpbi5qczoKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9t ZWRpYS1jb250cm9sbGVyLmpzOgorICAgICAgICAoTWVkaWFDb250cm9sbGVyLnByb3RvdHlwZS5n ZXQgbGF5b3V0VHJhaXRzKToKKyAgICAgICAgKE1lZGlhQ29udHJvbGxlci5wcm90b3R5cGUuX3N1 cHBvcnRpbmdPYmplY3RDbGFzc2VzKTogQ29tcHV0ZSB0aGUgc2V0IG9mIE1lZGlhQ29udHJvbGxl clN1cHBvcnQgY2xhc3NlcyBiYXNlZAorICAgICAgICBvbiB0aGUgbGF5b3V0IHRyYWl0cyBzdWNo IHRoYXQgaW4gY29tcGFjdCBtb2RlIHdlIG9ubHkgcmV0dXJuIFBsYWNhcmRTdXBwb3J0IGFuZCBQ bGF5YmFja1N1cHBvcnQuCisgICAgICAgIChNZWRpYUNvbnRyb2xsZXIucHJvdG90eXBlLl91cGRh dGVDb250cm9sc0lmTmVlZGVkKToKKyAgICAgICAgKE1lZGlhQ29udHJvbGxlci5wcm90b3R5cGUu X2NvbnRyb2xzQ2xhc3NGb3JMYXlvdXRUcmFpdHMpOgorICAgICAgICAoTWVkaWFDb250cm9sbGVy LnByb3RvdHlwZS5fc2hvdWxkQ29udHJvbHNCZUF2YWlsYWJsZSk6CisgICAgICAgICogTW9kdWxl cy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvcGxhY2FyZC1zdXBwb3J0LmpzOgorICAgICAg ICAoUGxhY2FyZFN1cHBvcnQucHJvdG90eXBlLmdldCBtZWRpYUV2ZW50cyk6IE9ubHkgdHJhY2sg dGhlICJlcnJvciIgZXZlbnQgaW4gY29tcGFjdCBtb2RlIHNpbmNlIHRoaXMgaXMgdGhlIG9ubHkK KyAgICAgICAgcmVsZXZhbnQgcGxhY2FyZC4KKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRp YS1jb250cm9scy9tZWRpYS9wbGF5YmFjay1zdXBwb3J0LmpzOgorICAgICAgICAoUGxheWJhY2tT dXBwb3J0LnByb3RvdHlwZS5zeW5jQ29udHJvbCk6IE9ubHkgc2hvdyBvciBoaWRlIHRoZSBwbGF5 L3BhdXNlIGJ1dHRvbiBiYXNlZCBvbiB0aGUgcGxheWJhY2sgc3RhdGUKKyAgICAgICAgd2hlbiBp biBjb21wYWN0IG1vZGUuCisgICAgICAgIChQbGF5YmFja1N1cHBvcnQpOgorICAgICAgICAqIFdl YkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAxOC0wMi0xNyAgQW50b2luZSBR dWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWIgQW5pbWF0aW9uc10gU3Rv cmUgYWxsIHBhcnNlZCBrZXlmcmFtZSBpbnB1dCBpbmZvcm1hdGlvbiBpbiBhIHNpbmdsZSBzdHJ1 Y3R1cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9N ZWRpYUNvbnRyb2xzSG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJv bHMvTWVkaWFDb250cm9sc0hvc3QuY3BwCmluZGV4IGUzYTIxMzAwY2ZjNjViNjU3Mzg5ZTc3OTYy M2UxZDFjOWI3MTc5YmIuLmZkYTg2MTMzODFmOTljMjNkMGY3ZjYwNjM1ZTdmMjQ1MmYxZGQ5MDUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9NZWRpYUNv bnRyb2xzSG9zdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xz L01lZGlhQ29udHJvbHNIb3N0LmNwcApAQCAtMjgzLDcgKzI4Myw2IEBAIFN0cmluZyBNZWRpYUNv bnRyb2xzSG9zdDo6c2hhZG93Um9vdENTU1RleHQoKSBjb25zdAogCiBTdHJpbmcgTWVkaWFDb250 cm9sc0hvc3Q6OmJhc2U2NFN0cmluZ0Zvckljb25OYW1lQW5kVHlwZShjb25zdCBTdHJpbmcmIGlj b25OYW1lLCBjb25zdCBTdHJpbmcmIGljb25UeXBlKSBjb25zdAogewotCiAgICAgcmV0dXJuIFJl bmRlclRoZW1lOjpzaW5nbGV0b24oKS5tZWRpYUNvbnRyb2xzQmFzZTY0U3RyaW5nRm9ySWNvbk5h bWVBbmRUeXBlKGljb25OYW1lLCBpY29uVHlwZSk7CiB9CiAKQEAgLTI5Miw2ICsyOTEsMTggQEAg U3RyaW5nIE1lZGlhQ29udHJvbHNIb3N0Ojpmb3JtYXR0ZWRTdHJpbmdGb3JEdXJhdGlvbihkb3Vi bGUgZHVyYXRpb25JblNlY29uZHMpIGMKICAgICByZXR1cm4gUmVuZGVyVGhlbWU6OnNpbmdsZXRv bigpLm1lZGlhQ29udHJvbHNGb3JtYXR0ZWRTdHJpbmdGb3JEdXJhdGlvbihkdXJhdGlvbkluU2Vj b25kcyk7CiB9CiAKK2Jvb2wgTWVkaWFDb250cm9sc0hvc3Q6OmNvbXBhY3RNb2RlKCkgY29uc3QK K3sKKyAgICBpZiAobV9zaW11bGF0ZUNvbXBhY3RNb2RlKQorICAgICAgICByZXR1cm4gdHJ1ZTsK KworI2lmIEVOQUJMRShFWFRSQV9aT09NX01PREUpCisgICAgcmV0dXJuIHRydWU7CisjZWxzZQor ICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgorfQorCiB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3Qu aAppbmRleCA4MzM1YzMxZDUzMmM3Yzc5M2ZjYjU4NThmODk5OTA5NDY2MmY1MjhhLi5hMjc5M2Vl Y2Y4ZDJmZWZlM2Q5NjhiNTZmNzMzYTU3MzJhNmM4MGFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaApAQCAt ODEsNiArODEsOSBAQCBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBEZXZpY2VUeXBlIHsgTm9uZSwg QWlycGxheSwgVHZvdXQgfTsKICAgICBEZXZpY2VUeXBlIGV4dGVybmFsRGV2aWNlVHlwZSgpIGNv bnN0OwogCisgICAgYm9vbCBjb21wYWN0TW9kZSgpIGNvbnN0OworICAgIHZvaWQgc2V0U2ltdWxh dGVDb21wYWN0TW9kZShib29sIHZhbHVlKSB7IG1fc2ltdWxhdGVDb21wYWN0TW9kZSA9IHZhbHVl OyB9CisKICAgICBib29sIGNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoKSBjb25zdDsK ICAgICB2b2lkIHNldENvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IoYm9vbCB2KTsKIApA QCAtOTUsNiArOTgsNyBAQCBwcml2YXRlOgogCiAgICAgSFRNTE1lZGlhRWxlbWVudCogbV9tZWRp YUVsZW1lbnQ7CiAgICAgUmVmUHRyPE1lZGlhQ29udHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1l bnQ+IG1fdGV4dFRyYWNrQ29udGFpbmVyOworICAgIGJvb2wgbV9zaW11bGF0ZUNvbXBhY3RNb2Rl IHsgZmFsc2UgfTsKIH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhY29udHJvbHMvTWVkaWFDb250cm9sc0hvc3QuaWRsCmluZGV4IGZkYmU3NmE2NjEx ZGI5YmYyNTUxZjZlYzgwYjIyODlkMDljMjliMTcuLjJkNzYxMjRjZjE4YzViYWZmZjQxZDc1OTUy NWM3NTViM2YyM2FkMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFj b250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYWNvbnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmlkbApAQCAtNDksNiArNDksNyBAQCBl bnVtIERldmljZVR5cGUgewogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBib29sZWFuIHVzZXJHZXN0 dXJlUmVxdWlyZWQ7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIGJvb2xlYW4gaXNJbk1lZGlhRG9j dW1lbnQ7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIGJvb2xlYW4gc2hvdWxkRm9yY2VDb250cm9s c0Rpc3BsYXk7CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIGJvb2xlYW4gY29tcGFjdE1vZGU7CiAK ICAgICByZWFkb25seSBhdHRyaWJ1dGUgRE9NU3RyaW5nIGV4dGVybmFsRGV2aWNlRGlzcGxheU5h bWU7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIERldmljZVR5cGUgZXh0ZXJuYWxEZXZpY2VUeXBl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvY29udHJvbHMvY29tcGFjdC1tZWRpYS1jb250cm9scy5qcyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2NvbXBhY3QtbWVkaWEtY29udHJv bHMuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uNzRiYzBhYjA2MTkyYWQ1MjA2MWM1MjYyZTEzMWE4OWRjNTMxNzAz NAotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL2NvbnRyb2xzL2NvbXBhY3QtbWVkaWEtY29udHJvbHMuanMKQEAgLTAsMCArMSwx NDUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTggQXBwbGUgSW5jLiBBbGwgUmlnaHRzIFJl c2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICog MS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9y bSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisg KiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0 aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQ TEUgSU5DLiBgYEFTIElTJycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJ RVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFO VElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICog UFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IK KyAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLCBTUEVDSUFMLAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMg KElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJ VFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRT OyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhF T1JZCisgKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJ VFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJ TkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJ RiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCitjbGFz cyBDb21wYWN0TWVkaWFDb250cm9scyBleHRlbmRzIExheW91dE5vZGUKK3sKKworICAgIGNvbnN0 cnVjdG9yKHsgd2lkdGggPSAzMjAsIGhlaWdodCA9IDI0MCB9ID0ge30pCisgICAgeworICAgICAg ICBzdXBlcihgPGRpdiBjbGFzcz0ibWVkaWEtY29udHJvbHMiPjwvZGl2PmApOworCisgICAgICAg IHRoaXMuX3NjYWxlRmFjdG9yID0gMTsKKyAgICAgICAgdGhpcy5fc2hvdWxkQ2VudGVyQ29udHJv bHNWZXJ0aWNhbGx5ID0gZmFsc2U7CisKKyAgICAgICAgdGhpcy5sYXlvdXRUcmFpdHMgPSBMYXlv dXRUcmFpdHMuQ29tcGFjdDsKKworICAgICAgICB0aGlzLnBsYXlQYXVzZUJ1dHRvbiA9IG5ldyBQ bGF5UGF1c2VCdXR0b24odGhpcyk7CisgICAgICAgIHRoaXMuaW52YWxpZFBsYWNhcmQgPSBuZXcg SW52YWxpZFBsYWNhcmQodGhpcyk7CisKKyAgICAgICAgdGhpcy5fcGxhY2FyZCA9IG51bGw7CisK KyAgICAgICAgdGhpcy53aWR0aCA9IHdpZHRoOworICAgICAgICB0aGlzLmhlaWdodCA9IGhlaWdo dDsKKyAgICB9CisKKyAgICAvLyBQdWJsaWMKKworICAgIGdldCBzY2FsZUZhY3RvcigpCisgICAg eworICAgICAgICByZXR1cm4gdGhpcy5fc2NhbGVGYWN0b3I7CisgICAgfQorCisgICAgc2V0IHNj YWxlRmFjdG9yKHNjYWxlRmFjdG9yKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX3NjYWxlRmFj dG9yID09PSBzY2FsZUZhY3RvcikKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlz Ll9zY2FsZUZhY3RvciA9IHNjYWxlRmFjdG9yOworICAgICAgICB0aGlzLm1hcmtEaXJ0eVByb3Bl cnR5KCJzY2FsZUZhY3RvciIpOworICAgIH0KKworICAgIGdldCBzaG91bGRDZW50ZXJDb250cm9s c1ZlcnRpY2FsbHkoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Nob3VsZENlbnRlckNv bnRyb2xzVmVydGljYWxseTsKKyAgICB9CisKKyAgICBzZXQgc2hvdWxkQ2VudGVyQ29udHJvbHNW ZXJ0aWNhbGx5KGZsYWcpCisgICAgeworICAgICAgICBpZiAodGhpcy5fc2hvdWxkQ2VudGVyQ29u dHJvbHNWZXJ0aWNhbGx5ID09PSBmbGFnKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAg IHRoaXMuX3Nob3VsZENlbnRlckNvbnRyb2xzVmVydGljYWxseSA9IGZsYWc7CisgICAgICAgIHRo aXMubWFya0RpcnR5UHJvcGVydHkoInNjYWxlRmFjdG9yIik7CisgICAgfQorCisgICAgZ2V0IHBs YWNhcmQoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3BsYWNhcmQ7CisgICAgfQorCisg ICAgc2V0IHBsYWNhcmQocGxhY2FyZCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9wbGFjYXJk ID09PSBwbGFjYXJkKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX3BsYWNh cmQgPSBwbGFjYXJkOworICAgICAgICB0aGlzLmxheW91dCgpOworICAgIH0KKworICAgIC8vIFBy b3RlY3RlZAorCisgICAgbGF5b3V0KCkKKyAgICB7CisgICAgICAgIHN1cGVyLmxheW91dCgpOwor CisgICAgICAgIGNvbnN0IGNoaWxkcmVuID0gW107CisKKyAgICAgICAgLy8gVGhlIGNvbnRyb2xz IG1pZ2h0IGJlIHRvbyBzbWFsbCB0byBhbGxvdyBzaG93aW5nIGFueXRoaW5nIGF0IGFsbC4KKyAg ICAgICAgaWYgKHRoaXMud2lkdGggPCBNaW5pbXVtU2l6ZVRvU2hvd0FueUNvbnRyb2wgfHwgdGhp cy5oZWlnaHQgPCBNaW5pbXVtU2l6ZVRvU2hvd0FueUNvbnRyb2wpIHsKKyAgICAgICAgICAgIHRo aXMuY2hpbGRyZW4gPSBjaGlsZHJlbjsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQor CisgICAgICAgIC8vIElmIHdlIGFyZSBzaG93aW5nIHRoZSBpbnZhbGlkIHBsYWNhcmQsIHNob3cg dGhlIHBsYWNhcmQgb25seS4KKyAgICAgICAgaWYgKHRoaXMuX3BsYWNhcmQgPT09IHRoaXMuaW52 YWxpZFBsYWNhcmQpIHsKKyAgICAgICAgICAgIHRoaXMuX3BsYWNhcmQud2lkdGggPSB0aGlzLndp ZHRoOworICAgICAgICAgICAgdGhpcy5fcGxhY2FyZC5oZWlnaHQgPSB0aGlzLmhlaWdodDsKKyAg ICAgICAgICAgIHRoaXMuY2hpbGRyZW4gPSBbdGhpcy5fcGxhY2FyZF07CisgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBpZiAodGhpcy5wbGF5UGF1c2VCdXR0b24udmlz aWJsZSkgeworICAgICAgICAgICAgdGhpcy5wbGF5UGF1c2VCdXR0b24uc3R5bGUgPSB0aGlzLndp ZHRoIDw9IE1heGltdW1TaXplVG9TaG93U21hbGxQcm9taW5lbnRDb250cm9sIHx8IHRoaXMuaGVp Z2h0IDw9IE1heGltdW1TaXplVG9TaG93U21hbGxQcm9taW5lbnRDb250cm9sID8gQnV0dG9uLlN0 eWxlcy5TbWFsbENlbnRlciA6IEJ1dHRvbi5TdHlsZXMuQ2VudGVyOworICAgICAgICAgICAgY2hp bGRyZW4ucHVzaCh0aGlzLnBsYXlQYXVzZUJ1dHRvbik7CisgICAgICAgIH0KKworICAgICAgICB0 aGlzLmNoaWxkcmVuID0gY2hpbGRyZW47CisgICAgfQorCisgICAgY29tbWl0UHJvcGVydHkocHJv cGVydHlOYW1lKQorICAgIHsKKyAgICAgICAgaWYgKHByb3BlcnR5TmFtZSAhPT0gInNjYWxlRmFj dG9yIikgeworICAgICAgICAgICAgc3VwZXIuY29tbWl0UHJvcGVydHkocHJvcGVydHlOYW1lKTsK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGNvbnN0IHpvb20gPSAx IC8gdGhpcy5fc2NhbGVGYWN0b3I7CisgICAgICAgIC8vIFdlIHdhbnQgdG8gbWFpbnRhaW4gdGhl IGNvbnRyb2xzIGF0IGEgY29uc3RhbnQgZGV2aWNlIGhlaWdodC4gVG8gZG8gc28sIHdlIGludmVy dCB0aGUgcGFnZSBzY2FsZQorICAgICAgICAvLyBmYWN0b3IgdXNpbmcgYSBzY2FsZSB0cmFuc2Zv cm0gd2hlbiBzY2FsaW5nIGRvd24sIHdoZW4gdGhlIHJlc3VsdCB3aWxsIG5vdCBhcHBlYXIgcGl4 ZWxhdGVkIGFuZAorICAgICAgICAvLyB3aGVyZSB0aGUgQ1NTIHpvb20gcHJvcGVydHkgcHJvZHVj ZXMgaW5jb3JyZWN0IHRleHQgcmVuZGVyaW5nIGR1ZSB0byBlbmZvcmNpbmcgdGhlIG1pbmltdW0g Zm9udAorICAgICAgICAvLyBzaXplLiBXaGVuIHdlIHdvdWxkIGVuZCB1cCBzY2FsaW5nIHVwLCB3 aGljaCB3b3VsZCB5aWVsZCBwaXhlbGF0aW9uLCB3ZSB1c2UgdGhlIENTUyB6b29tIHByb3BlcnR5 CisgICAgICAgIC8vIHdoaWNoIHdpbGwgbm90IHJ1biBpbnRvIHRoZSBmb250IHNpemUgaXNzdWUu CisgICAgICAgIGlmICh6b29tIDwgMSkgeworICAgICAgICAgICAgdGhpcy5lbGVtZW50LnN0eWxl LnRyYW5zZm9ybSA9IGBzY2FsZSgke3pvb219KWA7CisgICAgICAgICAgICB0aGlzLmVsZW1lbnQu c3R5bGUucmVtb3ZlUHJvcGVydHkoInpvb20iKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAg ICAgIHRoaXMuZWxlbWVudC5zdHlsZS56b29tID0gem9vbTsKKyAgICAgICAgICAgIHRoaXMuZWxl bWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgidHJhbnNmb3JtIik7CisgICAgICAgIH0KKyAgICAg ICAgLy8gV2UgYWxzbyB3YW50IHRvIG9wdGlvbmFsbHkgY2VudGVyIHRoZW0gdmVydGljYWxseSBj b21wYXJlZCB0byB0aGVpciBjb250YWluZXIuCisgICAgICAgIHRoaXMuZWxlbWVudC5zdHlsZS50 b3AgPSB0aGlzLl9zaG91bGRDZW50ZXJDb250cm9sc1ZlcnRpY2FsbHkgPyBgJHsodGhpcy5oZWln aHQgLyAyKSAqICh6b29tIC0gMSl9cHhgIDogImF1dG8iOyAKKyAgICB9CisKK30KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xz L2ljb24tc2VydmljZS5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL2NvbnRyb2xzL2ljb24tc2VydmljZS5qcwppbmRleCAwYzI5MzdiYzgxYjlmM2E3YTk3 MTRlZDNiNWM1NDc2ZWVjNTM5MzQ2Li40OTM5NTNlOWU4N2ZkMGQxZGNkOGE1ZGE1NWM0YTAwODNj MzJiM2ExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1j b250cm9scy9jb250cm9scy9pY29uLXNlcnZpY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvaWNvbi1zZXJ2aWNlLmpzCkBAIC04 OCw3ICs4OCw3IEBAIGNvbnN0IGljb25TZXJ2aWNlID0gbmV3IGNsYXNzIEljb25TZXJ2aWNlIHsK ICAgICAgICAgbGV0IHBsYXRmb3JtOwogICAgICAgICBpZiAobGF5b3V0VHJhaXRzICYgTGF5b3V0 VHJhaXRzLm1hY09TKQogICAgICAgICAgICAgcGxhdGZvcm0gPSAibWFjT1MiOwotICAgICAgICBl bHNlIGlmIChsYXlvdXRUcmFpdHMgJiBMYXlvdXRUcmFpdHMuaU9TKQorICAgICAgICBlbHNlIGlm IChsYXlvdXRUcmFpdHMgJiBMYXlvdXRUcmFpdHMuaU9TIHx8IGxheW91dFRyYWl0cyAmIExheW91 dFRyYWl0cy5Db21wYWN0KQogICAgICAgICAgICAgcGxhdGZvcm0gPSAiaU9TIjsKICAgICAgICAg ZWxzZQogICAgICAgICAgICAgdGhyb3cgIkNvdWxkIG5vdCBpZGVudGlmeSBpY29uJ3MgcGxhdGZv cm0gZnJvbSBsYXlvdXQgdHJhaXRzLiI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9pbmxpbmUtbWVkaWEtY29udHJvbHMu anMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9s cy9pbmxpbmUtbWVkaWEtY29udHJvbHMuanMKaW5kZXggYjFmYTFmMzg4ZjMxMWQwMzRiMmI2Nzk1 NzQ5NDYzMjI1ZjUxMmMzMS4uYWM0ODdhYmNkYmJiZTZhMzM1ZTNlMmEyOGM0NDBhMGEwNThiMDE0 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvY29udHJvbHMvaW5saW5lLW1lZGlhLWNvbnRyb2xzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2lubGluZS1tZWRpYS1jb250 cm9scy5qcwpAQCAtMjUsOCArMjUsNiBAQAogCiBjb25zdCBJbnNpZGVNYXJnaW4gPSA2OyAvLyBN aW5pbXVtIG1hcmdpbiB0byBndWFyYW50ZWUgYXJvdW5kIGFsbCBjb250cm9scywgdGhpcyBjb25z dGFudCBuZWVkcyB0byBzdGF5IGluIHN5bmMgd2l0aCB0aGUgLS1pbmxpbmUtY29udHJvbHMtaW5z aWRlLW1hcmdpbiBDU1MgdmFyaWFibGUuCiBjb25zdCBCb3R0b21Db250cm9sc0JhckhlaWdodCA9 IDMxOyAvLyBUaGlzIGNvbnN0YW50IG5lZWRzIHRvIHN0YXkgaW4gc3luYyB3aXRoIHRoZSAtLWlu bGluZS1jb250cm9scy1iYXItaGVpZ2h0IENTUyB2YXJpYWJsZS4KLWNvbnN0IE1pbmltdW1TaXpl VG9TaG93QW55Q29udHJvbCA9IDQ3OwotY29uc3QgTWF4aW11bVNpemVUb1Nob3dTbWFsbFByb21p bmVudENvbnRyb2wgPSA4ODsKIAogY2xhc3MgSW5saW5lTWVkaWFDb250cm9scyBleHRlbmRzIE1l ZGlhQ29udHJvbHMKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJu LW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2xheW91dC1pdGVtLmpzIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbGF5b3V0LWl0ZW0uanMKaW5k ZXggMjY1N2JjZWMzODJjODM4MmEyNjBiOWFhM2Y2OTAwMDI1ZmE4YmExMi4uMmZlNzllYmUxNDRl NGVmN2VhM2ViZmVhNThlNTY2NWM1ZWJhNjFiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbGF5b3V0LWl0ZW0uanMKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMv bGF5b3V0LWl0ZW0uanMKQEAgLTI3LDcgKzI3LDggQEAgY29uc3QgTGF5b3V0VHJhaXRzID0gewog ICAgIFVua25vd24gICAgICAgIDogMCwKICAgICBtYWNPUyAgICAgICAgICA6IDEgPDwgMCwKICAg ICBpT1MgICAgICAgICAgICA6IDEgPDwgMSwKLSAgICBGdWxsc2NyZWVuICAgICA6IDEgPDwgMgor ICAgIEZ1bGxzY3JlZW4gICAgIDogMSA8PCAyLAorICAgIENvbXBhY3QgICAgICAgIDogMSA8PCAz CiB9OwogCiBjbGFzcyBMYXlvdXRJdGVtIGV4dGVuZHMgTGF5b3V0Tm9kZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvanMtZmlsZXMgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9qcy1maWxlcwppbmRl eCA0NDFjNTg3NGRjZWJmMDgzYzYyZWJlMmE3OGY5MmM3NTcwOGY5M2Q3Li4yZTBiNDdhOGI4NDFl M2FiMTNjNGM2YjQ0Y2JmYjc1M2Y2NTFjOGI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9qcy1maWxlcworKysgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9qcy1maWxlcwpAQCAtMzksNiArMzksNyBA QCBjb250cm9scy9wbGFjYXJkLmpzCiBjb250cm9scy9haXJwbGF5LXBsYWNhcmQuanMKIGNvbnRy b2xzL2ludmFsaWQtcGxhY2FyZC5qcwogY29udHJvbHMvcGlwLXBsYWNhcmQuanMKK2NvbnRyb2xz L2NvbXBhY3QtbWVkaWEtY29udHJvbHMuanMKIG1lZGlhL21lZGlhLWNvbnRyb2xsZXItc3VwcG9y dC5qcwogbWVkaWEvYWlycGxheS1zdXBwb3J0LmpzCiBtZWRpYS9hdWRpby1zdXBwb3J0LmpzCkBA IC02Myw0ICs2NCwzIEBAIG1lZGlhL3ZvbHVtZS1zdXBwb3J0LmpzCiBtZWRpYS92b2x1bWUtdXAt c3VwcG9ydC5qcwogbWVkaWEvbWVkaWEtZG9jdW1lbnQtY29udHJvbGxlci5qcwogbWVkaWEvbWVk aWEtY29udHJvbGxlci5qcwotCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21v ZGVybi1tZWRpYS1jb250cm9scy9tYWluLmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rl cm4tbWVkaWEtY29udHJvbHMvbWFpbi5qcwppbmRleCA4MjNhYzI4OTFhY2U0NjIwMGY5YjU5YTNh YTYxMDkwNDdmYmI3OTM0Li4wOWFjYzk0NTY1ZmFiYTM2NmU3YjgxNzQ0NDgxMDFkZjgwY2RkMDkw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9s cy9tYWluLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL21haW4uanMKQEAgLTI0LDYgKzI0LDggQEAKICAqLwogCiBjb25zdCBTa2lwU2Vjb25kcyA9 IDE1OworY29uc3QgTWluaW11bVNpemVUb1Nob3dBbnlDb250cm9sID0gNDc7Citjb25zdCBNYXhp bXVtU2l6ZVRvU2hvd1NtYWxsUHJvbWluZW50Q29udHJvbCA9IDg4OwogCiBsZXQgbWVkaWFDb250 cm9sc0hvc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL21lZGlhL21lZGlhLWNvbnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9tZWRpYS1jb250cm9sbGVyLmpzCmlu ZGV4IDA5YTI4MDlmMWFmNDg1YzNkNDdmOGI3YTIzNjc5NzdkMGE1ODg1ZTcuLjJhMjNiOTUzMWQz Y2UwZjc0NmM2NGU2M2FjYmI4ZWQyZjQ3MzQzYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL21lZGlhLWNvbnRyb2xsZXIuanMK KysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEv bWVkaWEtY29udHJvbGxlci5qcwpAQCAtOTYsNiArOTYsOSBAQCBjbGFzcyBNZWRpYUNvbnRyb2xs ZXIKIAogICAgIGdldCBsYXlvdXRUcmFpdHMoKQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMuaG9z dCAmJiB0aGlzLmhvc3QuY29tcGFjdE1vZGUpCisgICAgICAgICAgICByZXR1cm4gTGF5b3V0VHJh aXRzLkNvbXBhY3Q7CisKICAgICAgICAgbGV0IHRyYWl0cyA9IHdpbmRvdy5uYXZpZ2F0b3IucGxh dGZvcm0gPT09ICJNYWNJbnRlbCIgPyBMYXlvdXRUcmFpdHMubWFjT1MgOiBMYXlvdXRUcmFpdHMu aU9TOwogICAgICAgICBpZiAodGhpcy5pc0Z1bGxzY3JlZW4pCiAgICAgICAgICAgICByZXR1cm4g dHJhaXRzIHwgTGF5b3V0VHJhaXRzLkZ1bGxzY3JlZW47CkBAIC0xNzgsNiArMTgxLDE0IEBAIGNs YXNzIE1lZGlhQ29udHJvbGxlcgogCiAgICAgLy8gUHJpdmF0ZQogCisgICAgX3N1cHBvcnRpbmdP YmplY3RDbGFzc2VzKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLmxheW91dFRyYWl0cyAmIExh eW91dFRyYWl0cy5Db21wYWN0KQorICAgICAgICAgICAgcmV0dXJuIFtQbGFjYXJkU3VwcG9ydCwg UGxheWJhY2tTdXBwb3J0XTsKKworICAgICAgICByZXR1cm4gW0FpcnBsYXlTdXBwb3J0LCBBdWRp b1N1cHBvcnQsIENvbnRyb2xzVmlzaWJpbGl0eVN1cHBvcnQsIEZ1bGxzY3JlZW5TdXBwb3J0LCBN dXRlU3VwcG9ydCwgUGlQU3VwcG9ydCwgUGxhY2FyZFN1cHBvcnQsIFBsYXliYWNrU3VwcG9ydCwg U2NydWJiaW5nU3VwcG9ydCwgU2Vla0JhY2t3YXJkU3VwcG9ydCwgU2Vla0ZvcndhcmRTdXBwb3J0 LCBTa2lwQmFja1N1cHBvcnQsIFNraXBGb3J3YXJkU3VwcG9ydCwgU3RhcnRTdXBwb3J0LCBTdGF0 dXNTdXBwb3J0LCBUaW1lQ29udHJvbFN1cHBvcnQsIFRyYWNrc1N1cHBvcnQsIFZvbHVtZVN1cHBv cnQsIFZvbHVtZURvd25TdXBwb3J0LCBWb2x1bWVVcFN1cHBvcnRdOworICAgIH0KKwogICAgIF91 cGRhdGVDb250cm9sc0lmTmVlZGVkKCkKICAgICB7CiAgICAgICAgIGNvbnN0IGxheW91dFRyYWl0 cyA9IHRoaXMubGF5b3V0VHJhaXRzOwpAQCAtMTk5LDcgKzIxMCw3IEBAIGNsYXNzIE1lZGlhQ29u dHJvbGxlcgogICAgICAgICB0aGlzLmNvbnRyb2xzID0gbmV3IENvbnRyb2xzQ2xhc3M7CiAgICAg ICAgIHRoaXMuY29udHJvbHMuZGVsZWdhdGUgPSB0aGlzOwogCi0gICAgICAgIGlmICh0aGlzLnNo YWRvd1Jvb3QuaG9zdCAmJiB0aGlzLnNoYWRvd1Jvb3QuaG9zdC5kYXRhc2V0LmF1dG9IaWRlRGVs YXkpCisgICAgICAgIGlmICh0aGlzLmNvbnRyb2xzLmF1dG9IaWRlQ29udHJvbGxlciAmJiB0aGlz LnNoYWRvd1Jvb3QuaG9zdCAmJiB0aGlzLnNoYWRvd1Jvb3QuaG9zdC5kYXRhc2V0LmF1dG9IaWRl RGVsYXkpCiAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLmF1dG9IaWRlQ29udHJvbGxlci5hdXRv SGlkZURlbGF5ID0gdGhpcy5zaGFkb3dSb290Lmhvc3QuZGF0YXNldC5hdXRvSGlkZURlbGF5Owog CiAgICAgICAgIGlmIChwcmV2aW91c0NvbnRyb2xzKSB7CkBAIC0yMTIsOSArMjIzLDcgQEAgY2xh c3MgTWVkaWFDb250cm9sbGVyCiAgICAgICAgIHRoaXMuX3VwZGF0ZVRleHRUcmFja3NDbGFzc0xp c3QoKTsKICAgICAgICAgdGhpcy5fdXBkYXRlQ29udHJvbHNTaXplKCk7CiAKLSAgICAgICAgdGhp cy5fc3VwcG9ydGluZ09iamVjdHMgPSBbQWlycGxheVN1cHBvcnQsIEF1ZGlvU3VwcG9ydCwgQ29u dHJvbHNWaXNpYmlsaXR5U3VwcG9ydCwgRnVsbHNjcmVlblN1cHBvcnQsIE11dGVTdXBwb3J0LCBQ aVBTdXBwb3J0LCBQbGFjYXJkU3VwcG9ydCwgUGxheWJhY2tTdXBwb3J0LCBTY3J1YmJpbmdTdXBw b3J0LCBTZWVrQmFja3dhcmRTdXBwb3J0LCBTZWVrRm9yd2FyZFN1cHBvcnQsIFNraXBCYWNrU3Vw cG9ydCwgU2tpcEZvcndhcmRTdXBwb3J0LCBTdGFydFN1cHBvcnQsIFN0YXR1c1N1cHBvcnQsIFRp bWVDb250cm9sU3VwcG9ydCwgVHJhY2tzU3VwcG9ydCwgVm9sdW1lU3VwcG9ydCwgVm9sdW1lRG93 blN1cHBvcnQsIFZvbHVtZVVwU3VwcG9ydF0ubWFwKFN1cHBvcnRDbGFzcyA9PiB7Ci0gICAgICAg ICAgICByZXR1cm4gbmV3IFN1cHBvcnRDbGFzcyh0aGlzKTsKLSAgICAgICAgfSwgdGhpcyk7Cisg ICAgICAgIHRoaXMuX3N1cHBvcnRpbmdPYmplY3RzID0gdGhpcy5fc3VwcG9ydGluZ09iamVjdENs YXNzZXMoKS5tYXAoU3VwcG9ydENsYXNzID0+IG5ldyBTdXBwb3J0Q2xhc3ModGhpcyksIHRoaXMp OwogCiAgICAgICAgIHRoaXMuY29udHJvbHMuc2hvdWxkVXNlU2luZ2xlQmFyTGF5b3V0ID0gdGhp cy5jb250cm9scyBpbnN0YW5jZW9mIElubGluZU1lZGlhQ29udHJvbHMgJiYgdGhpcy5pc1lvdVR1 YmVFbWJlZFdpdGhUaXRsZTsKIApAQCAtMjc4LDYgKzI4Nyw4IEBAIGNsYXNzIE1lZGlhQ29udHJv bGxlcgogCiAgICAgX2NvbnRyb2xzQ2xhc3NGb3JMYXlvdXRUcmFpdHMobGF5b3V0VHJhaXRzKQog ICAgIHsKKyAgICAgICAgaWYgKGxheW91dFRyYWl0cyAmIExheW91dFRyYWl0cy5Db21wYWN0KQor ICAgICAgICAgICAgcmV0dXJuIENvbXBhY3RNZWRpYUNvbnRyb2xzOwogICAgICAgICBpZiAobGF5 b3V0VHJhaXRzICYgTGF5b3V0VHJhaXRzLmlPUykKICAgICAgICAgICAgIHJldHVybiBJT1NJbmxp bmVNZWRpYUNvbnRyb2xzOwogICAgICAgICBpZiAobGF5b3V0VHJhaXRzICYgTGF5b3V0VHJhaXRz LkZ1bGxzY3JlZW4pCkBAIC0zMDcsNiArMzE4LDEwIEBAIGNsYXNzIE1lZGlhQ29udHJvbGxlcgog CiAgICAgX3Nob3VsZENvbnRyb2xzQmVBdmFpbGFibGUoKQogICAgIHsKKyAgICAgICAgLy8gQ29u dHJvbHMgYXJlIGFsd2F5cyBhdmFpbGFibGUgd2l0aCBjb21wYWN0IGxheW91dC4KKyAgICAgICAg aWYgKHRoaXMubGF5b3V0VHJhaXRzICYgTGF5b3V0VHJhaXRzLkNvbXBhY3QpCisgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKKwogICAgICAgICAvLyBDb250cm9scyBhcmUgYWx3YXlzIGF2YWlsYWJs ZSB3aGlsZSBpbiBmdWxsc2NyZWVuIG9uIG1hY09TLCBhbmQgdGhleSBhcmUgbmV2ZXIgYXZhaWxh YmxlIHdoZW4gaW4gZnVsbHNjcmVlbiBvbiBpT1MuCiAgICAgICAgIGlmICh0aGlzLmlzRnVsbHNj cmVlbikKICAgICAgICAgICAgIHJldHVybiAhISh0aGlzLmxheW91dFRyYWl0cyAmIExheW91dFRy YWl0cy5tYWNPUyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9tZWRpYS9wbGFjYXJkLXN1cHBvcnQuanMgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9wbGFjYXJkLXN1cHBvcnQuanMKaW5k ZXggMmJjNGQyM2M4NjcyNTJhODU2NDNjN2RmMGY3ZGFmZGFmZTdjYWYxMC4uMWY2ODNkZTVmNmI4 OGVjM2ViZDRjZmY2Mzg3NjQ5ODdhMGU4MDczNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvcGxhY2FyZC1zdXBwb3J0LmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL3Bs YWNhcmQtc3VwcG9ydC5qcwpAQCAtMzYsNiArMzYsOSBAQCBjbGFzcyBQbGFjYXJkU3VwcG9ydCBl eHRlbmRzIE1lZGlhQ29udHJvbGxlclN1cHBvcnQKIAogICAgIGdldCBtZWRpYUV2ZW50cygpCiAg ICAgeworICAgICAgICBpZiAodGhpcy5tZWRpYUNvbnRyb2xsZXIubGF5b3V0VHJhaXRzICYgTGF5 b3V0VHJhaXRzLkNvbXBhY3QpCisgICAgICAgICAgICByZXR1cm4gWyJlcnJvciJdOworCiAgICAg ICAgIHJldHVybiBbImxvYWRzdGFydCIsICJlcnJvciIsICJ3ZWJraXRwcmVzZW50YXRpb25tb2Rl Y2hhbmdlZCIsICJ3ZWJraXRjdXJyZW50cGxheWJhY2t0YXJnZXRpc3dpcmVsZXNzY2hhbmdlZCJd OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVk aWEtY29udHJvbHMvbWVkaWEvcGxheWJhY2stc3VwcG9ydC5qcyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21lZGlhL3BsYXliYWNrLXN1cHBvcnQuanMKaW5k ZXggOWUyN2U0M2U1MWRjN2VjZmEyY2YzOWQxNDcyYTQ2ZGY1ODNjNmNlNS4uNGQ4ZDc3NzExZWY1 MWZhNjM0MzhjNzAwZjg5MjQ4OTBlNWVkMTQ0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWVkaWEvcGxheWJhY2stc3VwcG9ydC5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYS9w bGF5YmFjay1zdXBwb3J0LmpzCkBAIC00NSw3ICs0NSwxMyBAQCBjbGFzcyBQbGF5YmFja1N1cHBv cnQgZXh0ZW5kcyBNZWRpYUNvbnRyb2xsZXJTdXBwb3J0CiAKICAgICBzeW5jQ29udHJvbCgpCiAg ICAgewotICAgICAgICB0aGlzLmNvbnRyb2wucGxheWluZyA9ICF0aGlzLm1lZGlhQ29udHJvbGxl ci5tZWRpYS5wYXVzZWQ7CisgICAgICAgIGNvbnN0IGlzUGF1c2VkID0gdGhpcy5tZWRpYUNvbnRy b2xsZXIubWVkaWEucGF1c2VkOworCisgICAgICAgIC8vIFdlIGFsd2F5cyBzaG93IHRoZSBwbGF5 IGJ1dHRvbiB3aGVuIHRoZSBtZWRpYSBpcyBwYXVzZWQgd2l0aCBjb21wYWN0IGxheW91dC4KKyAg ICAgICAgaWYgKHRoaXMubWVkaWFDb250cm9sbGVyLmxheW91dFRyYWl0cyAmIExheW91dFRyYWl0 cy5Db21wYWN0KQorICAgICAgICAgICAgdGhpcy5jb250cm9sLnZpc2libGUgPSBpc1BhdXNlZDsK KyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5jb250cm9sLnBsYXlpbmcgPSAhaXNQYXVz ZWQ7CiAgICAgfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oKaW5kZXggZDE3NWM5MWY3YmIwMGI5ZjI4ZGViNjQ2OGZlNThiN2U4MGYx ZjljOS4uZjA5MWM3MWQ1NjgxMzdjMDc4MDZhZmI3NzdmYWRkN2I3OGE0YzZhOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBi L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtODk5 Niw2ICs4OTk2LDcgQEAKIAkJNzFENkFBQzExREE0RUFGNzAwQjIzOTY5IC8qIHZvbHVtZUAyeC5w bmcgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBpbWFn ZS5wbmc7IHBhdGggPSAidm9sdW1lQDJ4LnBuZyI7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTcxRENCNkZGMTU2ODE5NzYwMDg2MjI3MSAvKiBKU1NWR1pvb21BbmRQYW4uY3BwICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNTVkdab29tQW5kUGFuLmNwcDsgc291 cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNzFEQ0I3MDAxNTY4MTk3NjAwODYyMjcxIC8qIEpT U1ZHWm9vbUFuZFBhbi5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKU1NWR1pv b21BbmRQYW4uaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNzFERTI3OTQyMDNBOUMx QzAwNThDQjUxIC8qIGNvbXBhY3QtbWVkaWEtY29udHJvbHMuanMgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmphdmFzY3JpcHQ7IHBhdGggPSAiY29tcGFjdC1tZWRpYS1jb250cm9scy5qcyI7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTcxRTIxODM4MTczNTlGQjgwMDZFNkU0RCAvKiBQbHVn SW5zUmVzb3VyY2VzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZXhwbGljaXRGaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBmaWxlRW5jb2RpbmcgPSA0OyBwYXRoID0gUGx1Z0luc1Jl c291cmNlcy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3MUUyMTgzOTE3MzU5RkI4 MDA2RTZFNEQgLyogUGx1Z0luc1Jlc291cmNlc0RhdGEuY3BwICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGV4cGxpY2l0RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IGZpbGVFbmNv ZGluZyA9IDQ7IHBhdGggPSBQbHVnSW5zUmVzb3VyY2VzRGF0YS5jcHA7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTcxRTYyM0NFMTUxRjcyQTYwMDM2RTJGNCAvKiBTVkdBbmltYXRlZElu dGVnZXJPcHRpb25hbEludGVnZXIuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gU1ZHQW5pbWF0ZWRJbnRlZ2VyT3B0aW9uYWxJbnRlZ2VyLmNwcDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKQEAgLTE5MDY5LDYgKzE5MDcwLDcgQEAKIAkJCQk3MTZGQTBERDFEQjI2 NTkxMDA3MzIzQ0MgLyogYnV0dG9uLmpzICovLAogCQkJCTcxNkZBMERFMURCMjY1OTEwMDczMjND QyAvKiBidXR0b25zLWNvbnRhaW5lci5jc3MgKi8sCiAJCQkJNzE2RkEwREYxREIyNjU5MTAwNzMy M0NDIC8qIGJ1dHRvbnMtY29udGFpbmVyLmpzICovLAorCQkJCTcxREUyNzk0MjAzQTlDMUMwMDU4 Q0I1MSAvKiBjb21wYWN0LW1lZGlhLWNvbnRyb2xzLmpzICovLAogCQkJCTcxN0Y2MThCMUU0M0Q2 MUEwMEYzNzAyNCAvKiBjb250cm9scy1iYXIuY3NzICovLAogCQkJCTcxMEZBNzRCMURFRTU3NkQw MDRDNzE1RSAvKiBjb250cm9scy1iYXIuanMgKi8sCiAJCQkJNzE2RkEwRTAxREIyNjU5MTAwNzMy M0NDIC8qIGZvcndhcmQtYnV0dG9uLmpzICovLApAQCAtMzA3MTAsNyArMzA3MTIsNyBAQAogCQkJ KTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQkJc2hlbGxQ YXRoID0gL2Jpbi9zaDsKLQkJCXNoZWxsU2NyaXB0ID0gIlNSQ19ESVI9XCIkU1JDUk9PVC9Nb2R1 bGVzL21vZGVybi1tZWRpYS1jb250cm9sc1wiXG5EU1RfRElSPVwiJEJVSUxUX1BST0RVQ1RTX0RJ Ui8kVU5MT0NBTElaRURfUkVTT1VSQ0VTX0ZPTERFUl9QQVRIL21vZGVybi1tZWRpYS1jb250cm9s c1wiXG5cbm1rZGlyIC1wIFwiJERTVF9ESVJcIlxuXG5pZiBbIFwiJHtQTEFURk9STV9OQU1FfVwi ID09IFwibWFjb3N4XCIgXTsgdGhlblxuSU1HX09TX1BSRUZJWD1cIm1hY09TXCJcbmZpXG5cbmlm IFsgXCIke1BMQVRGT1JNX05BTUV9XCIgPT0gXCJpcGhvbmVvc1wiIF0gfHwgWyBcIiR7UExBVEZP Uk1fTkFNRX1cIiA9PSBcImlwaG9uZXNpbXVsYXRvclwiIF07IHRoZW5cbklNR19PU19QUkVGSVg9 XCJpT1NcIlxuZmlcblxuaWYgWyAtbiBcIiRJTUdfT1NfUFJFRklYXCIgXTsgdGhlblxucnN5bmMg LWFxIC0tZXhjbHVkZSBcIi5zdm5cIiAtLWV4Y2x1ZGUgXCIuRFNfU3RvcmVcIiBcIiRTUkNfRElS L2ltYWdlcy8kSU1HX09TX1BSRUZJWC9cIiBcIiREU1RfRElSL2ltYWdlc1wiXG5maVxuXG5jZCBc IiRTUkNfRElSXCJcbmNhdCBjb250cm9scy8qLmNzcyA+IFwiJERTVF9ESVIvbW9kZXJuLW1lZGlh LWNvbnRyb2xzLmNzc1wiXG4gICAgICAgICAgICAgY2F0IGBjYXQganMtZmlsZXNgID4gXCIkRFNU X0RJUi9tb2Rlcm4tbWVkaWEtY29udHJvbHMuanNcIlxuIjsKKwkJCXNoZWxsU2NyaXB0ID0gIlNS Q19ESVI9XCIkU1JDUk9PVC9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9sc1wiXG5EU1RfRElS PVwiJEJVSUxUX1BST0RVQ1RTX0RJUi8kVU5MT0NBTElaRURfUkVTT1VSQ0VTX0ZPTERFUl9QQVRI L21vZGVybi1tZWRpYS1jb250cm9sc1wiXG5cbm1rZGlyIC1wIFwiJERTVF9ESVJcIlxuXG5pZiBb IFwiJHtQTEFURk9STV9OQU1FfVwiID09IFwibWFjb3N4XCIgXTsgdGhlblxuICAgIElNR19PU19Q UkVGSVg9XCJtYWNPU1wiXG5lbHNlXG4gICAgSU1HX09TX1BSRUZJWD1cImlPU1wiXG5maVxuXG5p ZiBbIC1uIFwiJElNR19PU19QUkVGSVhcIiBdOyB0aGVuXG5yc3luYyAtYXEgLS1leGNsdWRlIFwi LnN2blwiIC0tZXhjbHVkZSBcIi5EU19TdG9yZVwiIFwiJFNSQ19ESVIvaW1hZ2VzLyRJTUdfT1Nf UFJFRklYL1wiIFwiJERTVF9ESVIvaW1hZ2VzXCJcbmZpXG5cbmNkIFwiJFNSQ19ESVJcIlxuY2F0 IGNvbnRyb2xzLyouY3NzID4gXCIkRFNUX0RJUi9tb2Rlcm4tbWVkaWEtY29udHJvbHMuY3NzXCJc biAgICAgICAgICAgICBjYXQgYGNhdCBqcy1maWxlc2AgPiBcIiREU1RfRElSL21vZGVybi1tZWRp YS1jb250cm9scy5qc1wiXG4iOwogCQl9OwogCQlBNUU3OUNFQzFFNjdGMkNGMDBGQjgxNTMgLyog TWFrZSBGcmFtZXdvcmtzIFN5bWJvbGljIExpbmsgKi8gPSB7CiAJCQlpc2EgPSBQQlhTaGVsbFNj cmlwdEJ1aWxkUGhhc2U7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMDNhOWRiNmEyYzU0MTQ5ZTYxNjFiZjk0NGIwYjJkNTFh YmJhMzFmMi4uMWU2MjA0Nzk5ZDdmNDdhZTE5MDMwNTM4MzBiY2JmMTA2ODg1OTEwNiAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE4IEBACisyMDE4LTAyLTE5ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBs ZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBDb250cm9sc10gSW1wbGVtZW50IGEgY29t cGFjdCBzZXQgb2YgbWVkaWEgY29udHJvbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4MjkzNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzc2ODIy NTc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IG5ldyB0ZXN0cyB0aGF0IGNvdmVyIHRoZSBiYXNpYyBwcm9wZXJ0aWVzIGFuZCBsYXlvdXQgdW5k ZXIgZGlmZmVyZW50IHNpdHVhdGlvbnMgb2YgdGhlIG5ldyBDb21wYWN0TWVkaWFDb250cm9scy4K KworICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9jb21wYWN0LW1lZGlhLWNv bnRyb2xzL2NvbXBhY3QtbWVkaWEtY29udHJvbHMtY29uc3RydWN0b3ItZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29tcGFjdC1tZWRp YS1jb250cm9scy9jb21wYWN0LW1lZGlhLWNvbnRyb2xzLWNvbnN0cnVjdG9yLmh0bWw6IEFkZGVk LgorICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9jb21wYWN0LW1lZGlhLWNv bnRyb2xzL2NvbXBhY3QtbWVkaWEtY29udHJvbHMtbGF5b3V0LWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbXBhY3QtbWVkaWEtY29u dHJvbHMvY29tcGFjdC1tZWRpYS1jb250cm9scy1sYXlvdXQuaHRtbDogQWRkZWQuCisKIDIwMTgt MDItMTkgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgTWFy ayBtZWRpYS90cmFjay90cmFjay1jc3MtbWF0Y2hpbmctZGVmYXVsdC5odG1sIGFzIGZsYWt5Lgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbXBh Y3QtbWVkaWEtY29udHJvbHMvY29tcGFjdC1tZWRpYS1jb250cm9scy1jb25zdHJ1Y3Rvci1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29tcGFj dC1tZWRpYS1jb250cm9scy9jb21wYWN0LW1lZGlhLWNvbnRyb2xzLWNvbnN0cnVjdG9yLWV4cGVj dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi4yNTM0MGZjODczYTZiYjIxYTRjMjI5N2E1YzljOGFmODdjMmM3 MWViCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL2NvbXBhY3QtbWVkaWEtY29udHJvbHMvY29tcGFjdC1tZWRpYS1jb250cm9scy1jb25z dHJ1Y3Rvci1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNCBAQAorVGVzdGluZyB0aGUgQ29tcGFj dE1lZGlhQ29udHJvbHMgY29uc3RydWN0b3IuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBh IHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4K KworCitQQVNTIG1lZGlhQ29udHJvbHMuZWxlbWVudC5sb2NhbE5hbWUgaXMgImRpdiIKK1BBU1Mg bWVkaWFDb250cm9scy5lbGVtZW50LmNsYXNzTmFtZSBpcyAibWVkaWEtY29udHJvbHMiCitQQVNT IG1lZGlhQ29udHJvbHMubGF5b3V0VHJhaXRzIGlzIExheW91dFRyYWl0cy5Db21wYWN0CitQQVNT IG1lZGlhQ29udHJvbHMucGxhY2FyZCBpcyBudWxsCisKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2Vk IGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRp YS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29tcGFjdC1tZWRpYS1jb250cm9scy9jb21wYWN0LW1l ZGlhLWNvbnRyb2xzLWNvbnN0cnVjdG9yLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4t bWVkaWEtY29udHJvbHMvY29tcGFjdC1tZWRpYS1jb250cm9scy9jb21wYWN0LW1lZGlhLWNvbnRy b2xzLWNvbnN0cnVjdG9yLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMjEzZjIyMTI0NGYzNjg2ODBhY2I5Nzli YmViZTZmNmE3OGNiMjEwZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21v ZGVybi1tZWRpYS1jb250cm9scy9jb21wYWN0LW1lZGlhLWNvbnRyb2xzL2NvbXBhY3QtbWVkaWEt Y29udHJvbHMtY29uc3RydWN0b3IuaHRtbApAQCAtMCwwICsxLDE4IEBACis8c2NyaXB0IHNyYz0i Li4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3Jj PSIuLi9yZXNvdXJjZXMvbWVkaWEtY29udHJvbHMtbG9hZGVyLmpzIiB0eXBlPSJ0ZXh0L2phdmFz Y3JpcHQiPjwvc2NyaXB0PgorPGJvZHk+Cis8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+ CisKK2Rlc2NyaXB0aW9uKCJUZXN0aW5nIHRoZSA8Y29kZT5Db21wYWN0TWVkaWFDb250cm9sczwv Y29kZT4gY29uc3RydWN0b3IuIik7CisKK2NvbnN0IG1lZGlhQ29udHJvbHMgPSBuZXcgQ29tcGFj dE1lZGlhQ29udHJvbHM7CisKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygibWVkaWFDb250cm9scy5l bGVtZW50LmxvY2FsTmFtZSIsICJkaXYiKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygibWVkaWFD b250cm9scy5lbGVtZW50LmNsYXNzTmFtZSIsICJtZWRpYS1jb250cm9scyIpOworc2hvdWxkQmUo Im1lZGlhQ29udHJvbHMubGF5b3V0VHJhaXRzIiwgIkxheW91dFRyYWl0cy5Db21wYWN0Iik7Citz aG91bGRCZU51bGwoIm1lZGlhQ29udHJvbHMucGxhY2FyZCIpOworZGVidWcoIiIpOworCis8L3Nj cmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48 L3NjcmlwdD4KKzwvYm9keT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1t ZWRpYS1jb250cm9scy9jb21wYWN0LW1lZGlhLWNvbnRyb2xzL2NvbXBhY3QtbWVkaWEtY29udHJv bHMtbGF5b3V0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1j b250cm9scy9jb21wYWN0LW1lZGlhLWNvbnRyb2xzL2NvbXBhY3QtbWVkaWEtY29udHJvbHMtbGF5 b3V0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zY2FkZTFhNWJkM2NhY2NhYWI5NmUzZjJlNzIx MzEwODNlZWFjMjA0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJu LW1lZGlhLWNvbnRyb2xzL2NvbXBhY3QtbWVkaWEtY29udHJvbHMvY29tcGFjdC1tZWRpYS1jb250 cm9scy1sYXlvdXQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjUgQEAKK1Rlc3RpbmcgdGhlIENv bXBhY3RNZWRpYUNvbnRyb2xzIGxheW91dC4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEg c2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgor CisKK1dpdGggY29udHJvbHMgYXQgdGhlaXIgZGVmYXVsdCBzaXplIG9ubHkgdGhlIHBsYXkvcGF1 c2UgYnV0dG9uIGlzIHNob3dpbmcgd2l0aCBhIGNlbnRlciBzdHlsZS4KK1BBU1MgbWVkaWFDb250 cm9scy5jaGlsZHJlbiBpcyBbbWVkaWFDb250cm9scy5wbGF5UGF1c2VCdXR0b25dCitQQVNTIG1l ZGlhQ29udHJvbHMucGxheVBhdXNlQnV0dG9uLnN0eWxlIGlzIEJ1dHRvbi5TdHlsZXMuQ2VudGVy CisKK1dpdGggY29udHJvbHMganVzdCB1bmRlciB0aGUgbWluaW11bSBzaXplIHRvIHNob3cgcHJv bWluZW50IGNvbnRyb2xzIG9ubHkgdGhlIHBsYXkvcGF1c2UgYnV0dG9uIGlzIHNob3dpbmcgd2l0 aCBhIHNtYWxsLWNlbnRlciBzdHlsZS4KK1BBU1MgbWVkaWFDb250cm9scy5jaGlsZHJlbiBpcyBb bWVkaWFDb250cm9scy5wbGF5UGF1c2VCdXR0b25dCitQQVNTIG1lZGlhQ29udHJvbHMucGxheVBh dXNlQnV0dG9uLnN0eWxlIGlzIEJ1dHRvbi5TdHlsZXMuU21hbGxDZW50ZXIKKworV2l0aCBjb250 cm9scyBqdXN0IHVuZGVyIHRoZSBtaW5pbXVtIHNpemUgdG8gc2hvdyBhbnkgY29udHJvbHMgdGhl cmUgYXJlIG5vIGNoaWxkcmVuLgorUEFTUyBtZWRpYUNvbnRyb2xzLmNoaWxkcmVuLmxlbmd0aCBp cyAwCisKK1dpdGggY29udHJvbHMgYWJvdmUgdGhlIG1pbmltdW0gc2l6ZSBhbmQgdGhlIGVycm9y IHBsYWNhcmQgc2V0IG9ubHkgdGhlIGludmFsaWQgcGxhY2FyZCBpcyBzaG93bi4KK1BBU1MgbWVk aWFDb250cm9scy5jaGlsZHJlbiBpcyBbbWVkaWFDb250cm9scy5pbnZhbGlkUGxhY2FyZF0KK1BB U1MgbWVkaWFDb250cm9scy5pbnZhbGlkUGxhY2FyZC53aWR0aCBpcyBtZWRpYUNvbnRyb2xzLndp ZHRoCitQQVNTIG1lZGlhQ29udHJvbHMuaW52YWxpZFBsYWNhcmQuaGVpZ2h0IGlzIG1lZGlhQ29u dHJvbHMuaGVpZ2h0CisKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBD T01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvY29tcGFjdC1tZWRpYS1jb250cm9scy9jb21wYWN0LW1lZGlhLWNvbnRyb2xzLWxheW91 dC5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbXBhY3Qt bWVkaWEtY29udHJvbHMvY29tcGFjdC1tZWRpYS1jb250cm9scy1sYXlvdXQuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4wNGI1ZjVhYTk3OTc3MWRjZWUwNDIxZDYyOTFmYWI1OWZlZmI3NzNhCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbXBhY3Qt bWVkaWEtY29udHJvbHMvY29tcGFjdC1tZWRpYS1jb250cm9scy1sYXlvdXQuaHRtbApAQCAtMCww ICsxLDQwIEBACis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpz Ij48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvbWVkaWEtY29udHJvbHMtbG9h ZGVyLmpzIiB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4u L3Jlc291cmNlcy9tZWRpYS1jb250cm9scy11dGlscy5qcyIgdHlwZT0idGV4dC9qYXZhc2NyaXB0 Ij48L3NjcmlwdD4KKzxib2R5PgorPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorCitk ZXNjcmlwdGlvbigiVGVzdGluZyB0aGUgPGNvZGU+Q29tcGFjdE1lZGlhQ29udHJvbHM8L2NvZGU+ IGxheW91dC4iKTsKKworY29uc3QgbWVkaWFDb250cm9scyA9IG5ldyBDb21wYWN0TWVkaWFDb250 cm9sczsKKworZGVidWcoIldpdGggY29udHJvbHMgYXQgdGhlaXIgZGVmYXVsdCBzaXplIG9ubHkg dGhlIHBsYXkvcGF1c2UgYnV0dG9uIGlzIHNob3dpbmcgd2l0aCBhIGNlbnRlciBzdHlsZS4iKTsK K3Nob3VsZEJlKCJtZWRpYUNvbnRyb2xzLmNoaWxkcmVuIiwgIlttZWRpYUNvbnRyb2xzLnBsYXlQ YXVzZUJ1dHRvbl0iKTsKK3Nob3VsZEJlKCJtZWRpYUNvbnRyb2xzLnBsYXlQYXVzZUJ1dHRvbi5z dHlsZSIsICJCdXR0b24uU3R5bGVzLkNlbnRlciIpOworZGVidWcoIiIpOworCitkZWJ1ZygiV2l0 aCBjb250cm9scyBqdXN0IHVuZGVyIHRoZSBtaW5pbXVtIHNpemUgdG8gc2hvdyBwcm9taW5lbnQg Y29udHJvbHMgb25seSB0aGUgcGxheS9wYXVzZSBidXR0b24gaXMgc2hvd2luZyB3aXRoIGEgc21h bGwtY2VudGVyIHN0eWxlLiIpOworbWVkaWFDb250cm9scy53aWR0aCA9IE1heGltdW1TaXplVG9T aG93U21hbGxQcm9taW5lbnRDb250cm9sIC0gMTsKK21lZGlhQ29udHJvbHMuaGVpZ2h0ID0gTWF4 aW11bVNpemVUb1Nob3dTbWFsbFByb21pbmVudENvbnRyb2wgLSAxOworc2hvdWxkQmUoIm1lZGlh Q29udHJvbHMuY2hpbGRyZW4iLCAiW21lZGlhQ29udHJvbHMucGxheVBhdXNlQnV0dG9uXSIpOwor c2hvdWxkQmUoIm1lZGlhQ29udHJvbHMucGxheVBhdXNlQnV0dG9uLnN0eWxlIiwgIkJ1dHRvbi5T dHlsZXMuU21hbGxDZW50ZXIiKTsKK2RlYnVnKCIiKTsKKworZGVidWcoIldpdGggY29udHJvbHMg anVzdCB1bmRlciB0aGUgbWluaW11bSBzaXplIHRvIHNob3cgYW55IGNvbnRyb2xzIHRoZXJlIGFy ZSBubyBjaGlsZHJlbi4iKTsKK21lZGlhQ29udHJvbHMud2lkdGggPSBNaW5pbXVtU2l6ZVRvU2hv d0FueUNvbnRyb2wgLSAxOworbWVkaWFDb250cm9scy5oZWlnaHQgPSBNaW5pbXVtU2l6ZVRvU2hv d0FueUNvbnRyb2wgLSAxOworc2hvdWxkQmUoIm1lZGlhQ29udHJvbHMuY2hpbGRyZW4ubGVuZ3Ro IiwgIjAiKTsKK2RlYnVnKCIiKTsKKworZGVidWcoIldpdGggY29udHJvbHMgYWJvdmUgdGhlIG1p bmltdW0gc2l6ZSBhbmQgdGhlIGVycm9yIHBsYWNhcmQgc2V0IG9ubHkgdGhlIGludmFsaWQgcGxh Y2FyZCBpcyBzaG93bi4iKTsKK21lZGlhQ29udHJvbHMud2lkdGggPSBNYXhpbXVtU2l6ZVRvU2hv d1NtYWxsUHJvbWluZW50Q29udHJvbDsKK21lZGlhQ29udHJvbHMuaGVpZ2h0ID0gTWF4aW11bVNp emVUb1Nob3dTbWFsbFByb21pbmVudENvbnRyb2w7CittZWRpYUNvbnRyb2xzLnBsYWNhcmQgPSBt ZWRpYUNvbnRyb2xzLmludmFsaWRQbGFjYXJkOworc2hvdWxkQmUoIm1lZGlhQ29udHJvbHMuY2hp bGRyZW4iLCAiW21lZGlhQ29udHJvbHMuaW52YWxpZFBsYWNhcmRdIik7CitzaG91bGRCZSgibWVk aWFDb250cm9scy5pbnZhbGlkUGxhY2FyZC53aWR0aCIsICJtZWRpYUNvbnRyb2xzLndpZHRoIik7 CitzaG91bGRCZSgibWVkaWFDb250cm9scy5pbnZhbGlkUGxhY2FyZC5oZWlnaHQiLCAibWVkaWFD b250cm9scy5oZWlnaHQiKTsKK2RlYnVnKCIiKTsKKworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0i Li4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cg==