170239 2017-03-29 07:08:19 -0700 [Modern Media Controls] Controls bar may disappear while captions menu is visible (redux) 2017-03-29 10:28:55 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=168751 InRadar P2 Normal --- 1 graouts graouts commit-queue dino webkit-bug-importer oldest_to_newest 1292374 0 graouts 2017-03-29 07:08:19 -0700 We did some work in https://bugs.webkit.org/show_bug.cgi?id=168751 to prevent the controls bar from disappearing while the captions menu is visible. But there were two remaining issues: 1. the controls bar would hide upon exiting the video. 2. clicking on the controls bar while the caption panel is up would hide the controls bar as well as the captions panel. 1292376 1 webkit-bug-importer 2017-03-29 07:08:38 -0700 <rdar://problem/31320684> 1292377 2 webkit-bug-importer 2017-03-29 07:08:40 -0700 <rdar://problem/31320685> 1292378 3 305730 graouts 2017-03-29 07:15:34 -0700 Created attachment 305730 Patch 1292379 4 305731 graouts 2017-03-29 07:20:15 -0700 Created attachment 305731 Patch 1292467 5 305731 commit-queue 2017-03-29 10:28:51 -0700 Comment on attachment 305731 Patch Clearing flags on attachment: 305731 Committed r214545: <http://trac.webkit.org/changeset/214545> 1292468 6 commit-queue 2017-03-29 10:28:55 -0700 All reviewed patches have been landed. Closing bug. 305730 2017-03-29 07:15:34 -0700 2017-03-29 07:20:10 -0700 Patch bug-170239-20170329161532.patch text/plain 14914 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NDY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWI2NzlmYzA3NjU4ODU3 YzI2ZjBmMjZjNGM2ODYzZTA3Yzg1NTZjNi4uMGI2ZjQ3OGVjMDg4ZjJmYTZjYzRhZmViYTExYWVj Nzk4Nzk5MGJkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE3LTAzLTI5ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gQ29udHJvbHMgYmFyIG1heSBkaXNhcHBlYXIgd2hpbGUgY2FwdGlvbnMgbWVudSBp cyB2aXNpYmxlIChyZWR1eCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3MDIzOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzEzMjA2ODU+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgZGlkIHNvbWUg d29yayBpbiB3ZWJraXQub3JnL2IvMTY4NzUxIHRvIHByZXZlbnQgdGhlIGNvbnRyb2xzIGJhciBm cm9tIGRpc2FwcGVhcmluZyB3aGlsZSB0aGUKKyAgICAgICAgY2FwdGlvbnMgbWVudSBpcyB2aXNp YmxlLiBCdXQgdGhlcmUgd2VyZSB0d28gY2FzZXMgd2hlcmUgdGhlIGJlaGF2aW9yIHdhcyBub3Qg YXMgaW50ZW5kZWQ6CisKKyAgICAgICAgICAgIDEuIHRoZSBjb250cm9scyBiYXIgd291bGQgaGlk ZSB1cG9uIGV4aXRpbmcgdGhlIHZpZGVvLgorICAgICAgICAgICAgMi4gY2xpY2tpbmcgb24gdGhl IGNvbnRyb2xzIGJhciB3aGlsZSB0aGUgY2FwdGlvbiBwYW5lbCBpcyB1cCB3b3VsZCBoaWRlIHRo ZSBjb250cm9scyBiYXIKKyAgICAgICAgICAgICAgIGFzIHdlbGwgYXMgdGhlIGNhcHRpb25zIHBh bmVsLgorCisgICAgICAgIEluc3RlYWQgb2YgZGV0ZXJtaW5pbmcgdGhhdCB0aGUgInVzZXJJbnRl cmFjdGlvbkVuYWJsZWQiIHByb3BlcnR5IGJlaW5nIHNldCB0byAiZmFsc2UiIGlzIGluZGljYXRp dmUKKyAgICAgICAgb2Ygc2Vjb25kYXJ5IFVJLCBzdWNoIGFzIHRoZSB0cmFja3MgcGFuZWwsIGJl aW5nIGF0dGFjaGVkIHRvIHRoZSBjb250cm9scyBiYXIsIHdlIG5vdyBoYXZlIGFuCisgICAgICAg IGV4cGxpY2l0IHByb3BlcnR5IHRvIHNwZWNpZnkgdGhpcy4gTm93LCB3aGVuICJoYXNTZWNvbmRh cnlVSUF0dGFjaGVkIiBpcyAidHJ1ZSIsIHdlIHByZXZlbnQgdGhlCisgICAgICAgIGNvbnRyb2xz IGJhciBmcm9tIGZhZGluZyB3aGVuIGV4aXRpbmcgdGhlIG1lZGlhLgorCisgICAgICAgIEFkZGl0 aW9uYWxseSwgd2hlbiBkaXNtaXNzaW5nIHRoZSB0cmFja3MgcGFuZWwsIHdlIGNoZWNrIHdoZXRo ZXIgYSBtb3VzZSBldmVudCBsZWFkIHRvIHRoaXMgYW5kIGNoZWNrCisgICAgICAgIGlmIHRoZSBt b3VzZSB3YXMgcG9zaXRpb25lZCBvdmVyIHRoZSBjb250cm9scyBiYXIuIElmIHRoYXQgaXMgdGhl IGNhc2UsIHdlIG5vIGxvbmdlciBoaWRlIHRoZSBjb250cm9scworICAgICAgICBiYXIgYW5kIG9u bHkgZGlzbWlzcyB0aGUgdHJhY2tzIHBhbmVsLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL21vZGVy bi1tZWRpYS1jb250cm9scy90cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLWNvbnRyb2xzLWJhci1y ZW1haW5zLXZpc2libGUtYWZ0ZXItY2xpY2tpbmctb3Zlci1pdC5odG1sCisKKyAgICAgICAgKiBN b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9jb250cm9scy1iYXIuanM6Cisg ICAgICAgIChDb250cm9sc0Jhci5wcm90b3R5cGUuc2V0IHVzZXJJbnRlcmFjdGlvbkVuYWJsZWQp OgorICAgICAgICAoQ29udHJvbHNCYXIucHJvdG90eXBlLmhhbmRsZUV2ZW50KToKKyAgICAgICAg KENvbnRyb2xzQmFyLnByb3RvdHlwZS5fYXV0b0hpZGVUaW1lckZpcmVkKToKKyAgICAgICAgKiBN b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tYWNvcy1tZWRpYS1jb250cm9s cy5qczoKKyAgICAgICAgKE1hY09TTWVkaWFDb250cm9scy5wcm90b3R5cGUuc2hvd1RyYWNrc1Bh bmVsKToKKyAgICAgICAgKE1hY09TTWVkaWFDb250cm9scy5wcm90b3R5cGUuaGlkZVRyYWNrc1Bh bmVsKToKKwogMjAxNy0wMy0yOCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgog CiAgICAgICAgIFtNb2Rlcm4gTWVkaWEgQ29udHJvbHNdIEltcHJvdmUgbWVkaWEgZG9jdW1lbnRz IGFjcm9zcyBtYWNPUywgaVBob25lIGFuZCBpUGFkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9jb250cm9scy1iYXIuanMg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9j b250cm9scy1iYXIuanMKaW5kZXggNTU4OWY5NmUyYWM1YTAyMmExYWUzODBiZTNlZDYyY2M4ZmVk ZGNjMy4uN2M3MGVjN2QwZjhkNTVkYjZmMzk2OTU4ZWIxZTc1OThkNTI3NTJjNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMv Y29udHJvbHMtYmFyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlh LWNvbnRyb2xzL2NvbnRyb2xzL2NvbnRyb2xzLWJhci5qcwpAQCAtNDAsNiArNDAsNyBAQCBjbGFz cyBDb250cm9sc0JhciBleHRlbmRzIExheW91dE5vZGUKIAogICAgICAgICB0aGlzLmZhZGVzV2hp bGVJZGxlID0gZmFsc2U7CiAgICAgICAgIHRoaXMudXNlckludGVyYWN0aW9uRW5hYmxlZCA9IHRy dWU7CisgICAgICAgIHRoaXMuaGFzU2Vjb25kYXJ5VUlBdHRhY2hlZCA9IGZhbHNlOwogICAgIH0K IAogICAgIC8vIFB1YmxpYwpAQCAtNzAsMTAgKzcxLDYgQEAgY2xhc3MgQ29udHJvbHNCYXIgZXh0 ZW5kcyBMYXlvdXROb2RlCiAKICAgICAgICAgdGhpcy5fdXNlckludGVyYWN0aW9uRW5hYmxlZCA9 IGZsYWc7CiAgICAgICAgIHRoaXMubWFya0RpcnR5UHJvcGVydHkoInVzZXJJbnRlcmFjdGlvbkVu YWJsZWQiKTsKLQotICAgICAgICBpZiAodGhpcy5fdXNlckludGVyYWN0aW9uRW5hYmxlZCAmJiB0 aGlzLl9jb250cm9sc1Nob3VsZEZhZGVXaGVuVXNlckludGVyYWN0aW9uQmVjb21lc0VuYWJsZWQp Ci0gICAgICAgICAgICB0aGlzLmZhZGVkID0gdHJ1ZTsKLSAgICAgICAgZGVsZXRlIHRoaXMuX2Nv bnRyb2xzU2hvdWxkRmFkZVdoZW5Vc2VySW50ZXJhY3Rpb25CZWNvbWVzRW5hYmxlZDsKICAgICB9 CiAKICAgICBnZXQgZmFkZXNXaGlsZUlkbGUoKQpAQCAtMTYwLDcgKzE1Nyw3IEBAIGNsYXNzIENv bnRyb2xzQmFyIGV4dGVuZHMgTGF5b3V0Tm9kZQogICAgICAgICAgICAgaWYgKGV2ZW50LnR5cGUg PT09ICJtb3VzZW1vdmUiKSB7CiAgICAgICAgICAgICAgICAgdGhpcy5mYWRlZCA9IGZhbHNlOwog ICAgICAgICAgICAgICAgIHRoaXMuX3Jlc2V0QXV0b0hpZGVUaW1lcih0cnVlKTsKLSAgICAgICAg ICAgIH0gZWxzZSBpZiAoZXZlbnQudHlwZSA9PT0gIm1vdXNlbGVhdmUiICYmIHRoaXMuX2ZhZGVz V2hpbGVJZGxlICYmICF0aGlzLl9lbmZvcmNlQXV0b0hpZGVUaW1lcikKKyAgICAgICAgICAgIH0g ZWxzZSBpZiAoZXZlbnQudHlwZSA9PT0gIm1vdXNlbGVhdmUiICYmIHRoaXMuX2ZhZGVzV2hpbGVJ ZGxlICYmICF0aGlzLmhhc1NlY29uZGFyeVVJQXR0YWNoZWQgJiYgIXRoaXMuX2VuZm9yY2VBdXRv SGlkZVRpbWVyKQogICAgICAgICAgICAgICAgIHRoaXMuZmFkZWQgPSB0cnVlOwogICAgICAgICB9 IGVsc2UgaWYgKGV2ZW50LmN1cnJlbnRUYXJnZXQgPT09IHRoaXMuZWxlbWVudCkgewogICAgICAg ICAgICAgaWYgKGV2ZW50LnR5cGUgPT09ICJtb3VzZWVudGVyIikgewpAQCAtMjQ2LDE2ICsyNDMs NyBAQCBjbGFzcyBDb250cm9sc0JhciBleHRlbmRzIExheW91dE5vZGUKICAgICAgICAgICAgIHJl dHVybjsKIAogICAgICAgICB0aGlzLl9jYW5jZWxBdXRvSGlkZVRpbWVyKCk7Ci0gICAgICAgIGlm ICghdGhpcy5fZmFkZXNXaGlsZUlkbGUpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAg Ly8gV2UgZG9uJ3Qgd2FudCB0byBmYWRlIHRoZSBjb250cm9scyB3aGVuIHVzZXIgaW50ZXJhY3Rp b24gYmVjb21lcyBkaXNhYmxlZAotICAgICAgICAvLyBiZWNhdXNlIHNlY29uZGFyeSBVSSBhdHRh Y2hlZCB0byB0aGUgY29udHJvbHMgaXMgYmVpbmcgc2hvd24gYW5kIHdlIHdhbnQKLSAgICAgICAg Ly8gdG8gd2FpdCB1bnRpbCBpdCBubyBsb25nZXIgaXMgdG8gZmFkZSB0aGUgY29udHJvbHMgb3V0 LgotICAgICAgICBpZiAoIXRoaXMuX3VzZXJJbnRlcmFjdGlvbkVuYWJsZWQpCi0gICAgICAgICAg ICB0aGlzLl9jb250cm9sc1Nob3VsZEZhZGVXaGVuVXNlckludGVyYWN0aW9uQmVjb21lc0VuYWJs ZWQgPSB0cnVlOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0aGlzLmZhZGVkID0gdHJ1ZTsK KyAgICAgICAgdGhpcy5mYWRlZCA9IHRoaXMuX2ZhZGVzV2hpbGVJZGxlICYmICF0aGlzLmhhc1Nl Y29uZGFyeVVJQXR0YWNoZWQ7CiAgICAgfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tYWNvcy1tZWRpYS1jb250 cm9scy5qcyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2Nv bnRyb2xzL21hY29zLW1lZGlhLWNvbnRyb2xzLmpzCmluZGV4IDkxN2Y2ZDMxMjc3YjAzNjQ1MzZm YzQwOTVlNjI4YWI5MzcyMTRmOGQuLjllZTY0MDQ4MDU1NTQ2MWJiOGU4OWQwNjJjNjQ4MmJlOGFi NzdiYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL2NvbnRyb2xzL21hY29zLW1lZGlhLWNvbnRyb2xzLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21hY29zLW1lZGlhLWNv bnRyb2xzLmpzCkBAIC00OCw2ICs0OCw3IEBAIGNsYXNzIE1hY09TTWVkaWFDb250cm9scyBleHRl bmRzIE1lZGlhQ29udHJvbHMKICAgICAgICAgdGhpcy50cmFja3NCdXR0b24ub24gPSB0cnVlOwog ICAgICAgICB0aGlzLnRyYWNrc0J1dHRvbi5lbGVtZW50LmJsdXIoKTsKICAgICAgICAgdGhpcy5j b250cm9sc0Jhci51c2VySW50ZXJhY3Rpb25FbmFibGVkID0gZmFsc2U7CisgICAgICAgIHRoaXMu Y29udHJvbHNCYXIuaGFzU2Vjb25kYXJ5VUlBdHRhY2hlZCA9IHRydWU7CiAgICAgICAgIHRoaXMu dHJhY2tzUGFuZWwucHJlc2VudEluUGFyZW50KHRoaXMpOwogCiAgICAgICAgIGNvbnN0IGNvbnRy b2xzQm91bmRzID0gdGhpcy5lbGVtZW50LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOwpAQCAtNjAs OSArNjEsMTkgQEAgY2xhc3MgTWFjT1NNZWRpYUNvbnRyb2xzIGV4dGVuZHMgTWVkaWFDb250cm9s cwogCiAgICAgaGlkZVRyYWNrc1BhbmVsKCkKICAgICB7CisgICAgICAgIGxldCBzaG91bGRGYWRl Q29udHJvbHNCYXIgPSB0cnVlOworICAgICAgICBpZiAod2luZG93LmV2ZW50IGluc3RhbmNlb2Yg TW91c2VFdmVudCkgeworICAgICAgICAgICAgY29uc3QgeCA9IHdpbmRvdy5ldmVudC5jbGllbnRY OworICAgICAgICAgICAgY29uc3QgeSA9IHdpbmRvdy5ldmVudC5jbGllbnRZOworICAgICAgICAg ICAgY29uc3QgYm91bmRzID0gdGhpcy5jb250cm9sc0Jhci5lbGVtZW50LmdldEJvdW5kaW5nQ2xp ZW50UmVjdCgpOworICAgICAgICAgICAgc2hvdWxkRmFkZUNvbnRyb2xzQmFyID0geCA8IGJvdW5k cy5sZWZ0IHx8IHggPiBib3VuZHMucmlnaHQgfHwgeSA8IGJvdW5kcy50b3AgfHwgeSA+IGJvdW5k cy5ib3R0b207CisgICAgICAgIH0KKyAgICAgICAgICAgIAogICAgICAgICB0aGlzLnRyYWNrc0J1 dHRvbi5vbiA9IGZhbHNlOwogICAgICAgICB0aGlzLnRyYWNrc0J1dHRvbi5lbGVtZW50LmZvY3Vz KCk7CiAgICAgICAgIHRoaXMuY29udHJvbHNCYXIudXNlckludGVyYWN0aW9uRW5hYmxlZCA9IHRy dWU7CisgICAgICAgIHRoaXMuY29udHJvbHNCYXIuaGFzU2Vjb25kYXJ5VUlBdHRhY2hlZCA9IGZh bHNlOworICAgICAgICB0aGlzLmNvbnRyb2xzQmFyLmZhZGVkID0gc2hvdWxkRmFkZUNvbnRyb2xz QmFyOwogICAgICAgICB0aGlzLnRyYWNrc1BhbmVsLmhpZGUoKTsKICAgICB9CiAKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAz NDA5YmNjYThlYzI0ZWU2OTM2OWFhOGJhM2FhNDY3ZTNlMjk4YTM0Li4xOGFiYjgxNmE2MGY1Y2E1 N2Y1Mzg1M2ZmODE3ZjczM2NiMWMzZGJhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTctMDMt MjkgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KKworICAgICAgICBbTW9kZXJu IE1lZGlhIENvbnRyb2xzXSBDb250cm9scyBiYXIgbWF5IGRpc2FwcGVhciB3aGlsZSBjYXB0aW9u cyBtZW51IGlzIHZpc2libGUgKHJlZHV4KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMjM5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMTMyMDY4 NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBl eHRlbmQgYW4gZXhpc3RpbmcgdGVzdCB0byBjb3ZlciB0aGUgY2FzZSB3aGVyZSB3ZSB3b3VsZCBo aWRlIHRoZSBjb250cm9scyBiYXIgd2hpbGUgdGhlIHRyYWNrcyBwYW5lbAorICAgICAgICBpcyB1 cCBieSBtb3VzaW5nIG91dCBvZiB0aGUgbWVkaWEuIFdlIGFsc28gYWRkIGEgbmV3IHRlc3Qgd2hl cmUgd2UgY2hlY2sgdGhhdCBjbGlja2luZyBvdmVyIHRoZSBjb250cm9scworICAgICAgICBiYXIg dG8gZGlzbWlzcyB0aGUgdHJhY2tzIHBhbmVsIGRvZXMgbm90IGhpZGUgdGhlIGNvbnRyb2xzIGJh ci4gRmluYWxseSwgd2UgbWFrZSBhIHNtYWxsIGNoYW5nZSB0byBhbgorICAgICAgICBleGlzdGlu ZyB0ZXN0IHRvIGxpc3RlbiB0byAidHJhbnNpdGlvbmVuZCIgZXZlbnQgb24gdGhlIHRyYWNrcyBw YW5lbCBzcGVjaWZpY2FsbHkgc2luY2Ugd2l0aCB0aGlzIHBhdGNoCisgICAgICAgIHRoZSBjb250 cm9scyBiYXIgd291bGQgZGlzYXBwZWFyIGFuZCB0cmlnZ2VyIGEgc2ltaWxhciBldmVudCB3aGVu IGRpc2FwcGVhcmluZyBhcyB0aGUgdHJhY2tzIHBhbmVsIGlzIGRpc21pc3NlZC4KKworICAgICAg ICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVs LWNvbnRyb2xzLWJhci1yZW1haW5zLXZpc2libGUtYWZ0ZXItY2xpY2tpbmctb3Zlci1pdC1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90 cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLWNvbnRyb2xzLWJhci1yZW1haW5zLXZpc2libGUtYWZ0 ZXItY2xpY2tpbmctb3Zlci1pdC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4t bWVkaWEtY29udHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5lbC1wcmV2ZW50LWNvbnRyb2xz LWJhci1mcm9tLWZhZGluZy1leHBlY3RlZC50eHQ6CisgICAgICAgICogbWVkaWEvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL3RyYWNrcy1wYW5lbC90cmFja3MtcGFuZWwtcHJldmVudC1jb250cm9scy1i YXItZnJvbS1mYWRpbmcuaHRtbDoKKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJv bHMvdHJhY2tzLXN1cHBvcnQvdHJhY2tzLXN1cHBvcnQtY2xpY2stdHJhY2staW4tcGFuZWwuaHRt bDoKKwogMjAxNy0wMy0yOCAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAg ICAgICAgIFtNb2Rlcm4gTWVkaWEgQ29udHJvbHNdIEltcHJvdmUgbWVkaWEgZG9jdW1lbnRzIGFj cm9zcyBtYWNPUywgaVBob25lIGFuZCBpUGFkCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRp YS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5lbC1jb250cm9s cy1iYXItcmVtYWlucy12aXNpYmxlLWFmdGVyLWNsaWNraW5nLW92ZXItaXQtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1wYW5lbC90 cmFja3MtcGFuZWwtY29udHJvbHMtYmFyLXJlbWFpbnMtdmlzaWJsZS1hZnRlci1jbGlja2luZy1v dmVyLWl0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41ZjYxYjg1NWY4ZmZkYWZkYWQ4MDAzYjAz YjY1OTk5NGEzNTgxMGE1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1wYW5lbC90cmFja3MtcGFuZWwtY29udHJvbHMtYmFy LXJlbWFpbnMtdmlzaWJsZS1hZnRlci1jbGlja2luZy1vdmVyLWl0LWV4cGVjdGVkLnR4dApAQCAt MCwwICsxLDE5IEBACitDbGlja2luZyBvbiB0aGUgY29udHJvbHMgYmFyIHRvIGRpc21pc3MgdGhl IHRyYWNrcyBwYW5lbCBzaG91bGQgbm90IGhpZGUgdGhlIGNvbnRyb2xzIGJhciwgb25seSB0aGUg dHJhY2sgcGFuZWwuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFT UyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCittZWRpYUNvbnRy b2xzLnNob3dUcmFja3NQYW5lbCgpCitQQVNTIG1lZGlhQ29udHJvbHMudHJhY2tzUGFuZWwuZWxl bWVudC5wYXJlbnROb2RlIGJlY2FtZSBtZWRpYUNvbnRyb2xzLmVsZW1lbnQKKworV2UndmUgd2Fp dGVkIGxvbmcgZW5vdWdoIHNvIHRoYXQgdGhlIGNvbnRyb2xzIGJhciBzaG91bGQgYmUgZmFkZWQg c2hvdWxkIHRoZSB0cmFja3MgcGFuZWwgbm90IGJlIHZpc2libGUKK1BBU1MgbWVkaWFDb250cm9s cy5jb250cm9sc0Jhci5mYWRlZCBpcyBmYWxzZQorCitDbGljayBvbiB0aGUgY29udHJvbHMgYmFy IHRvIGRpc21pc3MgdGhlIHBhbmVsLCB0aGUgY29udHJvbHMgYmFyIHNob3VsZCByZW1haW4gdmlz aWJsZQorUEFTUyBtZWRpYUNvbnRyb2xzLmNvbnRyb2xzQmFyLmZhZGVkIGlzIGZhbHNlCitQQVNT IG1lZGlhQ29udHJvbHMudHJhY2tzUGFuZWwucHJlc2VudGVkIGlzIGZhbHNlCisKK1BBU1Mgc3Vj Y2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNr cy1wYW5lbC1jb250cm9scy1iYXItcmVtYWlucy12aXNpYmxlLWFmdGVyLWNsaWNraW5nLW92ZXIt aXQuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mt cGFuZWwvdHJhY2tzLXBhbmVsLWNvbnRyb2xzLWJhci1yZW1haW5zLXZpc2libGUtYWZ0ZXItY2xp Y2tpbmctb3Zlci1pdC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjkwMmMwYzI1OTNjZGFjNmE0NzBiMTgwZTYz ZTRhODAxMzZlMTQ5MDcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rl cm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5lbC1jb250cm9scy1iYXIt cmVtYWlucy12aXNpYmxlLWFmdGVyLWNsaWNraW5nLW92ZXItaXQuaHRtbApAQCAtMCwwICsxLDU1 IEBACis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3Nj cmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvbWVkaWEtY29udHJvbHMtbG9hZGVyLmpz IiB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPjwvc2NyaXB0PgorPGJvZHk+Cis8c3R5bGUgdHlwZT0i dGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgorICAgIAorICAgIC5tZWRpYS1jb250cm9scyB7Cisg ICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgdG9wOiAwOworICAgICAgICBsZWZ0 OiAwOworICAgIH0KKyAgICAKKzwvc3R5bGU+Cis8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlw dCI+CisKK3dpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKworZGVzY3JpcHRpb24oIkNsaWNr aW5nIG9uIHRoZSBjb250cm9scyBiYXIgdG8gZGlzbWlzcyB0aGUgdHJhY2tzIHBhbmVsIHNob3Vs ZCBub3QgaGlkZSB0aGUgY29udHJvbHMgYmFyLCBvbmx5IHRoZSB0cmFjayBwYW5lbC4iKTsKKwor Y29uc3QgbWVkaWFDb250cm9scyA9IG5ldyBNYWNPU0lubGluZU1lZGlhQ29udHJvbHMoeyB3aWR0 aDogNjgwLCBoZWlnaHQ6IDMwMCB9KTsKKworZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChtZWRp YUNvbnRyb2xzLmVsZW1lbnQpOworCitsZXQgdHJhY2tFbGVtZW50OworCittZWRpYUNvbnRyb2xz LmNvbnRyb2xzQmFyLmF1dG9IaWRlRGVsYXkgPSAyNTA7CittZWRpYUNvbnRyb2xzLmNvbnRyb2xz QmFyLmZhZGVzV2hpbGVJZGxlID0gdHJ1ZTsKKworZGVidWcoIm1lZGlhQ29udHJvbHMuc2hvd1Ry YWNrc1BhbmVsKCkiKTsKK21lZGlhQ29udHJvbHMuc2hvd1RyYWNrc1BhbmVsKCk7CisKK3Nob3Vs ZEJlY29tZUVxdWFsKCJtZWRpYUNvbnRyb2xzLnRyYWNrc1BhbmVsLmVsZW1lbnQucGFyZW50Tm9k ZSIsICJtZWRpYUNvbnRyb2xzLmVsZW1lbnQiLCAoKSA9PiB7CisgICAgLy8gTGV0J3Mgd2FpdCBh IHdoaWxlIHRvIHNlZSB0aGF0IHRoZSBjb250cm9scyBiYXIgaXMgc3RpbGwgdmlzaWJsZS4KKyAg ICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAgZGVidWcoIiIpOworICAgICAgICBkZWJ1Zygi V2UndmUgd2FpdGVkIGxvbmcgZW5vdWdoIHNvIHRoYXQgdGhlIGNvbnRyb2xzIGJhciBzaG91bGQg YmUgZmFkZWQgc2hvdWxkIHRoZSB0cmFja3MgcGFuZWwgbm90IGJlIHZpc2libGUiKTsKKyAgICAg ICAgc2hvdWxkQmVGYWxzZSgibWVkaWFDb250cm9scy5jb250cm9sc0Jhci5mYWRlZCIpOworCisg ICAgICAgIGRlYnVnKCIiKTsKKyAgICAgICAgZGVidWcoIkNsaWNrIG9uIHRoZSBjb250cm9scyBi YXIgdG8gZGlzbWlzcyB0aGUgcGFuZWwsIHRoZSBjb250cm9scyBiYXIgc2hvdWxkIHJlbWFpbiB2 aXNpYmxlIik7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKDY3MCwgMjkwKTsKKyAg ICAgICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNl VXAoKTsKKworICAgICAgICBzaG91bGRCZUZhbHNlKCJtZWRpYUNvbnRyb2xzLmNvbnRyb2xzQmFy LmZhZGVkIik7CisgICAgICAgIHNob3VsZEJlRmFsc2UoIm1lZGlhQ29udHJvbHMudHJhY2tzUGFu ZWwucHJlc2VudGVkIik7CisKKyAgICAgICAgZGVidWcoIiIpOworICAgICAgICBtZWRpYUNvbnRy b2xzLmVsZW1lbnQucmVtb3ZlKCk7CisgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgIH0sIG1l ZGlhQ29udHJvbHMuY29udHJvbHNCYXIuYXV0b0hpZGVEZWxheSk7Cit9KTsKKworPC9zY3JpcHQ+ Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3Jp cHQ+Cis8L2JvZHk+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5lbC1wcmV2ZW50LWNvbnRyb2xzLWJhci1m cm9tLWZhZGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEt Y29udHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5lbC1wcmV2ZW50LWNvbnRyb2xzLWJhci1m cm9tLWZhZGluZy1leHBlY3RlZC50eHQKaW5kZXggODNlNmUzNWU0MTEzNTgzNDkxMWJhNDk2MzQ5 ODM4MTlhZmYzM2M1My4uMTdkOTljM2E2MmQzZDUxZDVlMzE0NDJiMDdiNWFiNGE3NjZhZWEwYiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNr cy1wYW5lbC90cmFja3MtcGFuZWwtcHJldmVudC1jb250cm9scy1iYXItZnJvbS1mYWRpbmctZXhw ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90 cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLXByZXZlbnQtY29udHJvbHMtYmFyLWZyb20tZmFkaW5n LWV4cGVjdGVkLnR4dApAQCAtOSw2ICs5LDkgQEAgUEFTUyBtZWRpYUNvbnRyb2xzLnRyYWNrc1Bh bmVsLmVsZW1lbnQucGFyZW50Tm9kZSBiZWNhbWUgbWVkaWFDb250cm9scy5lbGVtZW50CiBXZSd2 ZSB3YWl0ZWQgbG9uZyBlbm91Z2ggc28gdGhhdCB0aGUgY29udHJvbHMgYmFyIHNob3VsZCBiZSBm YWRlZCBzaG91bGQgdGhlIHRyYWNrcyBwYW5lbCBub3QgYmUgdmlzaWJsZQogUEFTUyBtZWRpYUNv bnRyb2xzLmNvbnRyb2xzQmFyLmZhZGVkIGlzIGZhbHNlCiAKK05vdyBlbnRlciBhbmQgZXhpdCB0 aGUgbWVkaWEgY29udHJvbHMsIHRoZSBjb250cm9scyBiYXIgc2hvdWxkIHJlbWFpbiB2aXNpYmxl CitQQVNTIG1lZGlhQ29udHJvbHMuY29udHJvbHNCYXIuZmFkZWQgaXMgZmFsc2UKKwogbWVkaWFD b250cm9scy5oaWRlVHJhY2tzUGFuZWwoKQogUEFTUyBtZWRpYUNvbnRyb2xzLmNvbnRyb2xzQmFy LmZhZGVkIGlzIHRydWUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzL3RyYWNrcy1wYW5lbC90cmFja3MtcGFuZWwtcHJldmVudC1jb250cm9scy1i YXItZnJvbS1mYWRpbmcuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250 cm9scy90cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLXByZXZlbnQtY29udHJvbHMtYmFyLWZyb20t ZmFkaW5nLmh0bWwKaW5kZXggMzFlNWRhZTI2ZmU3ODc1MTg1MWQ4ZjkxZWY0YWRmMTAzMTJjNjcw Ny4uMmVlODk4OWM3YWY2ZWNkNWNhZGI0Zjc2ODNiNmEzODc1ZTAwYmJhYSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1wYW5lbC90cmFj a3MtcGFuZWwtcHJldmVudC1jb250cm9scy1iYXItZnJvbS1mYWRpbmcuaHRtbAorKysgYi9MYXlv dXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1w YW5lbC1wcmV2ZW50LWNvbnRyb2xzLWJhci1mcm9tLWZhZGluZy5odG1sCkBAIC0zNSw2ICszNSwx MyBAQCBzaG91bGRCZWNvbWVFcXVhbCgibWVkaWFDb250cm9scy50cmFja3NQYW5lbC5lbGVtZW50 LnBhcmVudE5vZGUiLCAibWVkaWFDb250cm9scwogICAgICAgICBkZWJ1ZygiV2UndmUgd2FpdGVk IGxvbmcgZW5vdWdoIHNvIHRoYXQgdGhlIGNvbnRyb2xzIGJhciBzaG91bGQgYmUgZmFkZWQgc2hv dWxkIHRoZSB0cmFja3MgcGFuZWwgbm90IGJlIHZpc2libGUiKTsKICAgICAgICAgc2hvdWxkQmVG YWxzZSgibWVkaWFDb250cm9scy5jb250cm9sc0Jhci5mYWRlZCIpOwogCisgICAgICAgIGRlYnVn KCIiKTsKKyAgICAgICAgZGVidWcoIk5vdyBlbnRlciBhbmQgZXhpdCB0aGUgbWVkaWEgY29udHJv bHMsIHRoZSBjb250cm9scyBiYXIgc2hvdWxkIHJlbWFpbiB2aXNpYmxlIik7CisgICAgICAgIGV2 ZW50U2VuZGVyLm1vdXNlTW92ZVRvKDcwMCwgMTApOworICAgICAgICBldmVudFNlbmRlci5tb3Vz ZU1vdmVUbyg2NTAsIDEwKTsKKyAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oNzAwLCAx MCk7CisgICAgICAgIHNob3VsZEJlRmFsc2UoIm1lZGlhQ29udHJvbHMuY29udHJvbHNCYXIuZmFk ZWQiKTsKKwogICAgICAgICAvLyBBbmQgbm93IGRpc21pc3MgdGhlIHRyYWNrcyBwYW5lbCBhbmQg Y2hlY2sgdGhhdCB0aGUgY29udHJvbHMgYmFyCiAgICAgICAgIC8vIGZhZGVzIG91dCBhcyB3ZWxs LgogICAgICAgICBkZWJ1ZygiIik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rl cm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdHJhY2tzLXN1cHBvcnQtY2xpY2stdHJh Y2staW4tcGFuZWwuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1jbGljay10cmFjay1pbi1wYW5lbC5odG1s CmluZGV4IDQyNWE0ZjFkNWY5N2UwNTc1MTk1MDg0ZjkwZTA2ZWJiYTllNDdjMDUuLjY1ZTFlYWM5 YTcyMTQ5YzA3ZmE3NTdlZWNlMTk3MjU1MGU2NjBlMGUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9y dC1jbGljay10cmFjay1pbi1wYW5lbC5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVy bi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1jbGljay10cmFj ay1pbi1wYW5lbC5odG1sCkBAIC03Nyw3ICs3Nyw3IEBAIGZ1bmN0aW9uIGF1ZGlvVHJhY2tzRGlk Q2hhbmdlKCkKICAgICBkdW1wQXVkaW9UcmFja3NFbmFibGVkU3RhdGUoKTsKIAogICAgIGlmICht ZWRpYS5hdWRpb1RyYWNrc1sxXS5lbmFibGVkKQotICAgICAgICBzaGFkb3dSb290Lmxhc3RDaGls ZC5hZGRFdmVudExpc3RlbmVyKCJ0cmFuc2l0aW9uZW5kIiwgZXZlbnQgPT4gY2xpY2tPblRyYWNr c0J1dHRvbihjbGlja09uVGhpcmRBdWRpb1RyYWNrKSk7CisgICAgICAgIHNoYWRvd1Jvb3QucXVl cnlTZWxlY3RvcigiLnRyYWNrcy1wYW5lbCIpLmFkZEV2ZW50TGlzdGVuZXIoInRyYW5zaXRpb25l bmQiLCBldmVudCA9PiBjbGlja09uVHJhY2tzQnV0dG9uKGNsaWNrT25UaGlyZEF1ZGlvVHJhY2sp KTsKICAgICBlbHNlIGlmIChtZWRpYS5hdWRpb1RyYWNrc1syXS5lbmFibGVkKSB7CiAgICAgICAg IGRlYnVnKCIiKTsKICAgICAgICAgbWVkaWEucmVtb3ZlKCk7Cg== 305731 2017-03-29 07:20:15 -0700 2017-03-29 10:28:51 -0700 Patch bug-170239-20170329162013.patch text/plain 15094 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0NTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWU0OTAxOTBjNGM5Y2Nh ZTA3YmZlNzFkNjQ2MTcxODk1ZWMzODk5ZC4uZjIxZGM5NmQ0M2YwYWU2NTVhMWE0NGE3ZDlmMGVh OTM3NmJhMzRiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM5IEBACiAyMDE3LTAzLTI5ICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gQ29udHJvbHMgYmFyIG1heSBkaXNhcHBlYXIgd2hpbGUgY2FwdGlvbnMgbWVudSBp cyB2aXNpYmxlIChyZWR1eCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3MDIzOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzEzMjA2ODU+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgZGlkIHNvbWUg d29yayBpbiB3ZWJraXQub3JnL2IvMTY4NzUxIHRvIHByZXZlbnQgdGhlIGNvbnRyb2xzIGJhciBm cm9tIGRpc2FwcGVhcmluZyB3aGlsZSB0aGUKKyAgICAgICAgY2FwdGlvbnMgbWVudSBpcyB2aXNp YmxlLiBCdXQgdGhlcmUgd2VyZSB0d28gY2FzZXMgd2hlcmUgdGhlIGJlaGF2aW9yIHdhcyBub3Qg YXMgaW50ZW5kZWQ6CisKKyAgICAgICAgICAgIDEuIHRoZSBjb250cm9scyBiYXIgd291bGQgaGlk ZSB1cG9uIGV4aXRpbmcgdGhlIHZpZGVvLgorICAgICAgICAgICAgMi4gY2xpY2tpbmcgb24gdGhl IGNvbnRyb2xzIGJhciB3aGlsZSB0aGUgY2FwdGlvbiBwYW5lbCBpcyB1cCB3b3VsZCBoaWRlIHRo ZSBjb250cm9scyBiYXIKKyAgICAgICAgICAgICAgIGFzIHdlbGwgYXMgdGhlIGNhcHRpb25zIHBh bmVsLgorCisgICAgICAgIEluc3RlYWQgb2YgZGV0ZXJtaW5pbmcgdGhhdCB0aGUgInVzZXJJbnRl cmFjdGlvbkVuYWJsZWQiIHByb3BlcnR5IGJlaW5nIHNldCB0byAiZmFsc2UiIGlzIGluZGljYXRp dmUKKyAgICAgICAgb2Ygc2Vjb25kYXJ5IFVJLCBzdWNoIGFzIHRoZSB0cmFja3MgcGFuZWwsIGJl aW5nIGF0dGFjaGVkIHRvIHRoZSBjb250cm9scyBiYXIsIHdlIG5vdyBoYXZlIGFuCisgICAgICAg IGV4cGxpY2l0IHByb3BlcnR5IHRvIHNwZWNpZnkgdGhpcy4gTm93LCB3aGVuICJoYXNTZWNvbmRh cnlVSUF0dGFjaGVkIiBpcyAidHJ1ZSIsIHdlIHByZXZlbnQgdGhlCisgICAgICAgIGNvbnRyb2xz IGJhciBmcm9tIGZhZGluZyB3aGVuIGV4aXRpbmcgdGhlIG1lZGlhLgorCisgICAgICAgIEFkZGl0 aW9uYWxseSwgd2hlbiBkaXNtaXNzaW5nIHRoZSB0cmFja3MgcGFuZWwsIHdlIGNoZWNrIHdoZXRo ZXIgYSBtb3VzZSBldmVudCBsZWFkIHRvIHRoaXMgYW5kIGNoZWNrCisgICAgICAgIGlmIHRoZSBt b3VzZSB3YXMgcG9zaXRpb25lZCBvdmVyIHRoZSBjb250cm9scyBiYXIuIElmIHRoYXQgaXMgdGhl IGNhc2UsIHdlIG5vIGxvbmdlciBoaWRlIHRoZSBjb250cm9scworICAgICAgICBiYXIgYW5kIG9u bHkgZGlzbWlzcyB0aGUgdHJhY2tzIHBhbmVsLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL21vZGVy bi1tZWRpYS1jb250cm9scy90cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLWNvbnRyb2xzLWJhci1y ZW1haW5zLXZpc2libGUtYWZ0ZXItY2xpY2tpbmctb3Zlci1pdC5odG1sCisKKyAgICAgICAgKiBN b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9jb250cm9scy1iYXIuanM6Cisg ICAgICAgIChDb250cm9sc0Jhci5wcm90b3R5cGUuc2V0IHVzZXJJbnRlcmFjdGlvbkVuYWJsZWQp OgorICAgICAgICAoQ29udHJvbHNCYXIucHJvdG90eXBlLmhhbmRsZUV2ZW50KToKKyAgICAgICAg KENvbnRyb2xzQmFyLnByb3RvdHlwZS5fYXV0b0hpZGVUaW1lckZpcmVkKToKKyAgICAgICAgKiBN b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9tYWNvcy1tZWRpYS1jb250cm9s cy5qczoKKyAgICAgICAgKE1hY09TTWVkaWFDb250cm9scy5wcm90b3R5cGUuc2hvd1RyYWNrc1Bh bmVsKToKKyAgICAgICAgKE1hY09TTWVkaWFDb250cm9scy5wcm90b3R5cGUuaGlkZVRyYWNrc1Bh bmVsKToKKworMjAxNy0wMy0yOSAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgor CiAgICAgICAgIFttYWMtd2sxXSBMYXlvdXRUZXN0IG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy9haXJwbGF5LWJ1dHRvbi9haXJwbGF5LWJ1dHRvbi5odG1sIGlzIGEgZmxha3kgdGltZW91dAog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4NDA5CiAg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMDc5OTE5OD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2NvbnRyb2xzLWJhci5q cyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xz L2NvbnRyb2xzLWJhci5qcwppbmRleCAzNGMxZDg1MjQ4Y2U0ZTMyMWVlNDFlMmZmNWQ5YTYxYWE0 ZTVmYWY4Li5iNjQwZjYzZDRiMThlY2QzZTZjNDEwODgyMWQxNTIxNTYyOTM3MmUxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9s cy9jb250cm9scy1iYXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVk aWEtY29udHJvbHMvY29udHJvbHMvY29udHJvbHMtYmFyLmpzCkBAIC00MCw2ICs0MCw3IEBAIGNs YXNzIENvbnRyb2xzQmFyIGV4dGVuZHMgTGF5b3V0Tm9kZQogCiAgICAgICAgIHRoaXMuZmFkZXNX aGlsZUlkbGUgPSBmYWxzZTsKICAgICAgICAgdGhpcy51c2VySW50ZXJhY3Rpb25FbmFibGVkID0g dHJ1ZTsKKyAgICAgICAgdGhpcy5oYXNTZWNvbmRhcnlVSUF0dGFjaGVkID0gZmFsc2U7CiAKICAg ICAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzaW4iLCB0aGlzKTsKICAg ICB9CkBAIC03MiwxMCArNzMsNiBAQCBjbGFzcyBDb250cm9sc0JhciBleHRlbmRzIExheW91dE5v ZGUKIAogICAgICAgICB0aGlzLl91c2VySW50ZXJhY3Rpb25FbmFibGVkID0gZmxhZzsKICAgICAg ICAgdGhpcy5tYXJrRGlydHlQcm9wZXJ0eSgidXNlckludGVyYWN0aW9uRW5hYmxlZCIpOwotCi0g ICAgICAgIGlmICh0aGlzLl91c2VySW50ZXJhY3Rpb25FbmFibGVkICYmIHRoaXMuX2NvbnRyb2xz U2hvdWxkRmFkZVdoZW5Vc2VySW50ZXJhY3Rpb25CZWNvbWVzRW5hYmxlZCkKLSAgICAgICAgICAg IHRoaXMuZmFkZWQgPSB0cnVlOwotICAgICAgICBkZWxldGUgdGhpcy5fY29udHJvbHNTaG91bGRG YWRlV2hlblVzZXJJbnRlcmFjdGlvbkJlY29tZXNFbmFibGVkOwogICAgIH0KIAogICAgIGdldCBm YWRlc1doaWxlSWRsZSgpCkBAIC0xNjIsNyArMTU5LDcgQEAgY2xhc3MgQ29udHJvbHNCYXIgZXh0 ZW5kcyBMYXlvdXROb2RlCiAgICAgICAgICAgICBpZiAoZXZlbnQudHlwZSA9PT0gIm1vdXNlbW92 ZSIpIHsKICAgICAgICAgICAgICAgICB0aGlzLmZhZGVkID0gZmFsc2U7CiAgICAgICAgICAgICAg ICAgdGhpcy5fcmVzZXRBdXRvSGlkZVRpbWVyKHRydWUpOwotICAgICAgICAgICAgfSBlbHNlIGlm IChldmVudC50eXBlID09PSAibW91c2VsZWF2ZSIgJiYgdGhpcy5fZmFkZXNXaGlsZUlkbGUgJiYg IXRoaXMuX2VuZm9yY2VBdXRvSGlkZVRpbWVyKQorICAgICAgICAgICAgfSBlbHNlIGlmIChldmVu dC50eXBlID09PSAibW91c2VsZWF2ZSIgJiYgdGhpcy5fZmFkZXNXaGlsZUlkbGUgJiYgIXRoaXMu aGFzU2Vjb25kYXJ5VUlBdHRhY2hlZCAmJiAhdGhpcy5fZW5mb3JjZUF1dG9IaWRlVGltZXIpCiAg ICAgICAgICAgICAgICAgdGhpcy5mYWRlZCA9IHRydWU7CiAgICAgICAgIH0gZWxzZSBpZiAoZXZl bnQuY3VycmVudFRhcmdldCA9PT0gdGhpcy5lbGVtZW50KSB7CiAgICAgICAgICAgICBpZiAoZXZl bnQudHlwZSA9PT0gIm1vdXNlZW50ZXIiKSB7CkBAIC0yNDgsMTYgKzI0NSw3IEBAIGNsYXNzIENv bnRyb2xzQmFyIGV4dGVuZHMgTGF5b3V0Tm9kZQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAg ICAgIHRoaXMuX2NhbmNlbEF1dG9IaWRlVGltZXIoKTsKLSAgICAgICAgaWYgKCF0aGlzLl9mYWRl c1doaWxlSWRsZSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAvLyBXZSBkb24ndCB3 YW50IHRvIGZhZGUgdGhlIGNvbnRyb2xzIHdoZW4gdXNlciBpbnRlcmFjdGlvbiBiZWNvbWVzIGRp c2FibGVkCi0gICAgICAgIC8vIGJlY2F1c2Ugc2Vjb25kYXJ5IFVJIGF0dGFjaGVkIHRvIHRoZSBj b250cm9scyBpcyBiZWluZyBzaG93biBhbmQgd2Ugd2FudAotICAgICAgICAvLyB0byB3YWl0IHVu dGlsIGl0IG5vIGxvbmdlciBpcyB0byBmYWRlIHRoZSBjb250cm9scyBvdXQuCi0gICAgICAgIGlm ICghdGhpcy5fdXNlckludGVyYWN0aW9uRW5hYmxlZCkKLSAgICAgICAgICAgIHRoaXMuX2NvbnRy b2xzU2hvdWxkRmFkZVdoZW5Vc2VySW50ZXJhY3Rpb25CZWNvbWVzRW5hYmxlZCA9IHRydWU7Ci0g ICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRoaXMuZmFkZWQgPSB0cnVlOworICAgICAgICB0aGlz LmZhZGVkID0gdGhpcy5fZmFkZXNXaGlsZUlkbGUgJiYgIXRoaXMuaGFzU2Vjb25kYXJ5VUlBdHRh Y2hlZDsKICAgICB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL21hY29zLW1lZGlhLWNvbnRyb2xzLmpzIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3Mt bWVkaWEtY29udHJvbHMuanMKaW5kZXggOTE3ZjZkMzEyNzdiMDM2NDUzNmZjNDA5NWU2MjhhYjkz NzIxNGY4ZC4uOWVlNjQwNDgwNTU1NDYxYmI4ZTg5ZDA2MmM2NDgyYmU4YWI3N2JhOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJv bHMvbWFjb3MtbWVkaWEtY29udHJvbHMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t b2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvbWFjb3MtbWVkaWEtY29udHJvbHMuanMKQEAg LTQ4LDYgKzQ4LDcgQEAgY2xhc3MgTWFjT1NNZWRpYUNvbnRyb2xzIGV4dGVuZHMgTWVkaWFDb250 cm9scwogICAgICAgICB0aGlzLnRyYWNrc0J1dHRvbi5vbiA9IHRydWU7CiAgICAgICAgIHRoaXMu dHJhY2tzQnV0dG9uLmVsZW1lbnQuYmx1cigpOwogICAgICAgICB0aGlzLmNvbnRyb2xzQmFyLnVz ZXJJbnRlcmFjdGlvbkVuYWJsZWQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5jb250cm9sc0Jhci5o YXNTZWNvbmRhcnlVSUF0dGFjaGVkID0gdHJ1ZTsKICAgICAgICAgdGhpcy50cmFja3NQYW5lbC5w cmVzZW50SW5QYXJlbnQodGhpcyk7CiAKICAgICAgICAgY29uc3QgY29udHJvbHNCb3VuZHMgPSB0 aGlzLmVsZW1lbnQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CkBAIC02MCw5ICs2MSwxOSBAQCBj bGFzcyBNYWNPU01lZGlhQ29udHJvbHMgZXh0ZW5kcyBNZWRpYUNvbnRyb2xzCiAKICAgICBoaWRl VHJhY2tzUGFuZWwoKQogICAgIHsKKyAgICAgICAgbGV0IHNob3VsZEZhZGVDb250cm9sc0JhciA9 IHRydWU7CisgICAgICAgIGlmICh3aW5kb3cuZXZlbnQgaW5zdGFuY2VvZiBNb3VzZUV2ZW50KSB7 CisgICAgICAgICAgICBjb25zdCB4ID0gd2luZG93LmV2ZW50LmNsaWVudFg7CisgICAgICAgICAg ICBjb25zdCB5ID0gd2luZG93LmV2ZW50LmNsaWVudFk7CisgICAgICAgICAgICBjb25zdCBib3Vu ZHMgPSB0aGlzLmNvbnRyb2xzQmFyLmVsZW1lbnQuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7Cisg ICAgICAgICAgICBzaG91bGRGYWRlQ29udHJvbHNCYXIgPSB4IDwgYm91bmRzLmxlZnQgfHwgeCA+ IGJvdW5kcy5yaWdodCB8fCB5IDwgYm91bmRzLnRvcCB8fCB5ID4gYm91bmRzLmJvdHRvbTsKKyAg ICAgICAgfQorICAgICAgICAgICAgCiAgICAgICAgIHRoaXMudHJhY2tzQnV0dG9uLm9uID0gZmFs c2U7CiAgICAgICAgIHRoaXMudHJhY2tzQnV0dG9uLmVsZW1lbnQuZm9jdXMoKTsKICAgICAgICAg dGhpcy5jb250cm9sc0Jhci51c2VySW50ZXJhY3Rpb25FbmFibGVkID0gdHJ1ZTsKKyAgICAgICAg dGhpcy5jb250cm9sc0Jhci5oYXNTZWNvbmRhcnlVSUF0dGFjaGVkID0gZmFsc2U7CisgICAgICAg IHRoaXMuY29udHJvbHNCYXIuZmFkZWQgPSBzaG91bGRGYWRlQ29udHJvbHNCYXI7CiAgICAgICAg IHRoaXMudHJhY2tzUGFuZWwuaGlkZSgpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDc4MjMzODlkZjdjNzUy Yjc3OGJhNDFkODk3NjU1OTI1MDJjMzcyNTMuLjZjYzY4MDQyNTE2N2FmODgzMjIzYzBkNzdmMGRm NmZiY2YyNGQ3OWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxNy0wMy0yOSAgQW50b2luZSBR dWludCAgPGdyYW91dHNAYXBwbGUuY29tPgorCisgICAgICAgIFtNb2Rlcm4gTWVkaWEgQ29udHJv bHNdIENvbnRyb2xzIGJhciBtYXkgZGlzYXBwZWFyIHdoaWxlIGNhcHRpb25zIG1lbnUgaXMgdmlz aWJsZSAocmVkdXgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNzAyMzkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMxMzIwNjg1PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlIGV4dGVuZCBhbiBleGlz dGluZyB0ZXN0IHRvIGNvdmVyIHRoZSBjYXNlIHdoZXJlIHdlIHdvdWxkIGhpZGUgdGhlIGNvbnRy b2xzIGJhciB3aGlsZSB0aGUgdHJhY2tzIHBhbmVsCisgICAgICAgIGlzIHVwIGJ5IG1vdXNpbmcg b3V0IG9mIHRoZSBtZWRpYS4gV2UgYWxzbyBhZGQgYSBuZXcgdGVzdCB3aGVyZSB3ZSBjaGVjayB0 aGF0IGNsaWNraW5nIG92ZXIgdGhlIGNvbnRyb2xzCisgICAgICAgIGJhciB0byBkaXNtaXNzIHRo ZSB0cmFja3MgcGFuZWwgZG9lcyBub3QgaGlkZSB0aGUgY29udHJvbHMgYmFyLiBGaW5hbGx5LCB3 ZSBtYWtlIGEgc21hbGwgY2hhbmdlIHRvIGFuCisgICAgICAgIGV4aXN0aW5nIHRlc3QgdG8gbGlz dGVuIHRvICJ0cmFuc2l0aW9uZW5kIiBldmVudCBvbiB0aGUgdHJhY2tzIHBhbmVsIHNwZWNpZmlj YWxseSBzaW5jZSB3aXRoIHRoaXMgcGF0Y2gKKyAgICAgICAgdGhlIGNvbnRyb2xzIGJhciB3b3Vs ZCBkaXNhcHBlYXIgYW5kIHRyaWdnZXIgYSBzaW1pbGFyIGV2ZW50IHdoZW4gZGlzYXBwZWFyaW5n IGFzIHRoZSB0cmFja3MgcGFuZWwgaXMgZGlzbWlzc2VkLgorCisgICAgICAgICogbWVkaWEvbW9k ZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1wYW5lbC90cmFja3MtcGFuZWwtY29udHJvbHMtYmFy LXJlbWFpbnMtdmlzaWJsZS1hZnRlci1jbGlja2luZy1vdmVyLWl0LWV4cGVjdGVkLnR4dDogQWRk ZWQuCisgICAgICAgICogbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1wYW5lbC90 cmFja3MtcGFuZWwtY29udHJvbHMtYmFyLXJlbWFpbnMtdmlzaWJsZS1hZnRlci1jbGlja2luZy1v dmVyLWl0Lmh0bWw6IEFkZGVkLgorICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy90cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLXByZXZlbnQtY29udHJvbHMtYmFyLWZyb20tZmFk aW5nLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMv dHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5lbC1wcmV2ZW50LWNvbnRyb2xzLWJhci1mcm9tLWZhZGlu Zy5odG1sOgorICAgICAgICAqIG1lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3Vw cG9ydC90cmFja3Mtc3VwcG9ydC1jbGljay10cmFjay1pbi1wYW5lbC5odG1sOgorCiAyMDE3LTAz LTI4ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtXZWJSVENdIFVwZGF0ZSB0ZXN0IFJUQ1BlZXJDb25uZWN0aW9uLW92ZXJsb2FkZWQt b3BlcmF0aW9ucy1wYXJhbXMuaHRtbCBhZnRlciByMjE0NDQxCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5l bC1jb250cm9scy1iYXItcmVtYWlucy12aXNpYmxlLWFmdGVyLWNsaWNraW5nLW92ZXItaXQtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNr cy1wYW5lbC90cmFja3MtcGFuZWwtY29udHJvbHMtYmFyLXJlbWFpbnMtdmlzaWJsZS1hZnRlci1j bGlja2luZy1vdmVyLWl0LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41ZjYxYjg1NWY4ZmZkYWZk YWQ4MDAzYjAzYjY1OTk5NGEzNTgxMGE1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv bWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1wYW5lbC90cmFja3MtcGFuZWwtY29u dHJvbHMtYmFyLXJlbWFpbnMtdmlzaWJsZS1hZnRlci1jbGlja2luZy1vdmVyLWl0LWV4cGVjdGVk LnR4dApAQCAtMCwwICsxLDE5IEBACitDbGlja2luZyBvbiB0aGUgY29udHJvbHMgYmFyIHRvIGRp c21pc3MgdGhlIHRyYWNrcyBwYW5lbCBzaG91bGQgbm90IGhpZGUgdGhlIGNvbnRyb2xzIGJhciwg b25seSB0aGUgdHJhY2sgcGFuZWwuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmll cyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitt ZWRpYUNvbnRyb2xzLnNob3dUcmFja3NQYW5lbCgpCitQQVNTIG1lZGlhQ29udHJvbHMudHJhY2tz UGFuZWwuZWxlbWVudC5wYXJlbnROb2RlIGJlY2FtZSBtZWRpYUNvbnRyb2xzLmVsZW1lbnQKKwor V2UndmUgd2FpdGVkIGxvbmcgZW5vdWdoIHNvIHRoYXQgdGhlIGNvbnRyb2xzIGJhciBzaG91bGQg YmUgZmFkZWQgc2hvdWxkIHRoZSB0cmFja3MgcGFuZWwgbm90IGJlIHZpc2libGUKK1BBU1MgbWVk aWFDb250cm9scy5jb250cm9sc0Jhci5mYWRlZCBpcyBmYWxzZQorCitDbGljayBvbiB0aGUgY29u dHJvbHMgYmFyIHRvIGRpc21pc3MgdGhlIHBhbmVsLCB0aGUgY29udHJvbHMgYmFyIHNob3VsZCBy ZW1haW4gdmlzaWJsZQorUEFTUyBtZWRpYUNvbnRyb2xzLmNvbnRyb2xzQmFyLmZhZGVkIGlzIGZh bHNlCitQQVNTIG1lZGlhQ29udHJvbHMudHJhY2tzUGFuZWwucHJlc2VudGVkIGlzIGZhbHNlCisK K1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXBh bmVsL3RyYWNrcy1wYW5lbC1jb250cm9scy1iYXItcmVtYWlucy12aXNpYmxlLWFmdGVyLWNsaWNr aW5nLW92ZXItaXQuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9s cy90cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLWNvbnRyb2xzLWJhci1yZW1haW5zLXZpc2libGUt YWZ0ZXItY2xpY2tpbmctb3Zlci1pdC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjkwMmMwYzI1OTNjZGFjNmE0 NzBiMTgwZTYzZTRhODAxMzZlMTQ5MDcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9t ZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5lbC1jb250 cm9scy1iYXItcmVtYWlucy12aXNpYmxlLWFmdGVyLWNsaWNraW5nLW92ZXItaXQuaHRtbApAQCAt MCwwICsxLDU1IEBACis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJl LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvbWVkaWEtY29udHJvbHMt bG9hZGVyLmpzIiB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPjwvc2NyaXB0PgorPGJvZHk+Cis8c3R5 bGUgdHlwZT0idGV4dC9jc3MiIG1lZGlhPSJzY3JlZW4iPgorICAgIAorICAgIC5tZWRpYS1jb250 cm9scyB7CisgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICAgICAgdG9wOiAwOworICAg ICAgICBsZWZ0OiAwOworICAgIH0KKyAgICAKKzwvc3R5bGU+Cis8c2NyaXB0IHR5cGU9InRleHQv amF2YXNjcmlwdCI+CisKK3dpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKworZGVzY3JpcHRp b24oIkNsaWNraW5nIG9uIHRoZSBjb250cm9scyBiYXIgdG8gZGlzbWlzcyB0aGUgdHJhY2tzIHBh bmVsIHNob3VsZCBub3QgaGlkZSB0aGUgY29udHJvbHMgYmFyLCBvbmx5IHRoZSB0cmFjayBwYW5l bC4iKTsKKworY29uc3QgbWVkaWFDb250cm9scyA9IG5ldyBNYWNPU0lubGluZU1lZGlhQ29udHJv bHMoeyB3aWR0aDogNjgwLCBoZWlnaHQ6IDMwMCB9KTsKKworZG9jdW1lbnQuYm9keS5hcHBlbmRD aGlsZChtZWRpYUNvbnRyb2xzLmVsZW1lbnQpOworCitsZXQgdHJhY2tFbGVtZW50OworCittZWRp YUNvbnRyb2xzLmNvbnRyb2xzQmFyLmF1dG9IaWRlRGVsYXkgPSAyNTA7CittZWRpYUNvbnRyb2xz LmNvbnRyb2xzQmFyLmZhZGVzV2hpbGVJZGxlID0gdHJ1ZTsKKworZGVidWcoIm1lZGlhQ29udHJv bHMuc2hvd1RyYWNrc1BhbmVsKCkiKTsKK21lZGlhQ29udHJvbHMuc2hvd1RyYWNrc1BhbmVsKCk7 CisKK3Nob3VsZEJlY29tZUVxdWFsKCJtZWRpYUNvbnRyb2xzLnRyYWNrc1BhbmVsLmVsZW1lbnQu cGFyZW50Tm9kZSIsICJtZWRpYUNvbnRyb2xzLmVsZW1lbnQiLCAoKSA9PiB7CisgICAgLy8gTGV0 J3Mgd2FpdCBhIHdoaWxlIHRvIHNlZSB0aGF0IHRoZSBjb250cm9scyBiYXIgaXMgc3RpbGwgdmlz aWJsZS4KKyAgICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAgZGVidWcoIiIpOworICAgICAg ICBkZWJ1ZygiV2UndmUgd2FpdGVkIGxvbmcgZW5vdWdoIHNvIHRoYXQgdGhlIGNvbnRyb2xzIGJh ciBzaG91bGQgYmUgZmFkZWQgc2hvdWxkIHRoZSB0cmFja3MgcGFuZWwgbm90IGJlIHZpc2libGUi KTsKKyAgICAgICAgc2hvdWxkQmVGYWxzZSgibWVkaWFDb250cm9scy5jb250cm9sc0Jhci5mYWRl ZCIpOworCisgICAgICAgIGRlYnVnKCIiKTsKKyAgICAgICAgZGVidWcoIkNsaWNrIG9uIHRoZSBj b250cm9scyBiYXIgdG8gZGlzbWlzcyB0aGUgcGFuZWwsIHRoZSBjb250cm9scyBiYXIgc2hvdWxk IHJlbWFpbiB2aXNpYmxlIik7CisgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKDY3MCwg MjkwKTsKKyAgICAgICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7CisgICAgICAgIGV2ZW50U2Vu ZGVyLm1vdXNlVXAoKTsKKworICAgICAgICBzaG91bGRCZUZhbHNlKCJtZWRpYUNvbnRyb2xzLmNv bnRyb2xzQmFyLmZhZGVkIik7CisgICAgICAgIHNob3VsZEJlRmFsc2UoIm1lZGlhQ29udHJvbHMu dHJhY2tzUGFuZWwucHJlc2VudGVkIik7CisKKyAgICAgICAgZGVidWcoIiIpOworICAgICAgICBt ZWRpYUNvbnRyb2xzLmVsZW1lbnQucmVtb3ZlKCk7CisgICAgICAgIGZpbmlzaEpTVGVzdCgpOwor ICAgIH0sIG1lZGlhQ29udHJvbHMuY29udHJvbHNCYXIuYXV0b0hpZGVEZWxheSk7Cit9KTsKKwor PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5q cyI+PC9zY3JpcHQ+Cis8L2JvZHk+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rl cm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5lbC1wcmV2ZW50LWNvbnRy b2xzLWJhci1mcm9tLWZhZGluZy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rl cm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXBhbmVsL3RyYWNrcy1wYW5lbC1wcmV2ZW50LWNvbnRy b2xzLWJhci1mcm9tLWZhZGluZy1leHBlY3RlZC50eHQKaW5kZXggODNlNmUzNWU0MTEzNTgzNDkx MWJhNDk2MzQ5ODM4MTlhZmYzM2M1My4uMTdkOTljM2E2MmQzZDUxZDVlMzE0NDJiMDdiNWFiNGE3 NjZhZWEwYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL3RyYWNrcy1wYW5lbC90cmFja3MtcGFuZWwtcHJldmVudC1jb250cm9scy1iYXItZnJvbS1m YWRpbmctZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1j b250cm9scy90cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLXByZXZlbnQtY29udHJvbHMtYmFyLWZy b20tZmFkaW5nLWV4cGVjdGVkLnR4dApAQCAtOSw2ICs5LDkgQEAgUEFTUyBtZWRpYUNvbnRyb2xz LnRyYWNrc1BhbmVsLmVsZW1lbnQucGFyZW50Tm9kZSBiZWNhbWUgbWVkaWFDb250cm9scy5lbGVt ZW50CiBXZSd2ZSB3YWl0ZWQgbG9uZyBlbm91Z2ggc28gdGhhdCB0aGUgY29udHJvbHMgYmFyIHNo b3VsZCBiZSBmYWRlZCBzaG91bGQgdGhlIHRyYWNrcyBwYW5lbCBub3QgYmUgdmlzaWJsZQogUEFT UyBtZWRpYUNvbnRyb2xzLmNvbnRyb2xzQmFyLmZhZGVkIGlzIGZhbHNlCiAKK05vdyBlbnRlciBh bmQgZXhpdCB0aGUgbWVkaWEgY29udHJvbHMsIHRoZSBjb250cm9scyBiYXIgc2hvdWxkIHJlbWFp biB2aXNpYmxlCitQQVNTIG1lZGlhQ29udHJvbHMuY29udHJvbHNCYXIuZmFkZWQgaXMgZmFsc2UK KwogbWVkaWFDb250cm9scy5oaWRlVHJhY2tzUGFuZWwoKQogUEFTUyBtZWRpYUNvbnRyb2xzLmNv bnRyb2xzQmFyLmZhZGVkIGlzIHRydWUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEv bW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1wYW5lbC90cmFja3MtcGFuZWwtcHJldmVudC1j b250cm9scy1iYXItZnJvbS1mYWRpbmcuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1t ZWRpYS1jb250cm9scy90cmFja3MtcGFuZWwvdHJhY2tzLXBhbmVsLXByZXZlbnQtY29udHJvbHMt YmFyLWZyb20tZmFkaW5nLmh0bWwKaW5kZXggMzFlNWRhZTI2ZmU3ODc1MTg1MWQ4ZjkxZWY0YWRm MTAzMTJjNjcwNy4uMmVlODk4OWM3YWY2ZWNkNWNhZGI0Zjc2ODNiNmEzODc1ZTAwYmJhYSAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvbWVkaWEvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL3RyYWNrcy1w YW5lbC90cmFja3MtcGFuZWwtcHJldmVudC1jb250cm9scy1iYXItZnJvbS1mYWRpbmcuaHRtbAor KysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXBhbmVs L3RyYWNrcy1wYW5lbC1wcmV2ZW50LWNvbnRyb2xzLWJhci1mcm9tLWZhZGluZy5odG1sCkBAIC0z NSw2ICszNSwxMyBAQCBzaG91bGRCZWNvbWVFcXVhbCgibWVkaWFDb250cm9scy50cmFja3NQYW5l bC5lbGVtZW50LnBhcmVudE5vZGUiLCAibWVkaWFDb250cm9scwogICAgICAgICBkZWJ1ZygiV2Un dmUgd2FpdGVkIGxvbmcgZW5vdWdoIHNvIHRoYXQgdGhlIGNvbnRyb2xzIGJhciBzaG91bGQgYmUg ZmFkZWQgc2hvdWxkIHRoZSB0cmFja3MgcGFuZWwgbm90IGJlIHZpc2libGUiKTsKICAgICAgICAg c2hvdWxkQmVGYWxzZSgibWVkaWFDb250cm9scy5jb250cm9sc0Jhci5mYWRlZCIpOwogCisgICAg ICAgIGRlYnVnKCIiKTsKKyAgICAgICAgZGVidWcoIk5vdyBlbnRlciBhbmQgZXhpdCB0aGUgbWVk aWEgY29udHJvbHMsIHRoZSBjb250cm9scyBiYXIgc2hvdWxkIHJlbWFpbiB2aXNpYmxlIik7Cisg ICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKDcwMCwgMTApOworICAgICAgICBldmVudFNl bmRlci5tb3VzZU1vdmVUbyg2NTAsIDEwKTsKKyAgICAgICAgZXZlbnRTZW5kZXIubW91c2VNb3Zl VG8oNzAwLCAxMCk7CisgICAgICAgIHNob3VsZEJlRmFsc2UoIm1lZGlhQ29udHJvbHMuY29udHJv bHNCYXIuZmFkZWQiKTsKKwogICAgICAgICAvLyBBbmQgbm93IGRpc21pc3MgdGhlIHRyYWNrcyBw YW5lbCBhbmQgY2hlY2sgdGhhdCB0aGUgY29udHJvbHMgYmFyCiAgICAgICAgIC8vIGZhZGVzIG91 dCBhcyB3ZWxsLgogICAgICAgICBkZWJ1ZygiIik7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9t ZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMvdHJhY2tzLXN1cHBvcnQvdHJhY2tzLXN1cHBvcnQt Y2xpY2stdHJhY2staW4tcGFuZWwuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRp YS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1jbGljay10cmFjay1pbi1w YW5lbC5odG1sCmluZGV4IDQyNWE0ZjFkNWY5N2UwNTc1MTk1MDg0ZjkwZTA2ZWJiYTllNDdjMDUu LjY1ZTFlYWM5YTcyMTQ5YzA3ZmE3NTdlZWNlMTk3MjU1MGU2NjBlMGUgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL21lZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90cmFj a3Mtc3VwcG9ydC1jbGljay10cmFjay1pbi1wYW5lbC5odG1sCisrKyBiL0xheW91dFRlc3RzL21l ZGlhL21vZGVybi1tZWRpYS1jb250cm9scy90cmFja3Mtc3VwcG9ydC90cmFja3Mtc3VwcG9ydC1j bGljay10cmFjay1pbi1wYW5lbC5odG1sCkBAIC03Nyw3ICs3Nyw3IEBAIGZ1bmN0aW9uIGF1ZGlv VHJhY2tzRGlkQ2hhbmdlKCkKICAgICBkdW1wQXVkaW9UcmFja3NFbmFibGVkU3RhdGUoKTsKIAog ICAgIGlmIChtZWRpYS5hdWRpb1RyYWNrc1sxXS5lbmFibGVkKQotICAgICAgICBzaGFkb3dSb290 Lmxhc3RDaGlsZC5hZGRFdmVudExpc3RlbmVyKCJ0cmFuc2l0aW9uZW5kIiwgZXZlbnQgPT4gY2xp Y2tPblRyYWNrc0J1dHRvbihjbGlja09uVGhpcmRBdWRpb1RyYWNrKSk7CisgICAgICAgIHNoYWRv d1Jvb3QucXVlcnlTZWxlY3RvcigiLnRyYWNrcy1wYW5lbCIpLmFkZEV2ZW50TGlzdGVuZXIoInRy YW5zaXRpb25lbmQiLCBldmVudCA9PiBjbGlja09uVHJhY2tzQnV0dG9uKGNsaWNrT25UaGlyZEF1 ZGlvVHJhY2spKTsKICAgICBlbHNlIGlmIChtZWRpYS5hdWRpb1RyYWNrc1syXS5lbmFibGVkKSB7 CiAgICAgICAgIGRlYnVnKCIiKTsKICAgICAgICAgbWVkaWEucmVtb3ZlKCk7Cg==