168918 2017-02-27 11:03:03 -0800 [Modern Media Controls] Status text does not appear on iOS 2017-02-27 11:57:05 -0800 1 1 1 Unclassified WebKit Media WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts commit-queue webkit-bug-importer oldest_to_newest 1281441 0 graouts 2017-02-27 11:03:03 -0800 We are not showing the status text when set on iOS. 1281443 1 webkit-bug-importer 2017-02-27 11:03:31 -0800 <rdar://problem/30737644> 1281444 2 302853 graouts 2017-02-27 11:05:33 -0800 Created attachment 302853 Patch 1281446 3 302853 dino 2017-02-27 11:11:39 -0800 Comment on attachment 302853 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=302853&action=review > Source/WebCore/ChangeLog:11 > + both the macOS and iOS inline media controls run the exact same layout "exact same" -> "same" > Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js:87 > + children.unshift(this._backgroundTint); This line might warrant a comment. 1281450 4 302855 graouts 2017-02-27 11:17:09 -0800 Created attachment 302855 Patch for landing 1281466 5 302855 commit-queue 2017-02-27 11:57:01 -0800 Comment on attachment 302855 Patch for landing Clearing flags on attachment: 302855 Committed r213084: <http://trac.webkit.org/changeset/213084> 1281467 6 commit-queue 2017-02-27 11:57:05 -0800 All reviewed patches have been landed. Closing bug. 302853 2017-02-27 11:05:33 -0800 2017-02-27 11:17:05 -0800 Patch bug-168918-20170227110238.patch text/plain 17937 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzMDU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjA0ZTk1MWZlZmE0ZGIz YjMwYTJmMmQ2N2E5ZGY2NmZmYjk2Y2M2Mi4uMTk2MTVlOTU5MmI3YzBhMjViY2VmYzFmYjZiZDY0 NGU3ZTZhYTk2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE3LTAyLTI3ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gU3RhdHVzIHRleHQgZG9lcyBub3QgYXBwZWFyIG9uIGlPUworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4OTE4CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8zMDczNzY0ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBXZSByZWZhY3RvciB0aGUgbGF5b3V0IGNvZGUgb3V0IG9mIE1hY09TSW5s aW5lTWVkaWFDb250cm9scyBhbmQgaW50byBhIG5ldworICAgICAgICBJbmxpbmVMYXlvdXRTdXBw b3J0IGNsYXNzIHdoaWNoIElPU0lubGluZU1lZGlhQ29udHJvbHMgdXNlcyBhcyB3ZWxsLiBOb3cK KyAgICAgICAgYm90aCB0aGUgbWFjT1MgYW5kIGlPUyBpbmxpbmUgbWVkaWEgY29udHJvbHMgcnVu IHRoZSBleGFjdCBzYW1lIGxheW91dAorICAgICAgICBsb2dpYyB0byBjb250cm9sIHdoZXRoZXIg dGhlIHN0YXR1cyBsYWJlbCBvciBzY3J1YmJlciBzaG91bGQgYmUgZGlzcGxheWVkLAorICAgICAg ICBhbmQgd2hpY2ggY29udHJvbHMgc2hvdWxkIGJlIGRyb3BwZWQgZHVlIHRvIHNwYWNlIGNvbnN0 cmFpbnRzLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9pb3Mt aW5saW5lLW1lZGlhLWNvbnRyb2xzL2lvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMtc3RhdHVzLWxh YmVsLmh0bWwKKworICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRy b2xzL2lubGluZS1sYXlvdXQtc3VwcG9ydC5qczogQWRkZWQuCisgICAgICAgIChJbmxpbmVMYXlv dXRTdXBwb3J0KToKKyAgICAgICAgKElubGluZUxheW91dFN1cHBvcnQucHJvdG90eXBlLmNoaWxk cmVuQWZ0ZXJQZXJmb3JtaW5nTGF5b3V0KToKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRp YS1jb250cm9scy9jb250cm9scy9pb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzLmpzOgorICAgICAg ICAoSU9TSW5saW5lTWVkaWFDb250cm9scy5wcm90b3R5cGUubGF5b3V0KToKKyAgICAgICAgKElP U0lubGluZU1lZGlhQ29udHJvbHMpOgorICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL2NvbnRyb2xzL21hY29zLWlubGluZS1tZWRpYS1jb250cm9scy5qczoKKyAgICAgICAg KE1hY09TSW5saW5lTWVkaWFDb250cm9scy5wcm90b3R5cGUubGF5b3V0KToKKyAgICAgICAgKiBN b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9qcy1maWxlczoKKworMjAxNy0wMi0yNyAgQW50 b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgorCiAgICAgICAgIFtNb2Rlcm4gTWVkaWEg Q29udHJvbHNdIERyYWdnaW5nIGNvbnRyb2xzIGluIGZ1bGxzY3JlZW4gb24gbWFjT1MgcHJldmVu dHMgc2NydWJiaW5nIG9yIGludGVyYWN0aW5nIHdpdGggY29udHJvbHMKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODgyMAogICAgICAgICA8cmRhcjov L3Byb2JsZW0vMzA2OTAyODE+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21v ZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9pbmxpbmUtbGF5b3V0LXN1cHBvcnQuanMgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9pbmxp bmUtbGF5b3V0LXN1cHBvcnQuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDY5MTA1YzU3Njk2MzM2NTM5YTA1OTY0 MWEwY2Q4ZGI2ZjNmYTE5YwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2lubGluZS1sYXlvdXQtc3VwcG9ydC5q cwpAQCAtMCwwICsxLDk2IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE3IEFwcGxlIEluYy4g QWxsIFJpZ2h0cyBSZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICog YXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFp biB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMg aW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAg bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHBy b3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBS T1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJUycnIEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1Q TElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJ TVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBB UlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBB UFBMRSBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJ TkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVO VElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFBST0NVUkVN RU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBP UgorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBB TkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBT VFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RI RVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CisgKi8KKworY2xhc3MgSW5saW5lTGF5b3V0U3VwcG9ydAoreworCisgICAgY29uc3RydWN0b3Io Y29udHJvbHMsIGRyb3BwYWJsZUNvbnRyb2xzKQorICAgIHsKKyAgICAgICAgdGhpcy5fY29udHJv bHMgPSBjb250cm9sczsKKyAgICAgICAgdGhpcy5fZHJvcHBhYmxlQ29udHJvbHMgPSBkcm9wcGFi bGVDb250cm9sczsKKyAgICB9CisKKyAgICAvLyBQdWJsaWMKKworICAgIGNoaWxkcmVuQWZ0ZXJQ ZXJmb3JtaW5nTGF5b3V0KCkKKyAgICB7CisgICAgICAgIGNvbnN0IGNvbnRyb2xzID0gdGhpcy5f Y29udHJvbHM7CisKKyAgICAgICAgLy8gUmVzZXQgZHJvcHBlZCBidXR0b25zLgorICAgICAgICBj b250cm9scy5yaWdodENvbnRhaW5lci5idXR0b25zLmNvbmNhdChjb250cm9scy5sZWZ0Q29udGFp bmVyLmJ1dHRvbnMpLmZvckVhY2goYnV0dG9uID0+IGRlbGV0ZSBidXR0b24uZHJvcHBlZCk7CisK KyAgICAgICAgY29udHJvbHMubGVmdENvbnRhaW5lci5sYXlvdXQoKTsKKyAgICAgICAgY29udHJv bHMucmlnaHRDb250YWluZXIubGF5b3V0KCk7CisKKyAgICAgICAgbGV0IHNob3VsZFNob3dUaW1l Q29udHJvbCA9ICFjb250cm9scy5zdGF0dXNMYWJlbC5lbmFibGVkOworCisgICAgICAgIGlmIChz aG91bGRTaG93VGltZUNvbnRyb2wpCisgICAgICAgICAgICBjb250cm9scy50aW1lQ29udHJvbC53 aWR0aCA9IGNvbnRyb2xzLndpZHRoIC0gY29udHJvbHMubGVmdENvbnRhaW5lci53aWR0aCAtIGNv bnRyb2xzLnJpZ2h0Q29udGFpbmVyLndpZHRoOworCisgICAgICAgIGlmIChzaG91bGRTaG93VGlt ZUNvbnRyb2wgJiYgY29udHJvbHMudGltZUNvbnRyb2wuaXNTdWZmaWNpZW50bHlXaWRlKQorICAg ICAgICAgICAgY29udHJvbHMudGltZUNvbnRyb2wueCA9IGNvbnRyb2xzLmxlZnRDb250YWluZXIu d2lkdGg7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgbGV0IGRyb3BwZWRDb250cm9scyA9 IGZhbHNlOworICAgICAgICAgICAgc2hvdWxkU2hvd1RpbWVDb250cm9sID0gZmFsc2U7CisKKyAg ICAgICAgICAgIC8vIFNpbmNlIHdlIGRvbid0IGhhdmUgZW5vdWdoIHNwYWNlIHRvIGRpc3BsYXkg dGhlIHNjcnViYmVyLCB3ZSBtYXkgYWxzbyBub3QgaGF2ZQorICAgICAgICAgICAgLy8gZW5vdWdo IHNwYWNlIHRvIGRpc3BsYXkgYWxsIGJ1dHRvbnMgaW4gdGhlIGxlZnQgYW5kIHJpZ2h0IGNvbnRh aW5lcnMsIHNvIGdyYWR1YWxseSBkcm9wIHRoZW0uCisgICAgICAgICAgICBmb3IgKGxldCBidXR0 b24gb2YgdGhpcy5fZHJvcHBhYmxlQ29udHJvbHMpIHsKKyAgICAgICAgICAgICAgICAvLyBOb3Ro aW5nIGxlZnQgdG8gZG8gaWYgdGhlIGNvbWJpbmVkIGNvbnRhaW5lciB3aWR0aHMgaXMgc2hvcnRl ciB0aGFuIHRoZSBhdmFpbGFibGUgd2lkdGguCisgICAgICAgICAgICAgICAgaWYgKGNvbnRyb2xz LmxlZnRDb250YWluZXIud2lkdGggKyBjb250cm9scy5yaWdodENvbnRhaW5lci53aWR0aCA8IGNv bnRyb2xzLndpZHRoKQorICAgICAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAg ICAgIGRyb3BwZWRDb250cm9scyA9IHRydWU7CisKKyAgICAgICAgICAgICAgICAvLyBJZiB0aGUg YnV0dG9uIHdhcyBhbHJlYWR5IG5vdCBwYXJ0aWNpcGF0aW5nIGluIGxheW91dCwgd2UgY2FuIHNr aXAgaXQuCisgICAgICAgICAgICAgICAgaWYgKCFidXR0b24udmlzaWJsZSkKKyAgICAgICAgICAg ICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgICAgICAvLyBUaGlzIGJ1dHRvbiBtdXN0 IG5vdyBiZSBkcm9wcGVkLgorICAgICAgICAgICAgICAgIGJ1dHRvbi5kcm9wcGVkID0gdHJ1ZTsK KworICAgICAgICAgICAgICAgIGNvbnRyb2xzLmxlZnRDb250YWluZXIubGF5b3V0KCk7CisgICAg ICAgICAgICAgICAgY29udHJvbHMucmlnaHRDb250YWluZXIubGF5b3V0KCk7CisgICAgICAgICAg ICB9CisKKyAgICAgICAgICAgIC8vIFdlIGRpZG4ndCBuZWVkIHRvIGRyb3AgY29udHJvbHMgYW5k IHdlIGhhdmUgc3RhdHVzIHRleHQgdG8gc2hvdy4KKyAgICAgICAgICAgIGlmICghZHJvcHBlZENv bnRyb2xzICYmIGNvbnRyb2xzLnN0YXR1c0xhYmVsLmVuYWJsZWQpIHsKKyAgICAgICAgICAgICAg ICBjb250cm9scy5zdGF0dXNMYWJlbC54ID0gY29udHJvbHMubGVmdENvbnRhaW5lci53aWR0aDsK KyAgICAgICAgICAgICAgICBjb250cm9scy5zdGF0dXNMYWJlbC53aWR0aCA9IGNvbnRyb2xzLndp ZHRoIC0gY29udHJvbHMubGVmdENvbnRhaW5lci53aWR0aCAtIGNvbnRyb2xzLnJpZ2h0Q29udGFp bmVyLndpZHRoOworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgY29udHJvbHMu cmlnaHRDb250YWluZXIueCA9IGNvbnRyb2xzLndpZHRoIC0gY29udHJvbHMucmlnaHRDb250YWlu ZXIud2lkdGg7CisKKyAgICAgICAgY29uc3QgY2hpbGRyZW4gPSBbY29udHJvbHMubGVmdENvbnRh aW5lcl07CisgICAgICAgIGlmIChzaG91bGRTaG93VGltZUNvbnRyb2wpCisgICAgICAgICAgICBj aGlsZHJlbi5wdXNoKGNvbnRyb2xzLnRpbWVDb250cm9sKTsKKyAgICAgICAgZWxzZSBpZiAoY29u dHJvbHMuc3RhdHVzTGFiZWwuZW5hYmxlZCkKKyAgICAgICAgICAgIGNoaWxkcmVuLnB1c2goY29u dHJvbHMuc3RhdHVzTGFiZWwpOworICAgICAgICBjaGlsZHJlbi5wdXNoKGNvbnRyb2xzLnJpZ2h0 Q29udGFpbmVyKTsKKyAgICAgICAgcmV0dXJuIGNoaWxkcmVuOworICAgIH0KKworfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJv bHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2lvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMu anMKaW5kZXggOTYzZTIyYjAxMjBjZWEzNDhkYjY3YmUzOWVhMTdmNjQ3YzYzZjQ4Mi4uZWIyNmNh Nzg4OGZlNGY0NmMxNGQ5M2JjOTE3Njk4MjVkY2M3NGVkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvaW9zLWlubGluZS1t ZWRpYS1jb250cm9scy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRp YS1jb250cm9scy9jb250cm9scy9pb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzLmpzCkBAIC0zMiwy MCArMzIsMjIgQEAgY2xhc3MgSU9TSW5saW5lTWVkaWFDb250cm9scyBleHRlbmRzIE1lZGlhQ29u dHJvbHMKIAogICAgICAgICBzdXBlcihvcHRpb25zKTsKIAorICAgICAgICB0aGlzLl9pbmxpbmVM YXlvdXRTdXBwb3J0ID0gbmV3IElubGluZUxheW91dFN1cHBvcnQodGhpcywgW3RoaXMuYWlycGxh eUJ1dHRvbiwgdGhpcy5waXBCdXR0b24sIHRoaXMuc2tpcEJhY2tCdXR0b24sIHRoaXMuZnVsbHNj cmVlbkJ1dHRvbl0pOworCiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJpb3Mi KTsKICAgICAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImlubGluZSIpOwogCi0gICAg ICAgIHRoaXMuX2xlZnRDb250YWluZXIgPSBuZXcgQnV0dG9uc0NvbnRhaW5lcih7CisgICAgICAg IHRoaXMubGVmdENvbnRhaW5lciA9IG5ldyBCdXR0b25zQ29udGFpbmVyKHsKICAgICAgICAgICAg IGJ1dHRvbnM6IFt0aGlzLnBsYXlQYXVzZUJ1dHRvbiwgdGhpcy5za2lwQmFja0J1dHRvbl0sCiAg ICAgICAgICAgICBjc3NDbGFzc05hbWU6ICJsZWZ0IgogICAgICAgICB9KTsKIAotICAgICAgICB0 aGlzLl9yaWdodENvbnRhaW5lciA9IG5ldyBCdXR0b25zQ29udGFpbmVyKHsKKyAgICAgICAgdGhp cy5yaWdodENvbnRhaW5lciA9IG5ldyBCdXR0b25zQ29udGFpbmVyKHsKICAgICAgICAgICAgIGJ1 dHRvbnM6IFt0aGlzLmFpcnBsYXlCdXR0b24sIHRoaXMucGlwQnV0dG9uLCB0aGlzLmZ1bGxzY3Jl ZW5CdXR0b25dLAogICAgICAgICAgICAgY3NzQ2xhc3NOYW1lOiAicmlnaHQiCiAgICAgICAgIH0p OwogCi0gICAgICAgIHRoaXMuY29udHJvbHNCYXIuY2hpbGRyZW4gPSBbdGhpcy5fbGVmdENvbnRh aW5lciwgdGhpcy5fcmlnaHRDb250YWluZXJdOworICAgICAgICB0aGlzLmNvbnRyb2xzQmFyLmNo aWxkcmVuID0gW3RoaXMubGVmdENvbnRhaW5lciwgdGhpcy5yaWdodENvbnRhaW5lcl07CiAKICAg ICAgICAgdGhpcy5fcGluY2hHZXN0dXJlUmVjb2duaXplciA9IG5ldyBQaW5jaEdlc3R1cmVSZWNv Z25pemVyKHRoaXMuZWxlbWVudCwgdGhpcyk7CiAgICAgfQpAQCAtNzAsMzggKzcyLDggQEAgY2xh c3MgSU9TSW5saW5lTWVkaWFDb250cm9scyBleHRlbmRzIE1lZGlhQ29udHJvbHMKICAgICB7CiAg ICAgICAgIHN1cGVyLmxheW91dCgpOwogCi0gICAgICAgIC8vIFJlc2V0IGRyb3BwZWQgYnV0dG9u cy4KLSAgICAgICAgZm9yIChsZXQgYnV0dG9uIG9mIHRoaXMuX3JpZ2h0Q29udGFpbmVyLmJ1dHRv bnMpCi0gICAgICAgICAgICBkZWxldGUgYnV0dG9uLmRyb3BwZWQ7Ci0KLSAgICAgICAgdGhpcy5f bGVmdENvbnRhaW5lci5sYXlvdXQoKTsKLSAgICAgICAgdGhpcy5fcmlnaHRDb250YWluZXIubGF5 b3V0KCk7Ci0KLSAgICAgICAgdGhpcy50aW1lQ29udHJvbC53aWR0aCA9IHRoaXMud2lkdGggLSB0 aGlzLl9sZWZ0Q29udGFpbmVyLndpZHRoIC0gdGhpcy5fcmlnaHRDb250YWluZXIud2lkdGg7Ci0K LSAgICAgICAgaWYgKHRoaXMudGltZUNvbnRyb2wuaXNTdWZmaWNpZW50bHlXaWRlKSB7Ci0gICAg ICAgICAgICB0aGlzLmNvbnRyb2xzQmFyLmluc2VydEJlZm9yZSh0aGlzLnRpbWVDb250cm9sLCB0 aGlzLl9yaWdodENvbnRhaW5lcik7Ci0gICAgICAgICAgICB0aGlzLnRpbWVDb250cm9sLnggPSB0 aGlzLl9sZWZ0Q29udGFpbmVyLndpZHRoOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAg dGhpcy50aW1lQ29udHJvbC5yZW1vdmUoKTsKLSAgICAgICAgICAgIC8vIFNpbmNlIHdlIGRvbid0 IGhhdmUgZW5vdWdoIHNwYWNlIHRvIGRpc3BsYXkgdGhlIHNjcnViYmVyLCB3ZSBtYXkgYWxzbyBu b3QgaGF2ZQotICAgICAgICAgICAgLy8gZW5vdWdoIHNwYWNlIHRvIGRpc3BsYXkgYWxsIGJ1dHRv bnMgaW4gdGhlIGxlZnQgYW5kIHJpZ2h0IGNvbnRhaW5lcnMsIHNvIGdyYWR1YWxseSBkcm9wIHRo ZW0uCi0gICAgICAgICAgICBmb3IgKGxldCBjb250cm9sIG9mIFt0aGlzLmFpcnBsYXlCdXR0b24s IHRoaXMucGlwQnV0dG9uLCB0aGlzLnNraXBCYWNrQnV0dG9uLCB0aGlzLmZ1bGxzY3JlZW5CdXR0 b25dKSB7Ci0gICAgICAgICAgICAgICAgLy8gTm90aGluZyBsZWZ0IHRvIGRvIGlmIHRoZSBjb21i aW5lZCBjb250YWluZXIgd2lkdGhzIGlzIHNob3J0ZXIgdGhhbiB0aGUgYXZhaWxhYmxlIHdpZHRo LgotICAgICAgICAgICAgICAgIGlmICh0aGlzLl9sZWZ0Q29udGFpbmVyLndpZHRoICsgdGhpcy5f cmlnaHRDb250YWluZXIud2lkdGggPCB0aGlzLndpZHRoKQotICAgICAgICAgICAgICAgICAgICBi cmVhazsKLQotICAgICAgICAgICAgICAgIC8vIElmIHRoZSBjb250cm9sIHdhcyBhbHJlYWR5IG5v dCBwYXJ0aWNpcGF0aW5nIGluIGxheW91dCwgd2UgY2FuIHNraXAgaXQuCi0gICAgICAgICAgICAg ICAgaWYgKCFjb250cm9sLnZpc2libGUpCi0gICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwot Ci0gICAgICAgICAgICAgICAgLy8gVGhpcyBjb250cm9sIG11c3Qgbm93IGJlIGRyb3BwZWQuCi0g ICAgICAgICAgICAgICAgY29udHJvbC5kcm9wcGVkID0gdHJ1ZTsKLQotICAgICAgICAgICAgICAg IHRoaXMuX2xlZnRDb250YWluZXIubGF5b3V0KCk7Ci0gICAgICAgICAgICAgICAgdGhpcy5fcmln aHRDb250YWluZXIubGF5b3V0KCk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KKyAgICAgICAg aWYgKHRoaXMuY29udHJvbHNCYXIudmlzaWJsZSkKKyAgICAgICAgICAgIHRoaXMuY29udHJvbHNC YXIuY2hpbGRyZW4gPSB0aGlzLl9pbmxpbmVMYXlvdXRTdXBwb3J0LmNoaWxkcmVuQWZ0ZXJQZXJm b3JtaW5nTGF5b3V0KCk7CiAgICAgfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tYWNvcy1pbmxpbmUtbWVkaWEt Y29udHJvbHMuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9s cy9jb250cm9scy9tYWNvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMuanMKaW5kZXggMWIxYTczN2Zj YzRmMzU2MTQzNjE3YTM4OTMyZjBhMzhkZThmZjZhNC4uNzMwNjM2ZWQxNmJiOWNmYjU3OTNiMGUy ZDUzZTE0NTZjNWZiNmVkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rl cm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRy b2xzL21hY29zLWlubGluZS1tZWRpYS1jb250cm9scy5qcwpAQCAtMzAsNiArMzAsOCBAQCBjbGFz cyBNYWNPU0lubGluZU1lZGlhQ29udHJvbHMgZXh0ZW5kcyBNYWNPU01lZGlhQ29udHJvbHMKICAg ICB7CiAgICAgICAgIHN1cGVyKG9wdGlvbnMpOwogCisgICAgICAgIHRoaXMuX2lubGluZUxheW91 dFN1cHBvcnQgPSBuZXcgSW5saW5lTGF5b3V0U3VwcG9ydCh0aGlzLCBbdGhpcy5haXJwbGF5QnV0 dG9uLCB0aGlzLnBpcEJ1dHRvbiwgdGhpcy50cmFja3NCdXR0b24sIHRoaXMubXV0ZUJ1dHRvbiwg dGhpcy5za2lwQmFja0J1dHRvbiwgdGhpcy5mdWxsc2NyZWVuQnV0dG9uXSk7CisKICAgICAgICAg dGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImlubGluZSIpOwogCiAgICAgICAgIHRoaXMubGVm dENvbnRhaW5lciA9IG5ldyBCdXR0b25zQ29udGFpbmVyKHsKQEAgLTgxLDUzICs4MywxMSBAQCBj bGFzcyBNYWNPU0lubGluZU1lZGlhQ29udHJvbHMgZXh0ZW5kcyBNYWNPU01lZGlhQ29udHJvbHMK ICAgICAgICAgaWYgKCF0aGlzLmNvbnRyb2xzQmFyLnZpc2libGUpCiAgICAgICAgICAgICByZXR1 cm47CiAKLSAgICAgICAgLy8gUmVzZXQgZHJvcHBlZCBidXR0b25zLgotICAgICAgICB0aGlzLnJp Z2h0Q29udGFpbmVyLmJ1dHRvbnMuY29uY2F0KHRoaXMubGVmdENvbnRhaW5lci5idXR0b25zKS5m b3JFYWNoKGJ1dHRvbiA9PiBkZWxldGUgYnV0dG9uLmRyb3BwZWQpOwotCi0gICAgICAgIHRoaXMu bGVmdENvbnRhaW5lci5sYXlvdXQoKTsKLSAgICAgICAgdGhpcy5yaWdodENvbnRhaW5lci5sYXlv dXQoKTsKLQotICAgICAgICBjb25zdCBtaWRkbGVDb250YWluZXIgPSB0aGlzLnN0YXR1c0xhYmVs LmVuYWJsZWQgPyB0aGlzLnN0YXR1c0xhYmVsIDogdGhpcy50aW1lQ29udHJvbDsKLSAgICAgICAg dGhpcy5jb250cm9sc0Jhci5jaGlsZHJlbiA9IFt0aGlzLl9iYWNrZ3JvdW5kVGludCwgdGhpcy5s ZWZ0Q29udGFpbmVyLCBtaWRkbGVDb250YWluZXIsIHRoaXMucmlnaHRDb250YWluZXIsIHRoaXMu X3ZvbHVtZVNsaWRlckNvbnRhaW5lcl07Ci0KLSAgICAgICAgaWYgKG1pZGRsZUNvbnRhaW5lciA9 PT0gdGhpcy50aW1lQ29udHJvbCkKLSAgICAgICAgICAgIHRoaXMudGltZUNvbnRyb2wud2lkdGgg PSB0aGlzLndpZHRoIC0gdGhpcy5sZWZ0Q29udGFpbmVyLndpZHRoIC0gdGhpcy5yaWdodENvbnRh aW5lci53aWR0aDsKLQotICAgICAgICBpZiAobWlkZGxlQ29udGFpbmVyID09PSB0aGlzLnRpbWVD b250cm9sICYmIHRoaXMudGltZUNvbnRyb2wuaXNTdWZmaWNpZW50bHlXaWRlKQotICAgICAgICAg ICAgdGhpcy50aW1lQ29udHJvbC54ID0gdGhpcy5sZWZ0Q29udGFpbmVyLndpZHRoOwotICAgICAg ICBlbHNlIHsKLSAgICAgICAgICAgIHRoaXMudGltZUNvbnRyb2wucmVtb3ZlKCk7Ci0KLSAgICAg ICAgICAgIGxldCBkcm9wcGVkQ29udHJvbHMgPSBmYWxzZTsKLQotICAgICAgICAgICAgLy8gU2lu Y2Ugd2UgZG9uJ3QgaGF2ZSBlbm91Z2ggc3BhY2UgdG8gZGlzcGxheSB0aGUgc2NydWJiZXIsIHdl IG1heSBhbHNvIG5vdCBoYXZlCi0gICAgICAgICAgICAvLyBlbm91Z2ggc3BhY2UgdG8gZGlzcGxh eSBhbGwgYnV0dG9ucyBpbiB0aGUgbGVmdCBhbmQgcmlnaHQgY29udGFpbmVycywgc28gZ3JhZHVh bGx5IGRyb3AgdGhlbS4KLSAgICAgICAgICAgIGZvciAobGV0IGJ1dHRvbiBvZiBbdGhpcy5haXJw bGF5QnV0dG9uLCB0aGlzLnBpcEJ1dHRvbiwgdGhpcy50cmFja3NCdXR0b24sIHRoaXMubXV0ZUJ1 dHRvbiwgdGhpcy5za2lwQmFja0J1dHRvbiwgdGhpcy5mdWxsc2NyZWVuQnV0dG9uXSkgewotICAg ICAgICAgICAgICAgIC8vIE5vdGhpbmcgbGVmdCB0byBkbyBpZiB0aGUgY29tYmluZWQgY29udGFp bmVyIHdpZHRocyBpcyBzaG9ydGVyIHRoYW4gdGhlIGF2YWlsYWJsZSB3aWR0aC4KLSAgICAgICAg ICAgICAgICBpZiAodGhpcy5sZWZ0Q29udGFpbmVyLndpZHRoICsgdGhpcy5yaWdodENvbnRhaW5l ci53aWR0aCA8IHRoaXMud2lkdGgpCi0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotCi0gICAg ICAgICAgICAgICAgZHJvcHBlZENvbnRyb2xzID0gdHJ1ZTsKLQotICAgICAgICAgICAgICAgIC8v IElmIHRoZSBidXR0b24gd2FzIGFscmVhZHkgbm90IHBhcnRpY2lwYXRpbmcgaW4gbGF5b3V0LCB3 ZSBjYW4gc2tpcCBpdC4KLSAgICAgICAgICAgICAgICBpZiAoIWJ1dHRvbi52aXNpYmxlKQotICAg ICAgICAgICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICAgICAgICAgIC8vIFRoaXMgYnV0 dG9uIG11c3Qgbm93IGJlIGRyb3BwZWQuCi0gICAgICAgICAgICAgICAgYnV0dG9uLmRyb3BwZWQg PSB0cnVlOwotCi0gICAgICAgICAgICAgICAgdGhpcy5sZWZ0Q29udGFpbmVyLmxheW91dCgpOwot ICAgICAgICAgICAgICAgIHRoaXMucmlnaHRDb250YWluZXIubGF5b3V0KCk7Ci0gICAgICAgICAg ICB9Ci0KLSAgICAgICAgICAgIC8vIFdlIGRpZG4ndCBuZWVkIHRvIGRyb3AgY29udHJvbHMgYW5k IHdlIGhhdmUgc3RhdHVzIHRleHQgdG8gc2hvdy4KLSAgICAgICAgICAgIGlmICghZHJvcHBlZENv bnRyb2xzICYmIG1pZGRsZUNvbnRhaW5lciA9PT0gdGhpcy5zdGF0dXNMYWJlbCkgewotICAgICAg ICAgICAgICAgIHRoaXMuc3RhdHVzTGFiZWwueCA9IHRoaXMubGVmdENvbnRhaW5lci53aWR0aDsK LSAgICAgICAgICAgICAgICB0aGlzLnN0YXR1c0xhYmVsLndpZHRoID0gdGhpcy53aWR0aCAtIHRo aXMubGVmdENvbnRhaW5lci53aWR0aCAtIHRoaXMucmlnaHRDb250YWluZXIud2lkdGg7Ci0gICAg ICAgICAgICB9Ci0gICAgICAgIH0KKyAgICAgICAgY29uc3QgY2hpbGRyZW4gPSB0aGlzLl9pbmxp bmVMYXlvdXRTdXBwb3J0LmNoaWxkcmVuQWZ0ZXJQZXJmb3JtaW5nTGF5b3V0KCk7CisgICAgICAg IGNoaWxkcmVuLnVuc2hpZnQodGhpcy5fYmFja2dyb3VuZFRpbnQpOworICAgICAgICBjaGlsZHJl bi5wdXNoKHRoaXMuX3ZvbHVtZVNsaWRlckNvbnRhaW5lcik7CisgICAgICAgIHRoaXMuY29udHJv bHNCYXIuY2hpbGRyZW4gPSBjaGlsZHJlbjsKIAotICAgICAgICB0aGlzLnJpZ2h0Q29udGFpbmVy LnggPSB0aGlzLndpZHRoIC0gdGhpcy5yaWdodENvbnRhaW5lci53aWR0aDsKICAgICAgICAgdGhp cy5fdm9sdW1lU2xpZGVyQ29udGFpbmVyLnggPSB0aGlzLnJpZ2h0Q29udGFpbmVyLnggKyB0aGlz Lm11dGVCdXR0b24ueDsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2pzLWZpbGVzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvanMtZmlsZXMKaW5kZXggYjVjYTFlZWE2MjY3MTUzNDQ2 OGM5NWE0YzM3NmQzYTQ1YjQxOWVmYS4uMzEwYmNkZDhhYTYyMDcxYjJjY2VkNzhmNjBhNTQzODM2 ZDEzOTM1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvanMtZmlsZXMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVk aWEtY29udHJvbHMvanMtZmlsZXMKQEAgLTMxLDYgKzMxLDcgQEAgY29udHJvbHMvc3RhdHVzLWxh YmVsLmpzCiBjb250cm9scy9jb250cm9scy1iYXIuanMKIGNvbnRyb2xzL3RyYWNrcy1wYW5lbC5q cwogY29udHJvbHMvbWVkaWEtY29udHJvbHMuanMKK2NvbnRyb2xzL2lubGluZS1sYXlvdXQtc3Vw cG9ydC5qcwogY29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy5qcwogY29udHJvbHMv bWFjb3MtbWVkaWEtY29udHJvbHMuanMKIGNvbnRyb2xzL21hY29zLWlubGluZS1tZWRpYS1jb250 cm9scy5qcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCmluZGV4IGY1ZjVlM2M3YzhmZTcxMGY4MDk2OTdmMjhlNzVlZjNkOTg5MmNlOTEu LjhmYzk4ZTU3YmZhMDc0NDBiODNlOTBkNWY5MWIwODNiYTZhNjZkYTMgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsNSAr MSwxOCBAQAogMjAxNy0wMi0yNyAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgog CisgICAgICAgIFtNb2Rlcm4gTWVkaWEgQ29udHJvbHNdIFN0YXR1cyB0ZXh0IGRvZXMgbm90IGFw cGVhciBvbiBpT1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2ODkxOAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzA3Mzc2NDQ+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbmV3IHRlc3QgY2hl Y2tpbmcgdGhhdCB3ZSBjb3JyZWN0bHkgZGlzcGxheSB0aGUgc3RhdHVzIGxhYmVsIG9uIGlPUy4K KworICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9pb3MtaW5saW5lLW1lZGlh LWNvbnRyb2xzL2lvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMtc3RhdHVzLWxhYmVsLWV4cGVjdGVk LnR4dDogQWRkZWQuCisgICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2lvcy1p bmxpbmUtbWVkaWEtY29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy1zdGF0dXMtbGFi ZWwuaHRtbDogQWRkZWQuCisKKzIwMTctMDItMjcgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFw cGxlLmNvbT4KKwogICAgICAgICBbTW9kZXJuIE1lZGlhIENvbnRyb2xzXSBEcmFnZ2luZyBjb250 cm9scyBpbiBmdWxsc2NyZWVuIG9uIG1hY09TIHByZXZlbnRzIHNjcnViYmluZyBvciBpbnRlcmFj dGluZyB3aXRoIGNvbnRyb2xzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjg4MjAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwNjkwMjgxPgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2lvcy1pbmxp bmUtbWVkaWEtY29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy1zdGF0dXMtbGFiZWwt ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2lv cy1pbmxpbmUtbWVkaWEtY29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy1zdGF0dXMt bGFiZWwtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjJjOTVjNTNhNzIzZTZlODM0M2UyNjI3MmMz NWJkMDdkYzkzYTcyNjUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rl cm4tbWVkaWEtY29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy9pb3MtaW5saW5lLW1l ZGlhLWNvbnRyb2xzLXN0YXR1cy1sYWJlbC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNyBAQAor VGVzdGluZyB0aGUgSU9TSW5saW5lTWVkaWFDb250cm9scyBsYXlvdXQgd2l0aCB0aGUgc3RhdHVz TGFiZWwgcHJvcGVydHkgc2V0LgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMg b2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworRGVm YXVsdCBzdGF0ZQorUEFTUyBtZWRpYUNvbnRyb2xzLmNvbnRyb2xzQmFyLmNoaWxkcmVuLmluY2x1 ZGVzKG1lZGlhQ29udHJvbHMuc3RhdHVzTGFiZWwpIGlzIGZhbHNlCitQQVNTIG1lZGlhQ29udHJv bHMuY29udHJvbHNCYXIuY2hpbGRyZW4uaW5jbHVkZXMobWVkaWFDb250cm9scy50aW1lQ29udHJv bCkgaXMgdHJ1ZQorCitBZnRlciBzZXR0aW5nIHN0YXR1c0xhYmVsLmVuYWJsZWQgPSB0cnVlCitQ QVNTIG1lZGlhQ29udHJvbHMuY29udHJvbHNCYXIuY2hpbGRyZW4uaW5jbHVkZXMobWVkaWFDb250 cm9scy5zdGF0dXNMYWJlbCkgaXMgdHJ1ZQorUEFTUyBtZWRpYUNvbnRyb2xzLmNvbnRyb2xzQmFy LmNoaWxkcmVuLmluY2x1ZGVzKG1lZGlhQ29udHJvbHMudGltZUNvbnRyb2wpIGlzIGZhbHNlCisK K1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvaW9zLWlubGlu ZS1tZWRpYS1jb250cm9scy9pb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzLXN0YXR1cy1sYWJlbC5o dG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2lvcy1pbmxpbmUt bWVkaWEtY29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy1zdGF0dXMtbGFiZWwuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5kOTRlZGE4MDlkNThmYzg1ODA5MzJhNDM2MjQ1YzI2YTE0ODFjYmI5Ci0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L2lvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy1zdGF0 dXMtbGFiZWwuaHRtbApAQCAtMCwwICsxLDM3IEBACis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVz b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJj ZXMvbWVkaWEtY29udHJvbHMtbG9hZGVyLmpzIiB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPjwvc2Ny aXB0PgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9tZWRpYS1jb250cm9scy11dGlscy5qcyIg dHlwZT0idGV4dC9qYXZhc2NyaXB0Ij48L3NjcmlwdD4KKzxib2R5PgorPHNjcmlwdCB0eXBlPSJ0 ZXh0L2phdmFzY3JpcHQiPgorCitkZXNjcmlwdGlvbigiVGVzdGluZyB0aGUgPGNvZGU+SU9TSW5s aW5lTWVkaWFDb250cm9sczwvY29kZT4gbGF5b3V0IHdpdGggdGhlIDxjb2RlPnN0YXR1c0xhYmVs PC9jb2RlPiBwcm9wZXJ0eSBzZXQuIik7CisKK3dpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsK KworY29uc3QgbWVkaWFDb250cm9scyA9IG5ldyBJT1NJbmxpbmVNZWRpYUNvbnRyb2xzKHsgd2lk dGg6IDY4MCwgaGVpZ2h0OiA1MCB9KTsKKworbGV0IG51bWJlck9mRnJhbWVzID0gMDsKK3NjaGVk dWxlci5mcmFtZURpZEZpcmUgPSBmdW5jdGlvbigpCit7CisKKyAgICBudW1iZXJPZkZyYW1lcysr OworCisgICAgaWYgKG51bWJlck9mRnJhbWVzID09IDEpIHsKKyAgICAgICAgZGVidWcoIkRlZmF1 bHQgc3RhdGUiKTsKKyAgICAgICAgc2hvdWxkQmVGYWxzZSgibWVkaWFDb250cm9scy5jb250cm9s c0Jhci5jaGlsZHJlbi5pbmNsdWRlcyhtZWRpYUNvbnRyb2xzLnN0YXR1c0xhYmVsKSIpOworICAg ICAgICBzaG91bGRCZVRydWUoIm1lZGlhQ29udHJvbHMuY29udHJvbHNCYXIuY2hpbGRyZW4uaW5j bHVkZXMobWVkaWFDb250cm9scy50aW1lQ29udHJvbCkiKTsKKyAgICAgICAgbWVkaWFDb250cm9s cy5zdGF0dXNMYWJlbC5lbmFibGVkID0gdHJ1ZTsKKyAgICB9IGVsc2UgaWYgKG51bWJlck9mRnJh bWVzID09IDIpIHsKKyAgICAgICAgZGVidWcoIiIpOworICAgICAgICBkZWJ1ZygiQWZ0ZXIgc2V0 dGluZyBzdGF0dXNMYWJlbC5lbmFibGVkID0gdHJ1ZSIpOworICAgICAgICBzaG91bGRCZVRydWUo Im1lZGlhQ29udHJvbHMuY29udHJvbHNCYXIuY2hpbGRyZW4uaW5jbHVkZXMobWVkaWFDb250cm9s cy5zdGF0dXNMYWJlbCkiKTsKKyAgICAgICAgc2hvdWxkQmVGYWxzZSgibWVkaWFDb250cm9scy5j b250cm9sc0Jhci5jaGlsZHJlbi5pbmNsdWRlcyhtZWRpYUNvbnRyb2xzLnRpbWVDb250cm9sKSIp OworICAgICAgICBkZWJ1ZygiIik7CisgICAgICAgIGZpbmlzaE1lZGlhQ29udHJvbHNUZXN0KCk7 CisgICAgfQorCit9OworCis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJj ZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4K 302855 2017-02-27 11:17:09 -0800 2017-02-27 11:57:01 -0800 Patch for landing bug-168918-20170227111414.patch text/plain 17983 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzMDU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjA0ZTk1MWZlZmE0ZGIz YjMwYTJmMmQ2N2E5ZGY2NmZmYjk2Y2M2Mi4uZjA0ZmYzMWQ4OTc0ZjVjMzBkYjc5MjhiMWIwMjRl Njc2MTMyYjRlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE3LTAyLTI3ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gU3RhdHVzIHRleHQgZG9lcyBub3QgYXBwZWFyIG9uIGlPUworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4OTE4CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8zMDczNzY0ND4KKworICAgICAgICBSZXZpZXdlZCBieSBEZWFuIEphY2tzb24u CisKKyAgICAgICAgV2UgcmVmYWN0b3IgdGhlIGxheW91dCBjb2RlIG91dCBvZiBNYWNPU0lubGlu ZU1lZGlhQ29udHJvbHMgYW5kIGludG8gYSBuZXcKKyAgICAgICAgSW5saW5lTGF5b3V0U3VwcG9y dCBjbGFzcyB3aGljaCBJT1NJbmxpbmVNZWRpYUNvbnRyb2xzIHVzZXMgYXMgd2VsbC4gTm93Cisg ICAgICAgIGJvdGggdGhlIG1hY09TIGFuZCBpT1MgaW5saW5lIG1lZGlhIGNvbnRyb2xzIHJ1biB0 aGUgc2FtZSBsYXlvdXQgbG9naWMgdG8KKyAgICAgICAgY29udHJvbCB3aGV0aGVyIHRoZSBzdGF0 dXMgbGFiZWwgb3Igc2NydWJiZXIgc2hvdWxkIGJlIGRpc3BsYXllZCwgYW5kIHdoaWNoCisgICAg ICAgIGNvbnRyb2xzIHNob3VsZCBiZSBkcm9wcGVkIGR1ZSB0byBzcGFjZSBjb25zdHJhaW50cy4K KworICAgICAgICBUZXN0OiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvaW9zLWlubGluZS1t ZWRpYS1jb250cm9scy9pb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzLXN0YXR1cy1sYWJlbC5odG1s CisKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9pbmxp bmUtbGF5b3V0LXN1cHBvcnQuanM6IEFkZGVkLgorICAgICAgICAoSW5saW5lTGF5b3V0U3VwcG9y dCk6CisgICAgICAgIChJbmxpbmVMYXlvdXRTdXBwb3J0LnByb3RvdHlwZS5jaGlsZHJlbkFmdGVy UGVyZm9ybWluZ0xheW91dCk6CisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvY29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy5qczoKKyAgICAgICAgKElPU0lu bGluZU1lZGlhQ29udHJvbHMucHJvdG90eXBlLmxheW91dCk6CisgICAgICAgIChJT1NJbmxpbmVN ZWRpYUNvbnRyb2xzKToKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9j b250cm9scy9tYWNvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMuanM6CisgICAgICAgIChNYWNPU0lu bGluZU1lZGlhQ29udHJvbHMucHJvdG90eXBlLmxheW91dCk6CisgICAgICAgICogTW9kdWxlcy9t b2Rlcm4tbWVkaWEtY29udHJvbHMvanMtZmlsZXM6CisKKzIwMTctMDItMjcgIEFudG9pbmUgUXVp bnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KKwogICAgICAgICBbTW9kZXJuIE1lZGlhIENvbnRyb2xz XSBEcmFnZ2luZyBjb250cm9scyBpbiBmdWxsc2NyZWVuIG9uIG1hY09TIHByZXZlbnRzIHNjcnVi YmluZyBvciBpbnRlcmFjdGluZyB3aXRoIGNvbnRyb2xzCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjg4MjAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzMwNjkwMjgxPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVk aWEtY29udHJvbHMvY29udHJvbHMvaW5saW5lLWxheW91dC1zdXBwb3J0LmpzIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvaW5saW5lLWxheW91 dC1zdXBwb3J0LmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA2OTEwNWM1NzY5NjMzNjUzOWEwNTk2NDFhMGNkOGRi NmYzZmExOWMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVy bi1tZWRpYS1jb250cm9scy9jb250cm9scy9pbmxpbmUtbGF5b3V0LXN1cHBvcnQuanMKQEAgLTAs MCArMSw5NiBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxNyBBcHBsZSBJbmMuIEFsbCBSaWdo dHMgUmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6 CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFy eSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0 aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBBUFBMRSBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FS UkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBX QVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFS CisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5D LiBPUgorICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1Qs IElOQ0lERU5UQUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFN QUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBT VUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBS T0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFO WSBUSEVPUlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkg QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisK K2NsYXNzIElubGluZUxheW91dFN1cHBvcnQKK3sKKworICAgIGNvbnN0cnVjdG9yKGNvbnRyb2xz LCBkcm9wcGFibGVDb250cm9scykKKyAgICB7CisgICAgICAgIHRoaXMuX2NvbnRyb2xzID0gY29u dHJvbHM7CisgICAgICAgIHRoaXMuX2Ryb3BwYWJsZUNvbnRyb2xzID0gZHJvcHBhYmxlQ29udHJv bHM7CisgICAgfQorCisgICAgLy8gUHVibGljCisKKyAgICBjaGlsZHJlbkFmdGVyUGVyZm9ybWlu Z0xheW91dCgpCisgICAgeworICAgICAgICBjb25zdCBjb250cm9scyA9IHRoaXMuX2NvbnRyb2xz OworCisgICAgICAgIC8vIFJlc2V0IGRyb3BwZWQgYnV0dG9ucy4KKyAgICAgICAgY29udHJvbHMu cmlnaHRDb250YWluZXIuYnV0dG9ucy5jb25jYXQoY29udHJvbHMubGVmdENvbnRhaW5lci5idXR0 b25zKS5mb3JFYWNoKGJ1dHRvbiA9PiBkZWxldGUgYnV0dG9uLmRyb3BwZWQpOworCisgICAgICAg IGNvbnRyb2xzLmxlZnRDb250YWluZXIubGF5b3V0KCk7CisgICAgICAgIGNvbnRyb2xzLnJpZ2h0 Q29udGFpbmVyLmxheW91dCgpOworCisgICAgICAgIGxldCBzaG91bGRTaG93VGltZUNvbnRyb2wg PSAhY29udHJvbHMuc3RhdHVzTGFiZWwuZW5hYmxlZDsKKworICAgICAgICBpZiAoc2hvdWxkU2hv d1RpbWVDb250cm9sKQorICAgICAgICAgICAgY29udHJvbHMudGltZUNvbnRyb2wud2lkdGggPSBj b250cm9scy53aWR0aCAtIGNvbnRyb2xzLmxlZnRDb250YWluZXIud2lkdGggLSBjb250cm9scy5y aWdodENvbnRhaW5lci53aWR0aDsKKworICAgICAgICBpZiAoc2hvdWxkU2hvd1RpbWVDb250cm9s ICYmIGNvbnRyb2xzLnRpbWVDb250cm9sLmlzU3VmZmljaWVudGx5V2lkZSkKKyAgICAgICAgICAg IGNvbnRyb2xzLnRpbWVDb250cm9sLnggPSBjb250cm9scy5sZWZ0Q29udGFpbmVyLndpZHRoOwor ICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGxldCBkcm9wcGVkQ29udHJvbHMgPSBmYWxzZTsK KyAgICAgICAgICAgIHNob3VsZFNob3dUaW1lQ29udHJvbCA9IGZhbHNlOworCisgICAgICAgICAg ICAvLyBTaW5jZSB3ZSBkb24ndCBoYXZlIGVub3VnaCBzcGFjZSB0byBkaXNwbGF5IHRoZSBzY3J1 YmJlciwgd2UgbWF5IGFsc28gbm90IGhhdmUKKyAgICAgICAgICAgIC8vIGVub3VnaCBzcGFjZSB0 byBkaXNwbGF5IGFsbCBidXR0b25zIGluIHRoZSBsZWZ0IGFuZCByaWdodCBjb250YWluZXJzLCBz byBncmFkdWFsbHkgZHJvcCB0aGVtLgorICAgICAgICAgICAgZm9yIChsZXQgYnV0dG9uIG9mIHRo aXMuX2Ryb3BwYWJsZUNvbnRyb2xzKSB7CisgICAgICAgICAgICAgICAgLy8gTm90aGluZyBsZWZ0 IHRvIGRvIGlmIHRoZSBjb21iaW5lZCBjb250YWluZXIgd2lkdGhzIGlzIHNob3J0ZXIgdGhhbiB0 aGUgYXZhaWxhYmxlIHdpZHRoLgorICAgICAgICAgICAgICAgIGlmIChjb250cm9scy5sZWZ0Q29u dGFpbmVyLndpZHRoICsgY29udHJvbHMucmlnaHRDb250YWluZXIud2lkdGggPCBjb250cm9scy53 aWR0aCkKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICBkcm9w cGVkQ29udHJvbHMgPSB0cnVlOworCisgICAgICAgICAgICAgICAgLy8gSWYgdGhlIGJ1dHRvbiB3 YXMgYWxyZWFkeSBub3QgcGFydGljaXBhdGluZyBpbiBsYXlvdXQsIHdlIGNhbiBza2lwIGl0Lgor ICAgICAgICAgICAgICAgIGlmICghYnV0dG9uLnZpc2libGUpCisgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOworCisgICAgICAgICAgICAgICAgLy8gVGhpcyBidXR0b24gbXVzdCBub3cgYmUg ZHJvcHBlZC4KKyAgICAgICAgICAgICAgICBidXR0b24uZHJvcHBlZCA9IHRydWU7CisKKyAgICAg ICAgICAgICAgICBjb250cm9scy5sZWZ0Q29udGFpbmVyLmxheW91dCgpOworICAgICAgICAgICAg ICAgIGNvbnRyb2xzLnJpZ2h0Q29udGFpbmVyLmxheW91dCgpOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICAvLyBXZSBkaWRuJ3QgbmVlZCB0byBkcm9wIGNvbnRyb2xzIGFuZCB3ZSBoYXZl IHN0YXR1cyB0ZXh0IHRvIHNob3cuCisgICAgICAgICAgICBpZiAoIWRyb3BwZWRDb250cm9scyAm JiBjb250cm9scy5zdGF0dXNMYWJlbC5lbmFibGVkKSB7CisgICAgICAgICAgICAgICAgY29udHJv bHMuc3RhdHVzTGFiZWwueCA9IGNvbnRyb2xzLmxlZnRDb250YWluZXIud2lkdGg7CisgICAgICAg ICAgICAgICAgY29udHJvbHMuc3RhdHVzTGFiZWwud2lkdGggPSBjb250cm9scy53aWR0aCAtIGNv bnRyb2xzLmxlZnRDb250YWluZXIud2lkdGggLSBjb250cm9scy5yaWdodENvbnRhaW5lci53aWR0 aDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIGNvbnRyb2xzLnJpZ2h0Q29u dGFpbmVyLnggPSBjb250cm9scy53aWR0aCAtIGNvbnRyb2xzLnJpZ2h0Q29udGFpbmVyLndpZHRo OworCisgICAgICAgIGNvbnN0IGNoaWxkcmVuID0gW2NvbnRyb2xzLmxlZnRDb250YWluZXJdOwor ICAgICAgICBpZiAoc2hvdWxkU2hvd1RpbWVDb250cm9sKQorICAgICAgICAgICAgY2hpbGRyZW4u cHVzaChjb250cm9scy50aW1lQ29udHJvbCk7CisgICAgICAgIGVsc2UgaWYgKGNvbnRyb2xzLnN0 YXR1c0xhYmVsLmVuYWJsZWQpCisgICAgICAgICAgICBjaGlsZHJlbi5wdXNoKGNvbnRyb2xzLnN0 YXR1c0xhYmVsKTsKKyAgICAgICAgY2hpbGRyZW4ucHVzaChjb250cm9scy5yaWdodENvbnRhaW5l cik7CisgICAgICAgIHJldHVybiBjaGlsZHJlbjsKKyAgICB9CisKK30KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2lvcy1p bmxpbmUtbWVkaWEtY29udHJvbHMuanMgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1t ZWRpYS1jb250cm9scy9jb250cm9scy9pb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzLmpzCmluZGV4 IDk2M2UyMmIwMTIwY2VhMzQ4ZGI2N2JlMzllYTE3ZjY0N2M2M2Y0ODIuLmViMjZjYTc4ODhmZTRm NDZjMTRkOTNiYzkxNzY5ODI1ZGNjNzRlZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2lvcy1pbmxpbmUtbWVkaWEtY29u dHJvbHMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvY29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy5qcwpAQCAtMzIsMjAgKzMyLDIy IEBAIGNsYXNzIElPU0lubGluZU1lZGlhQ29udHJvbHMgZXh0ZW5kcyBNZWRpYUNvbnRyb2xzCiAK ICAgICAgICAgc3VwZXIob3B0aW9ucyk7CiAKKyAgICAgICAgdGhpcy5faW5saW5lTGF5b3V0U3Vw cG9ydCA9IG5ldyBJbmxpbmVMYXlvdXRTdXBwb3J0KHRoaXMsIFt0aGlzLmFpcnBsYXlCdXR0b24s IHRoaXMucGlwQnV0dG9uLCB0aGlzLnNraXBCYWNrQnV0dG9uLCB0aGlzLmZ1bGxzY3JlZW5CdXR0 b25dKTsKKwogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiaW9zIik7CiAgICAg ICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJpbmxpbmUiKTsKIAotICAgICAgICB0aGlz Ll9sZWZ0Q29udGFpbmVyID0gbmV3IEJ1dHRvbnNDb250YWluZXIoeworICAgICAgICB0aGlzLmxl ZnRDb250YWluZXIgPSBuZXcgQnV0dG9uc0NvbnRhaW5lcih7CiAgICAgICAgICAgICBidXR0b25z OiBbdGhpcy5wbGF5UGF1c2VCdXR0b24sIHRoaXMuc2tpcEJhY2tCdXR0b25dLAogICAgICAgICAg ICAgY3NzQ2xhc3NOYW1lOiAibGVmdCIKICAgICAgICAgfSk7CiAKLSAgICAgICAgdGhpcy5fcmln aHRDb250YWluZXIgPSBuZXcgQnV0dG9uc0NvbnRhaW5lcih7CisgICAgICAgIHRoaXMucmlnaHRD b250YWluZXIgPSBuZXcgQnV0dG9uc0NvbnRhaW5lcih7CiAgICAgICAgICAgICBidXR0b25zOiBb dGhpcy5haXJwbGF5QnV0dG9uLCB0aGlzLnBpcEJ1dHRvbiwgdGhpcy5mdWxsc2NyZWVuQnV0dG9u XSwKICAgICAgICAgICAgIGNzc0NsYXNzTmFtZTogInJpZ2h0IgogICAgICAgICB9KTsKIAotICAg ICAgICB0aGlzLmNvbnRyb2xzQmFyLmNoaWxkcmVuID0gW3RoaXMuX2xlZnRDb250YWluZXIsIHRo aXMuX3JpZ2h0Q29udGFpbmVyXTsKKyAgICAgICAgdGhpcy5jb250cm9sc0Jhci5jaGlsZHJlbiA9 IFt0aGlzLmxlZnRDb250YWluZXIsIHRoaXMucmlnaHRDb250YWluZXJdOwogCiAgICAgICAgIHRo aXMuX3BpbmNoR2VzdHVyZVJlY29nbml6ZXIgPSBuZXcgUGluY2hHZXN0dXJlUmVjb2duaXplcih0 aGlzLmVsZW1lbnQsIHRoaXMpOwogICAgIH0KQEAgLTcwLDM4ICs3Miw4IEBAIGNsYXNzIElPU0lu bGluZU1lZGlhQ29udHJvbHMgZXh0ZW5kcyBNZWRpYUNvbnRyb2xzCiAgICAgewogICAgICAgICBz dXBlci5sYXlvdXQoKTsKIAotICAgICAgICAvLyBSZXNldCBkcm9wcGVkIGJ1dHRvbnMuCi0gICAg ICAgIGZvciAobGV0IGJ1dHRvbiBvZiB0aGlzLl9yaWdodENvbnRhaW5lci5idXR0b25zKQotICAg ICAgICAgICAgZGVsZXRlIGJ1dHRvbi5kcm9wcGVkOwotCi0gICAgICAgIHRoaXMuX2xlZnRDb250 YWluZXIubGF5b3V0KCk7Ci0gICAgICAgIHRoaXMuX3JpZ2h0Q29udGFpbmVyLmxheW91dCgpOwot Ci0gICAgICAgIHRoaXMudGltZUNvbnRyb2wud2lkdGggPSB0aGlzLndpZHRoIC0gdGhpcy5fbGVm dENvbnRhaW5lci53aWR0aCAtIHRoaXMuX3JpZ2h0Q29udGFpbmVyLndpZHRoOwotCi0gICAgICAg IGlmICh0aGlzLnRpbWVDb250cm9sLmlzU3VmZmljaWVudGx5V2lkZSkgewotICAgICAgICAgICAg dGhpcy5jb250cm9sc0Jhci5pbnNlcnRCZWZvcmUodGhpcy50aW1lQ29udHJvbCwgdGhpcy5fcmln aHRDb250YWluZXIpOwotICAgICAgICAgICAgdGhpcy50aW1lQ29udHJvbC54ID0gdGhpcy5fbGVm dENvbnRhaW5lci53aWR0aDsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHRoaXMudGlt ZUNvbnRyb2wucmVtb3ZlKCk7Ci0gICAgICAgICAgICAvLyBTaW5jZSB3ZSBkb24ndCBoYXZlIGVu b3VnaCBzcGFjZSB0byBkaXNwbGF5IHRoZSBzY3J1YmJlciwgd2UgbWF5IGFsc28gbm90IGhhdmUK LSAgICAgICAgICAgIC8vIGVub3VnaCBzcGFjZSB0byBkaXNwbGF5IGFsbCBidXR0b25zIGluIHRo ZSBsZWZ0IGFuZCByaWdodCBjb250YWluZXJzLCBzbyBncmFkdWFsbHkgZHJvcCB0aGVtLgotICAg ICAgICAgICAgZm9yIChsZXQgY29udHJvbCBvZiBbdGhpcy5haXJwbGF5QnV0dG9uLCB0aGlzLnBp cEJ1dHRvbiwgdGhpcy5za2lwQmFja0J1dHRvbiwgdGhpcy5mdWxsc2NyZWVuQnV0dG9uXSkgewot ICAgICAgICAgICAgICAgIC8vIE5vdGhpbmcgbGVmdCB0byBkbyBpZiB0aGUgY29tYmluZWQgY29u dGFpbmVyIHdpZHRocyBpcyBzaG9ydGVyIHRoYW4gdGhlIGF2YWlsYWJsZSB3aWR0aC4KLSAgICAg ICAgICAgICAgICBpZiAodGhpcy5fbGVmdENvbnRhaW5lci53aWR0aCArIHRoaXMuX3JpZ2h0Q29u dGFpbmVyLndpZHRoIDwgdGhpcy53aWR0aCkKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0K LSAgICAgICAgICAgICAgICAvLyBJZiB0aGUgY29udHJvbCB3YXMgYWxyZWFkeSBub3QgcGFydGlj aXBhdGluZyBpbiBsYXlvdXQsIHdlIGNhbiBza2lwIGl0LgotICAgICAgICAgICAgICAgIGlmICgh Y29udHJvbC52aXNpYmxlKQotICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAg ICAgICAgICAgIC8vIFRoaXMgY29udHJvbCBtdXN0IG5vdyBiZSBkcm9wcGVkLgotICAgICAgICAg ICAgICAgIGNvbnRyb2wuZHJvcHBlZCA9IHRydWU7Ci0KLSAgICAgICAgICAgICAgICB0aGlzLl9s ZWZ0Q29udGFpbmVyLmxheW91dCgpOwotICAgICAgICAgICAgICAgIHRoaXMuX3JpZ2h0Q29udGFp bmVyLmxheW91dCgpOwotICAgICAgICAgICAgfQotICAgICAgICB9CisgICAgICAgIGlmICh0aGlz LmNvbnRyb2xzQmFyLnZpc2libGUpCisgICAgICAgICAgICB0aGlzLmNvbnRyb2xzQmFyLmNoaWxk cmVuID0gdGhpcy5faW5saW5lTGF5b3V0U3VwcG9ydC5jaGlsZHJlbkFmdGVyUGVyZm9ybWluZ0xh eW91dCgpOwogICAgIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t b2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xz LmpzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJv bHMvbWFjb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzLmpzCmluZGV4IDFiMWE3MzdmY2M0ZjM1NjE0 MzYxN2EzODkzMmYwYTM4ZGU4ZmY2YTQuLjJiMzFjNTEwZDE5YTllM2FjMDdmMzc5YjZjNTM2N2Vm OWMwZDRjYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL2NvbnRyb2xzL21hY29zLWlubGluZS1tZWRpYS1jb250cm9scy5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tYWNv cy1pbmxpbmUtbWVkaWEtY29udHJvbHMuanMKQEAgLTMwLDYgKzMwLDggQEAgY2xhc3MgTWFjT1NJ bmxpbmVNZWRpYUNvbnRyb2xzIGV4dGVuZHMgTWFjT1NNZWRpYUNvbnRyb2xzCiAgICAgewogICAg ICAgICBzdXBlcihvcHRpb25zKTsKIAorICAgICAgICB0aGlzLl9pbmxpbmVMYXlvdXRTdXBwb3J0 ID0gbmV3IElubGluZUxheW91dFN1cHBvcnQodGhpcywgW3RoaXMuYWlycGxheUJ1dHRvbiwgdGhp cy5waXBCdXR0b24sIHRoaXMudHJhY2tzQnV0dG9uLCB0aGlzLm11dGVCdXR0b24sIHRoaXMuc2tp cEJhY2tCdXR0b24sIHRoaXMuZnVsbHNjcmVlbkJ1dHRvbl0pOworCiAgICAgICAgIHRoaXMuZWxl bWVudC5jbGFzc0xpc3QuYWRkKCJpbmxpbmUiKTsKIAogICAgICAgICB0aGlzLmxlZnRDb250YWlu ZXIgPSBuZXcgQnV0dG9uc0NvbnRhaW5lcih7CkBAIC04MSw1MyArODMsMTIgQEAgY2xhc3MgTWFj T1NJbmxpbmVNZWRpYUNvbnRyb2xzIGV4dGVuZHMgTWFjT1NNZWRpYUNvbnRyb2xzCiAgICAgICAg IGlmICghdGhpcy5jb250cm9sc0Jhci52aXNpYmxlKQogICAgICAgICAgICAgcmV0dXJuOwogCi0g ICAgICAgIC8vIFJlc2V0IGRyb3BwZWQgYnV0dG9ucy4KLSAgICAgICAgdGhpcy5yaWdodENvbnRh aW5lci5idXR0b25zLmNvbmNhdCh0aGlzLmxlZnRDb250YWluZXIuYnV0dG9ucykuZm9yRWFjaChi dXR0b24gPT4gZGVsZXRlIGJ1dHRvbi5kcm9wcGVkKTsKLQotICAgICAgICB0aGlzLmxlZnRDb250 YWluZXIubGF5b3V0KCk7Ci0gICAgICAgIHRoaXMucmlnaHRDb250YWluZXIubGF5b3V0KCk7Ci0K LSAgICAgICAgY29uc3QgbWlkZGxlQ29udGFpbmVyID0gdGhpcy5zdGF0dXNMYWJlbC5lbmFibGVk ID8gdGhpcy5zdGF0dXNMYWJlbCA6IHRoaXMudGltZUNvbnRyb2w7Ci0gICAgICAgIHRoaXMuY29u dHJvbHNCYXIuY2hpbGRyZW4gPSBbdGhpcy5fYmFja2dyb3VuZFRpbnQsIHRoaXMubGVmdENvbnRh aW5lciwgbWlkZGxlQ29udGFpbmVyLCB0aGlzLnJpZ2h0Q29udGFpbmVyLCB0aGlzLl92b2x1bWVT bGlkZXJDb250YWluZXJdOwotCi0gICAgICAgIGlmIChtaWRkbGVDb250YWluZXIgPT09IHRoaXMu dGltZUNvbnRyb2wpCi0gICAgICAgICAgICB0aGlzLnRpbWVDb250cm9sLndpZHRoID0gdGhpcy53 aWR0aCAtIHRoaXMubGVmdENvbnRhaW5lci53aWR0aCAtIHRoaXMucmlnaHRDb250YWluZXIud2lk dGg7Ci0KLSAgICAgICAgaWYgKG1pZGRsZUNvbnRhaW5lciA9PT0gdGhpcy50aW1lQ29udHJvbCAm JiB0aGlzLnRpbWVDb250cm9sLmlzU3VmZmljaWVudGx5V2lkZSkKLSAgICAgICAgICAgIHRoaXMu dGltZUNvbnRyb2wueCA9IHRoaXMubGVmdENvbnRhaW5lci53aWR0aDsKLSAgICAgICAgZWxzZSB7 Ci0gICAgICAgICAgICB0aGlzLnRpbWVDb250cm9sLnJlbW92ZSgpOwotCi0gICAgICAgICAgICBs ZXQgZHJvcHBlZENvbnRyb2xzID0gZmFsc2U7Ci0KLSAgICAgICAgICAgIC8vIFNpbmNlIHdlIGRv bid0IGhhdmUgZW5vdWdoIHNwYWNlIHRvIGRpc3BsYXkgdGhlIHNjcnViYmVyLCB3ZSBtYXkgYWxz byBub3QgaGF2ZQotICAgICAgICAgICAgLy8gZW5vdWdoIHNwYWNlIHRvIGRpc3BsYXkgYWxsIGJ1 dHRvbnMgaW4gdGhlIGxlZnQgYW5kIHJpZ2h0IGNvbnRhaW5lcnMsIHNvIGdyYWR1YWxseSBkcm9w IHRoZW0uCi0gICAgICAgICAgICBmb3IgKGxldCBidXR0b24gb2YgW3RoaXMuYWlycGxheUJ1dHRv biwgdGhpcy5waXBCdXR0b24sIHRoaXMudHJhY2tzQnV0dG9uLCB0aGlzLm11dGVCdXR0b24sIHRo aXMuc2tpcEJhY2tCdXR0b24sIHRoaXMuZnVsbHNjcmVlbkJ1dHRvbl0pIHsKLSAgICAgICAgICAg ICAgICAvLyBOb3RoaW5nIGxlZnQgdG8gZG8gaWYgdGhlIGNvbWJpbmVkIGNvbnRhaW5lciB3aWR0 aHMgaXMgc2hvcnRlciB0aGFuIHRoZSBhdmFpbGFibGUgd2lkdGguCi0gICAgICAgICAgICAgICAg aWYgKHRoaXMubGVmdENvbnRhaW5lci53aWR0aCArIHRoaXMucmlnaHRDb250YWluZXIud2lkdGgg PCB0aGlzLndpZHRoKQotICAgICAgICAgICAgICAgICAgICBicmVhazsKLQotICAgICAgICAgICAg ICAgIGRyb3BwZWRDb250cm9scyA9IHRydWU7Ci0KLSAgICAgICAgICAgICAgICAvLyBJZiB0aGUg YnV0dG9uIHdhcyBhbHJlYWR5IG5vdCBwYXJ0aWNpcGF0aW5nIGluIGxheW91dCwgd2UgY2FuIHNr aXAgaXQuCi0gICAgICAgICAgICAgICAgaWYgKCFidXR0b24udmlzaWJsZSkKLSAgICAgICAgICAg ICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAgICAgICAgICAvLyBUaGlzIGJ1dHRvbiBtdXN0 IG5vdyBiZSBkcm9wcGVkLgotICAgICAgICAgICAgICAgIGJ1dHRvbi5kcm9wcGVkID0gdHJ1ZTsK LQotICAgICAgICAgICAgICAgIHRoaXMubGVmdENvbnRhaW5lci5sYXlvdXQoKTsKLSAgICAgICAg ICAgICAgICB0aGlzLnJpZ2h0Q29udGFpbmVyLmxheW91dCgpOwotICAgICAgICAgICAgfQotCi0g ICAgICAgICAgICAvLyBXZSBkaWRuJ3QgbmVlZCB0byBkcm9wIGNvbnRyb2xzIGFuZCB3ZSBoYXZl IHN0YXR1cyB0ZXh0IHRvIHNob3cuCi0gICAgICAgICAgICBpZiAoIWRyb3BwZWRDb250cm9scyAm JiBtaWRkbGVDb250YWluZXIgPT09IHRoaXMuc3RhdHVzTGFiZWwpIHsKLSAgICAgICAgICAgICAg ICB0aGlzLnN0YXR1c0xhYmVsLnggPSB0aGlzLmxlZnRDb250YWluZXIud2lkdGg7Ci0gICAgICAg ICAgICAgICAgdGhpcy5zdGF0dXNMYWJlbC53aWR0aCA9IHRoaXMud2lkdGggLSB0aGlzLmxlZnRD b250YWluZXIud2lkdGggLSB0aGlzLnJpZ2h0Q29udGFpbmVyLndpZHRoOwotICAgICAgICAgICAg fQotICAgICAgICB9CisgICAgICAgIGNvbnN0IGNoaWxkcmVuID0gdGhpcy5faW5saW5lTGF5b3V0 U3VwcG9ydC5jaGlsZHJlbkFmdGVyUGVyZm9ybWluZ0xheW91dCgpOworICAgICAgICAvLyBBZGQg dGhlIGJhY2tncm91bmQgdGludCBhcyB0aGUgZmlyc3QgY2hpbGQuCisgICAgICAgIGNoaWxkcmVu LnVuc2hpZnQodGhpcy5fYmFja2dyb3VuZFRpbnQpOworICAgICAgICBjaGlsZHJlbi5wdXNoKHRo aXMuX3ZvbHVtZVNsaWRlckNvbnRhaW5lcik7CisgICAgICAgIHRoaXMuY29udHJvbHNCYXIuY2hp bGRyZW4gPSBjaGlsZHJlbjsKIAotICAgICAgICB0aGlzLnJpZ2h0Q29udGFpbmVyLnggPSB0aGlz LndpZHRoIC0gdGhpcy5yaWdodENvbnRhaW5lci53aWR0aDsKICAgICAgICAgdGhpcy5fdm9sdW1l U2xpZGVyQ29udGFpbmVyLnggPSB0aGlzLnJpZ2h0Q29udGFpbmVyLnggKyB0aGlzLm11dGVCdXR0 b24ueDsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJu LW1lZGlhLWNvbnRyb2xzL2pzLWZpbGVzIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4t bWVkaWEtY29udHJvbHMvanMtZmlsZXMKaW5kZXggYjVjYTFlZWE2MjY3MTUzNDQ2OGM5NWE0YzM3 NmQzYTQ1YjQxOWVmYS4uMzEwYmNkZDhhYTYyMDcxYjJjY2VkNzhmNjBhNTQzODM2ZDEzOTM1ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv anMtZmlsZXMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvanMtZmlsZXMKQEAgLTMxLDYgKzMxLDcgQEAgY29udHJvbHMvc3RhdHVzLWxhYmVsLmpzCiBj b250cm9scy9jb250cm9scy1iYXIuanMKIGNvbnRyb2xzL3RyYWNrcy1wYW5lbC5qcwogY29udHJv bHMvbWVkaWEtY29udHJvbHMuanMKK2NvbnRyb2xzL2lubGluZS1sYXlvdXQtc3VwcG9ydC5qcwog Y29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy5qcwogY29udHJvbHMvbWFjb3MtbWVk aWEtY29udHJvbHMuanMKIGNvbnRyb2xzL21hY29zLWlubGluZS1tZWRpYS1jb250cm9scy5qcwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IGY1ZjVlM2M3YzhmZTcxMGY4MDk2OTdmMjhlNzVlZjNkOTg5MmNlOTEuLjg5YTkyZTVj YzNkMTViYjYyNTBhYTAxYjlhNmRjNmE4Y2Y1OGNkYzggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOCBAQAog MjAxNy0wMi0yNyAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCisgICAgICAg IFtNb2Rlcm4gTWVkaWEgQ29udHJvbHNdIFN0YXR1cyB0ZXh0IGRvZXMgbm90IGFwcGVhciBvbiBp T1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2ODkx OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzA3Mzc2NDQ+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRGVhbiBKYWNrc29uLgorCisgICAgICAgIEFkZCBhIG5ldyB0ZXN0IGNoZWNraW5nIHRoYXQg d2UgY29ycmVjdGx5IGRpc3BsYXkgdGhlIHN0YXR1cyBsYWJlbCBvbiBpT1MuCisKKyAgICAgICAg KiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy9p b3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzLXN0YXR1cy1sYWJlbC1leHBlY3RlZC50eHQ6IEFkZGVk LgorICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9pb3MtaW5saW5lLW1lZGlh LWNvbnRyb2xzL2lvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMtc3RhdHVzLWxhYmVsLmh0bWw6IEFk ZGVkLgorCisyMDE3LTAyLTI3ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisK ICAgICAgICAgW01vZGVybiBNZWRpYSBDb250cm9sc10gRHJhZ2dpbmcgY29udHJvbHMgaW4gZnVs bHNjcmVlbiBvbiBtYWNPUyBwcmV2ZW50cyBzY3J1YmJpbmcgb3IgaW50ZXJhY3Rpbmcgd2l0aCBj b250cm9scwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTY4ODIwCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMDY5MDI4MT4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9pb3MtaW5saW5lLW1lZGlhLWNv bnRyb2xzL2lvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMtc3RhdHVzLWxhYmVsLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9pb3MtaW5saW5lLW1l ZGlhLWNvbnRyb2xzL2lvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMtc3RhdHVzLWxhYmVsLWV4cGVj dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi4yYzk1YzUzYTcyM2U2ZTgzNDNlMjYyNzJjMzViZDA3ZGM5M2E3 MjY1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL2lvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9s cy1zdGF0dXMtbGFiZWwtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTcgQEAKK1Rlc3RpbmcgdGhl IElPU0lubGluZU1lZGlhQ29udHJvbHMgbGF5b3V0IHdpdGggdGhlIHN0YXR1c0xhYmVsIHByb3Bl cnR5IHNldC4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBt ZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK0RlZmF1bHQgc3RhdGUK K1BBU1MgbWVkaWFDb250cm9scy5jb250cm9sc0Jhci5jaGlsZHJlbi5pbmNsdWRlcyhtZWRpYUNv bnRyb2xzLnN0YXR1c0xhYmVsKSBpcyBmYWxzZQorUEFTUyBtZWRpYUNvbnRyb2xzLmNvbnRyb2xz QmFyLmNoaWxkcmVuLmluY2x1ZGVzKG1lZGlhQ29udHJvbHMudGltZUNvbnRyb2wpIGlzIHRydWUK KworQWZ0ZXIgc2V0dGluZyBzdGF0dXNMYWJlbC5lbmFibGVkID0gdHJ1ZQorUEFTUyBtZWRpYUNv bnRyb2xzLmNvbnRyb2xzQmFyLmNoaWxkcmVuLmluY2x1ZGVzKG1lZGlhQ29udHJvbHMuc3RhdHVz TGFiZWwpIGlzIHRydWUKK1BBU1MgbWVkaWFDb250cm9scy5jb250cm9sc0Jhci5jaGlsZHJlbi5p bmNsdWRlcyhtZWRpYUNvbnRyb2xzLnRpbWVDb250cm9sKSBpcyBmYWxzZQorCitQQVNTIHN1Y2Nl c3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2lvcy1pbmxpbmUtbWVkaWEtY29u dHJvbHMvaW9zLWlubGluZS1tZWRpYS1jb250cm9scy1zdGF0dXMtbGFiZWwuaHRtbCBiL0xheW91 dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9pb3MtaW5saW5lLW1lZGlhLWNvbnRy b2xzL2lvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMtc3RhdHVzLWxhYmVsLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uZDk0ZWRhODA5ZDU4ZmM4NTgwOTMyYTQzNjI0NWMyNmExNDgxY2JiOQotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy9pb3MtaW5saW5l LW1lZGlhLWNvbnRyb2xzL2lvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMtc3RhdHVzLWxhYmVsLmh0 bWwKQEAgLTAsMCArMSwzNyBAQAorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10 ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL21lZGlhLWNv bnRyb2xzLWxvYWRlci5qcyIgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij48L3NjcmlwdD4KKzxzY3Jp cHQgc3JjPSIuLi9yZXNvdXJjZXMvbWVkaWEtY29udHJvbHMtdXRpbHMuanMiIHR5cGU9InRleHQv amF2YXNjcmlwdCI+PC9zY3JpcHQ+Cis8Ym9keT4KKzxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2Ny aXB0Ij4KKworZGVzY3JpcHRpb24oIlRlc3RpbmcgdGhlIDxjb2RlPklPU0lubGluZU1lZGlhQ29u dHJvbHM8L2NvZGU+IGxheW91dCB3aXRoIHRoZSA8Y29kZT5zdGF0dXNMYWJlbDwvY29kZT4gcHJv cGVydHkgc2V0LiIpOworCit3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7CisKK2NvbnN0IG1l ZGlhQ29udHJvbHMgPSBuZXcgSU9TSW5saW5lTWVkaWFDb250cm9scyh7IHdpZHRoOiA2ODAsIGhl aWdodDogNTAgfSk7CisKK2xldCBudW1iZXJPZkZyYW1lcyA9IDA7CitzY2hlZHVsZXIuZnJhbWVE aWRGaXJlID0gZnVuY3Rpb24oKQoreworCisgICAgbnVtYmVyT2ZGcmFtZXMrKzsKKworICAgIGlm IChudW1iZXJPZkZyYW1lcyA9PSAxKSB7CisgICAgICAgIGRlYnVnKCJEZWZhdWx0IHN0YXRlIik7 CisgICAgICAgIHNob3VsZEJlRmFsc2UoIm1lZGlhQ29udHJvbHMuY29udHJvbHNCYXIuY2hpbGRy ZW4uaW5jbHVkZXMobWVkaWFDb250cm9scy5zdGF0dXNMYWJlbCkiKTsKKyAgICAgICAgc2hvdWxk QmVUcnVlKCJtZWRpYUNvbnRyb2xzLmNvbnRyb2xzQmFyLmNoaWxkcmVuLmluY2x1ZGVzKG1lZGlh Q29udHJvbHMudGltZUNvbnRyb2wpIik7CisgICAgICAgIG1lZGlhQ29udHJvbHMuc3RhdHVzTGFi ZWwuZW5hYmxlZCA9IHRydWU7CisgICAgfSBlbHNlIGlmIChudW1iZXJPZkZyYW1lcyA9PSAyKSB7 CisgICAgICAgIGRlYnVnKCIiKTsKKyAgICAgICAgZGVidWcoIkFmdGVyIHNldHRpbmcgc3RhdHVz TGFiZWwuZW5hYmxlZCA9IHRydWUiKTsKKyAgICAgICAgc2hvdWxkQmVUcnVlKCJtZWRpYUNvbnRy b2xzLmNvbnRyb2xzQmFyLmNoaWxkcmVuLmluY2x1ZGVzKG1lZGlhQ29udHJvbHMuc3RhdHVzTGFi ZWwpIik7CisgICAgICAgIHNob3VsZEJlRmFsc2UoIm1lZGlhQ29udHJvbHMuY29udHJvbHNCYXIu Y2hpbGRyZW4uaW5jbHVkZXMobWVkaWFDb250cm9scy50aW1lQ29udHJvbCkiKTsKKyAgICAgICAg ZGVidWcoIiIpOworICAgICAgICBmaW5pc2hNZWRpYUNvbnRyb2xzVGVzdCgpOworICAgIH0KKwor fTsKKworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3Qt cG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cg==