ZGlmZiAtLWdpdCBhL2RpY3Rpb25hcmllcy9ydV93b3JkbGlzdC5jb21iaW5lZC5neiBiL2RpY3Rpb25hcmllcy9ydV93b3JkbGlzdC5jb21iaW5lZC5negppbmRleCAyNTNjNTE1Li44NmY5NTA2IDEwMDY0NAotLS0gYS9kaWN0aW9uYXJpZXMvcnVfd29yZGxpc3QuY29tYmluZWQuZ3oKKysrIGIvZGljdGlvbmFyaWVzL3J1X3dvcmRsaXN0LmNvbWJpbmVkLmd6CkJpbmFyeSBmaWxlcyBkaWZmZXIKZGlmZiAtLWdpdCBhL2phdmEvQW5kcm9pZE1hbmlmZXN0LnhtbCBiL2phdmEvQW5kcm9pZE1hbmlmZXN0LnhtbAppbmRleCAxN2QxMWMwLi4yMjczMzk0IDEwMDY0NAotLS0gYS9qYXZhL0FuZHJvaWRNYW5pZmVzdC54bWwKKysrIGIvamF2YS9BbmRyb2lkTWFuaWZlc3QueG1sCkBAIC0yOSwxMyArMjksMTMgQEAKICAgICA8dXNlcy1wZXJtaXNzaW9uIGFuZHJvaWQ6bmFtZT0iYW5kcm9pZC5wZXJtaXNzaW9uLldSSVRFX0VYVEVSTkFMX1NUT1JBR0UiIC8+CiAgICAgPHVzZXMtcGVybWlzc2lvbiBhbmRyb2lkOm5hbWU9ImFuZHJvaWQucGVybWlzc2lvbi5ET1dOTE9BRF9XSVRIT1VUX05PVElGSUNBVElPTiIgLz4KIAotICAgIDxhcHBsaWNhdGlvbiBhbmRyb2lkOmxhYmVsPSJAc3RyaW5nL2Fvc3BfYW5kcm9pZF9rZXlib2FyZF9pbWVfbmFtZSIKKyAgICA8YXBwbGljYXRpb24gYW5kcm9pZDpsYWJlbD0iQHN0cmluZy9lbmdsaXNoX2ltZV9uYW1lIgogICAgICAgICAgICAgYW5kcm9pZDppY29uPSJAbWlwbWFwL2ljX2ltZV9zZXR0aW5ncyIKICAgICAgICAgICAgIGFuZHJvaWQ6a2lsbEFmdGVyUmVzdG9yZT0iZmFsc2UiCiAgICAgICAgICAgICBhbmRyb2lkOnN1cHBvcnRzUnRsPSJ0cnVlIj4KIAogICAgICAgICA8c2VydmljZSBhbmRyb2lkOm5hbWU9IkxhdGluSU1FIgotICAgICAgICAgICAgICAgIGFuZHJvaWQ6bGFiZWw9IkBzdHJpbmcvYW9zcF9hbmRyb2lkX2tleWJvYXJkX2ltZV9uYW1lIgorICAgICAgICAgICAgICAgIGFuZHJvaWQ6bGFiZWw9IkBzdHJpbmcvZW5nbGlzaF9pbWVfbmFtZSIKICAgICAgICAgICAgICAgICBhbmRyb2lkOnBlcm1pc3Npb249ImFuZHJvaWQucGVybWlzc2lvbi5CSU5EX0lOUFVUX01FVEhPRCI+CiAgICAgICAgICAgICA8aW50ZW50LWZpbHRlcj4KICAgICAgICAgICAgICAgICA8YWN0aW9uIGFuZHJvaWQ6bmFtZT0iYW5kcm9pZC52aWV3LklucHV0TWV0aG9kIiAvPgpAQCAtNDQsNyArNDQsNyBAQAogICAgICAgICA8L3NlcnZpY2U+CiAKICAgICAgICAgPHNlcnZpY2UgYW5kcm9pZDpuYW1lPSIuc3BlbGxjaGVjay5BbmRyb2lkU3BlbGxDaGVja2VyU2VydmljZSIKLSAgICAgICAgICAgICAgICAgYW5kcm9pZDpsYWJlbD0iQHN0cmluZy9hb3NwX3NwZWxsX2NoZWNrZXJfc2VydmljZV9uYW1lIgorICAgICAgICAgICAgICAgICBhbmRyb2lkOmxhYmVsPSJAc3RyaW5nL3NwZWxsX2NoZWNrZXJfc2VydmljZV9uYW1lIgogICAgICAgICAgICAgICAgICBhbmRyb2lkOnBlcm1pc3Npb249ImFuZHJvaWQucGVybWlzc2lvbi5CSU5EX1RFWFRfU0VSVklDRSI+CiAgICAgICAgICAgICA8aW50ZW50LWZpbHRlcj4KICAgICAgICAgICAgICAgICA8YWN0aW9uIGFuZHJvaWQ6bmFtZT0iYW5kcm9pZC5zZXJ2aWNlLnRleHRzZXJ2aWNlLlNwZWxsQ2hlY2tlclNlcnZpY2UiIC8+CkBAIC01Myw3ICs1Myw3IEBACiAgICAgICAgIDwvc2VydmljZT4KIAogICAgICAgICA8YWN0aXZpdHkgYW5kcm9pZDpuYW1lPSIuc2V0dXAuU2V0dXBBY3Rpdml0eSIKLSAgICAgICAgICAgICAgICBhbmRyb2lkOmxhYmVsPSJAc3RyaW5nL2Fvc3BfYW5kcm9pZF9rZXlib2FyZF9pbWVfbmFtZSIKKyAgICAgICAgICAgICAgICBhbmRyb2lkOmxhYmVsPSJAc3RyaW5nL2VuZ2xpc2hfaW1lX25hbWUiCiAgICAgICAgICAgICAgICAgYW5kcm9pZDppY29uPSJAZHJhd2FibGUvaWNfc2V0dXBfd2l6YXJkIj4KICAgICAgICAgICAgIDxpbnRlbnQtZmlsdGVyPgogICAgICAgICAgICAgICAgIDxhY3Rpb24gYW5kcm9pZDpuYW1lPSJhbmRyb2lkLmludGVudC5hY3Rpb24uTUFJTiIgLz4KQEAgLTY5LDcgKzY5LDcgQEAKICAgICAgICAgICAgIDwvaW50ZW50LWZpbHRlcj4KICAgICAgICAgPC9yZWNlaXZlcj4KIAotICAgICAgICA8YWN0aXZpdHkgYW5kcm9pZDpuYW1lPSJTZXR0aW5nc0FjdGl2aXR5IiBhbmRyb2lkOmxhYmVsPSJAc3RyaW5nL2Fvc3BfYW5kcm9pZF9rZXlib2FyZF9pbWVfc2V0dGluZ3MiCisgICAgICAgIDxhY3Rpdml0eSBhbmRyb2lkOm5hbWU9IlNldHRpbmdzQWN0aXZpdHkiIGFuZHJvaWQ6bGFiZWw9IkBzdHJpbmcvZW5nbGlzaF9pbWVfc2V0dGluZ3MiCiAgICAgICAgICAgICAgICAgICBhbmRyb2lkOnVpT3B0aW9ucz0ic3BsaXRBY3Rpb25CYXJXaGVuTmFycm93Ij4KICAgICAgICAgICAgIDxpbnRlbnQtZmlsdGVyPgogICAgICAgICAgICAgICAgIDxhY3Rpb24gYW5kcm9pZDpuYW1lPSJhbmRyb2lkLmludGVudC5hY3Rpb24uTUFJTiIgLz4KQEAgLTc3LDcgKzc3LDcgQEAKICAgICAgICAgPC9hY3Rpdml0eT4KIAogICAgICAgICA8YWN0aXZpdHkgYW5kcm9pZDpuYW1lPSJjb20uYW5kcm9pZC5pbnB1dG1ldGhvZC5sYXRpbi5zcGVsbGNoZWNrLlNwZWxsQ2hlY2tlclNldHRpbmdzQWN0aXZpdHkiCi0gICAgICAgICAgICAgICAgICBhbmRyb2lkOmxhYmVsPSJAc3RyaW5nL2Fvc3BfYW5kcm9pZF9zcGVsbF9jaGVja2VyX3NlcnZpY2Vfc2V0dGluZ3MiPgorICAgICAgICAgICAgICAgICAgYW5kcm9pZDpsYWJlbD0iQHN0cmluZy9hbmRyb2lkX3NwZWxsX2NoZWNrZXJfc2V0dGluZ3MiPgogICAgICAgICAgICAgPGludGVudC1maWx0ZXI+CiAgICAgICAgICAgICAgICAgPGFjdGlvbiBhbmRyb2lkOm5hbWU9ImFuZHJvaWQuaW50ZW50LmFjdGlvbi5NQUlOIiAvPgogICAgICAgICAgICAgPC9pbnRlbnQtZmlsdGVyPgpkaWZmIC0tZ2l0IGEvamF2YS9yZXMvbGF5b3V0L3VzZXJfZGljdGlvbmFyeV9pdGVtLnhtbCBiL2phdmEvcmVzL2xheW91dC91c2VyX2RpY3Rpb25hcnlfaXRlbS54bWwKaW5kZXggMzA2MmVkOC4uNTZiYWQ3NyAxMDA2NDQKLS0tIGEvamF2YS9yZXMvbGF5b3V0L3VzZXJfZGljdGlvbmFyeV9pdGVtLnhtbAorKysgYi9qYXZhL3Jlcy9sYXlvdXQvdXNlcl9kaWN0aW9uYXJ5X2l0ZW0ueG1sCkBAIC0xMyw0MCArMTMsMzkgQEAKICAgICAgU2VlIHRoZSBMaWNlbnNlIGZvciB0aGUgc3BlY2lmaWMgbGFuZ3VhZ2UgZ292ZXJuaW5nIHBlcm1pc3Npb25zIGFuZAogICAgICBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KIC0tPgotCiA8TGluZWFyTGF5b3V0IHhtbG5zOmFuZHJvaWQ9Imh0dHA6Ly9zY2hlbWFzLmFuZHJvaWQuY29tL2Fway9yZXMvYW5kcm9pZCIKICAgICBhbmRyb2lkOmxheW91dF93aWR0aD0ibWF0Y2hfcGFyZW50IgogICAgIGFuZHJvaWQ6bGF5b3V0X2hlaWdodD0id3JhcF9jb250ZW50IgotICAgIGFuZHJvaWQ6bWluSGVpZ2h0PSI/YW5kcm9pZDphdHRyL2xpc3RQcmVmZXJyZWRJdGVtSGVpZ2h0IgorICAgIGFuZHJvaWQ6YmFja2dyb3VuZD0iP2FuZHJvaWQ6YXR0ci9zZWxlY3RhYmxlSXRlbUJhY2tncm91bmQiCiAgICAgYW5kcm9pZDpncmF2aXR5PSJjZW50ZXJfdmVydGljYWwiCi0gICAgYW5kcm9pZDpwYWRkaW5nRW5kPSI/YW5kcm9pZDphdHRyL3Njcm9sbGJhclNpemUiCi0gICAgYW5kcm9pZDpiYWNrZ3JvdW5kPSI/YW5kcm9pZDphdHRyL3NlbGVjdGFibGVJdGVtQmFja2dyb3VuZCIgPgorICAgIGFuZHJvaWQ6bWluSGVpZ2h0PSI/YW5kcm9pZDphdHRyL2xpc3RQcmVmZXJyZWRJdGVtSGVpZ2h0IgorICAgIGFuZHJvaWQ6cGFkZGluZ0VuZD0iP2FuZHJvaWQ6YXR0ci9zY3JvbGxiYXJTaXplIiA+CiAKLSAgPFJlbGF0aXZlTGF5b3V0IGFuZHJvaWQ6bGF5b3V0X3dpZHRoPSJ3cmFwX2NvbnRlbnQiCi0gICAgICAgICAgICAgICAgICBhbmRyb2lkOmxheW91dF9oZWlnaHQ9IndyYXBfY29udGVudCIKLSAgICAgICAgICAgICAgICAgIGFuZHJvaWQ6bGF5b3V0X21hcmdpblN0YXJ0PSIxNWRpcCIKLSAgICAgICAgICAgICAgICAgIGFuZHJvaWQ6bGF5b3V0X21hcmdpbkVuZD0iNmRpcCIKLSAgICAgICAgICAgICAgICAgIGFuZHJvaWQ6bGF5b3V0X21hcmdpblRvcD0iNmRpcCIKLSAgICAgICAgICAgICAgICAgIGFuZHJvaWQ6bGF5b3V0X21hcmdpbkJvdHRvbT0iNmRpcCIKLSAgICAgICAgICAgICAgICAgIGFuZHJvaWQ6bGF5b3V0X3dlaWdodD0iMSI+CisgICAgPFJlbGF0aXZlTGF5b3V0CisgICAgICAgIGFuZHJvaWQ6bGF5b3V0X3dpZHRoPSJ3cmFwX2NvbnRlbnQiCisgICAgICAgIGFuZHJvaWQ6bGF5b3V0X2hlaWdodD0id3JhcF9jb250ZW50IgorICAgICAgICBhbmRyb2lkOnBhZGRpbmc9IjZkaXAiCisgICAgICAgIGFuZHJvaWQ6bGF5b3V0X3dlaWdodD0iMSIgPgogCi0gICAgPFRleHRWaWV3IGFuZHJvaWQ6aWQ9IkArYW5kcm9pZDppZC90ZXh0MSIKLSAgICAgICAgICAgICAgYW5kcm9pZDpsYXlvdXRfd2lkdGg9IndyYXBfY29udGVudCIKLSAgICAgICAgICAgICAgYW5kcm9pZDpsYXlvdXRfaGVpZ2h0PSJ3cmFwX2NvbnRlbnQiCi0gICAgICAgICAgICAgIGFuZHJvaWQ6c2luZ2xlTGluZT0idHJ1ZSIKLSAgICAgICAgICAgICAgYW5kcm9pZDp0ZXh0QXBwZWFyYW5jZT0iP2FuZHJvaWQ6YXR0ci90ZXh0QXBwZWFyYW5jZU1lZGl1bSIKLSAgICAgICAgICAgICAgYW5kcm9pZDplbGxpcHNpemU9Im1hcnF1ZWUiCi0gICAgICAgICAgICAgIGFuZHJvaWQ6ZmFkaW5nRWRnZT0iaG9yaXpvbnRhbCIgLz4KKyAgICAgICAgPFRleHRWaWV3CisgICAgICAgICAgICBhbmRyb2lkOmlkPSJAK2FuZHJvaWQ6aWQvdGV4dDEiCisgICAgICAgICAgICBhbmRyb2lkOmxheW91dF93aWR0aD0id3JhcF9jb250ZW50IgorICAgICAgICAgICAgYW5kcm9pZDpsYXlvdXRfaGVpZ2h0PSJ3cmFwX2NvbnRlbnQiCisgICAgICAgICAgICBhbmRyb2lkOmVsbGlwc2l6ZT0ibWFycXVlZSIKKyAgICAgICAgICAgIGFuZHJvaWQ6ZmFkaW5nRWRnZT0iaG9yaXpvbnRhbCIKKyAgICAgICAgICAgIGFuZHJvaWQ6c2luZ2xlTGluZT0idHJ1ZSIKKyAgICAgICAgICAgIGFuZHJvaWQ6dGV4dEFwcGVhcmFuY2U9Ij9hbmRyb2lkOmF0dHIvdGV4dEFwcGVhcmFuY2VNZWRpdW0iIC8+CiAKLSAgICA8VGV4dFZpZXcgYW5kcm9pZDppZD0iQCthbmRyb2lkOmlkL3RleHQyIgotICAgICAgICAgICAgICBhbmRyb2lkOmxheW91dF93aWR0aD0id3JhcF9jb250ZW50IgotICAgICAgICAgICAgICBhbmRyb2lkOmxheW91dF9oZWlnaHQ9IndyYXBfY29udGVudCIKLSAgICAgICAgICAgICAgYW5kcm9pZDpsYXlvdXRfYmVsb3c9IkBhbmRyb2lkOmlkL3RleHQxIgotICAgICAgICAgICAgICBhbmRyb2lkOmxheW91dF9hbGlnblN0YXJ0PSJAYW5kcm9pZDppZC90ZXh0MSIKLSAgICAgICAgICAgICAgYW5kcm9pZDp0ZXh0QXBwZWFyYW5jZT0iP2FuZHJvaWQ6YXR0ci90ZXh0QXBwZWFyYW5jZVNtYWxsIgotICAgICAgICAgICAgICBhbmRyb2lkOnRleHRDb2xvcj0iP2FuZHJvaWQ6YXR0ci90ZXh0Q29sb3JTZWNvbmRhcnkiCi0gICAgICAgICAgICAgIGFuZHJvaWQ6bWF4TGluZXM9IjEiIC8+Ci0KLSAgPC9SZWxhdGl2ZUxheW91dD4KKyAgICAgICAgPFRleHRWaWV3CisgICAgICAgICAgICBhbmRyb2lkOmlkPSJAK2FuZHJvaWQ6aWQvdGV4dDIiCisgICAgICAgICAgICBhbmRyb2lkOmxheW91dF93aWR0aD0id3JhcF9jb250ZW50IgorICAgICAgICAgICAgYW5kcm9pZDpsYXlvdXRfaGVpZ2h0PSJ3cmFwX2NvbnRlbnQiCisgICAgICAgICAgICBhbmRyb2lkOmxheW91dF9hbGlnblN0YXJ0PSJAYW5kcm9pZDppZC90ZXh0MSIKKyAgICAgICAgICAgIGFuZHJvaWQ6bGF5b3V0X2JlbG93PSJAYW5kcm9pZDppZC90ZXh0MSIKKyAgICAgICAgICAgIGFuZHJvaWQ6bWF4TGluZXM9IjEiCisgICAgICAgICAgICBhbmRyb2lkOnRleHRBcHBlYXJhbmNlPSI/YW5kcm9pZDphdHRyL3RleHRBcHBlYXJhbmNlU21hbGwiCisgICAgICAgICAgICBhbmRyb2lkOnRleHRDb2xvcj0iP2FuZHJvaWQ6YXR0ci90ZXh0Q29sb3JTZWNvbmRhcnkiCisgICAgICAgICAgICBhbmRyb2lkOnZpc2liaWxpdHk9ImdvbmUiIC8+CisgICAgPC9SZWxhdGl2ZUxheW91dD4KIAogPC9MaW5lYXJMYXlvdXQ+CmRpZmYgLS1naXQgYS9qYXZhL3Jlcy9yYXcvZW1wdHkuZGljdCBiL2phdmEvcmVzL3Jhdy9lbXB0eS5kaWN0CmluZGV4IGRhMWJmOTYuLjgwY2UwNjYgMTAwNjQ0Ci0tLSBhL2phdmEvcmVzL3Jhdy9lbXB0eS5kaWN0CisrKyBiL2phdmEvcmVzL3Jhdy9lbXB0eS5kaWN0CkBAIC0xICsxIEBACi14sQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKK5vBOv4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9qYXZhL3Jlcy9yYXcvbWFpbl9ydS5kaWN0IGIvamF2YS9yZXMvcmF3L21haW5fcnUuZGljdAppbmRleCA5ZmQ2MTMzLi45YmI3ODA1IDEwMDY0NAotLS0gYS9qYXZhL3Jlcy9yYXcvbWFpbl9ydS5kaWN0CisrKyBiL2phdmEvcmVzL3Jhdy9tYWluX3J1LmRpY3QKQmluYXJ5IGZpbGVzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvamF2YS9yZXMvdmFsdWVzL3N0cmluZ3MtYXBwbmFtZS54bWwgYi9qYXZhL3Jlcy92YWx1ZXMvc3RyaW5ncy1hcHBuYW1lLnhtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40NmQ4YzQ0Ci0tLSAvZGV2L251bGwKKysrIGIvamF2YS9yZXMvdmFsdWVzL3N0cmluZ3MtYXBwbmFtZS54bWwKQEAgLTAsMCArMSwzNyBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KKzwhLS0KKy8qCisqKgorKiogQ29weXJpZ2h0IDIwMTMsIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKyoqCisqKiBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgIkxpY2Vuc2UiKTsKKyoqIHlvdSBtYXkgbm90IHVzZSB0aGlzIGZpbGUgZXhjZXB0IGluIGNvbXBsaWFuY2Ugd2l0aCB0aGUgTGljZW5zZS4KKyoqIFlvdSBtYXkgb2J0YWluIGEgY29weSBvZiB0aGUgTGljZW5zZSBhdAorKioKKyoqICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjAKKyoqCisqKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlCisqKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiAiQVMgSVMiIEJBU0lTLAorKiogV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlciBleHByZXNzIG9yIGltcGxpZWQuCisqKiBTZWUgdGhlIExpY2Vuc2UgZm9yIHRoZSBzcGVjaWZpYyBsYW5ndWFnZSBnb3Zlcm5pbmcgcGVybWlzc2lvbnMgYW5kCisqKiBsaW1pdGF0aW9ucyB1bmRlciB0aGUgTGljZW5zZS4KKyovCistLT4KKworPHJlc291cmNlcz4KKyAgICA8IS0tIEFwcGxpY2F0aW9uIG5hbWUgZm9yIG9wZW5zb3VyY2UgQW5kcm9pZCBrZXlib2FyZC4gQU9TUChBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QpIHNob3VsZCBub3QgYmUgdHJhbnNsYXRlZC4KKyAgICAgICAgIFRoaXMgcmVzb3VyY2Ugc2hvdWxkIGJlIGNvcGllZCBmcm9tIG1zZ2lkPSI4MjUwOTkyNjEzNjE2NzkyMzIxIiAtLT4KKyAgICA8c3RyaW5nIG5hbWU9ImVuZ2xpc2hfaW1lX25hbWUiPkFuZHJvaWQgS2V5Ym9hcmQgKEFPU1ApPC9zdHJpbmc+CisKKyAgICA8IS0tIE5hbWUgb2YgQW5kcm9pZCBzcGVsbCBjaGVja2VyIHNlcnZpY2UuIEFPU1AoQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0KSBzaG91bGQgbm90IGJlIHRyYW5zbGF0ZWQuCisgICAgICAgICBUaGlzIHJlc291cmNlIHNob3VsZCBiZSBjb3BpZWQgZnJvbSBtc2dpZD0iNTExOTUwNDc3MTk5OTQ4MDQ4IiAtLT4KKyAgICA8c3RyaW5nIG5hbWU9InNwZWxsX2NoZWNrZXJfc2VydmljZV9uYW1lIj5BbmRyb2lkIFNwZWxsIENoZWNrZXIgKEFPU1ApPC9zdHJpbmc+CisKKyAgICA8IS0tIFRpdGxlIGZvciBBbmRyb2lkIEtleWJvYXJkIHNldHRpbmdzIHNjcmVlbi4gQU9TUChBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QpIHNob3VsZCBub3QgYmUgdHJhbnNsYXRlZC4KKyAgICAgICAgIFRoaXMgcmVzb3VyY2Ugc2hvdWxkIGJlIGNvcGllZCBmcm9tIG1zZ2lkPSI0MjM2MTU4NzcxNzQ4NTAyNjciIC0tPgorICAgIDxzdHJpbmcgbmFtZT0iZW5nbGlzaF9pbWVfc2V0dGluZ3MiPkFuZHJvaWQgS2V5Ym9hcmQgU2V0dGluZ3MgKEFPU1ApPC9zdHJpbmc+CisKKyAgICA8IS0tIFRpdGxlIGZvciB0aGUgc3BlbGwgY2hlY2tpbmcgc2VydmljZSBzZXR0aW5ncyBzY3JlZW4uIEFPU1AoQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0KSBzaG91bGQgbm90IGJlIHRyYW5zbGF0ZWQuCisgICAgICAgICBUaGlzIHJlc291cmNlIHNob3VsZCBiZSBjb3BpZWQgZnJvbSBtc2dpZD0iMjk3MDUzNTg5NDMyNzI4ODQyMSIgLS0+CisgICAgPHN0cmluZyBuYW1lPSJhbmRyb2lkX3NwZWxsX2NoZWNrZXJfc2V0dGluZ3MiPkFuZHJvaWQgU3BlbGwgQ2hlY2tlciBTZXR0aW5ncyAoQU9TUCk8L3N0cmluZz4KKzwvcmVzb3VyY2VzPgpkaWZmIC0tZ2l0IGEvamF2YS9yZXMvdmFsdWVzL3N0cmluZ3MueG1sIGIvamF2YS9yZXMvdmFsdWVzL3N0cmluZ3MueG1sCmluZGV4IDE0ODM5MzkuLjliZjRkZGQgMTAwNjQ0Ci0tLSBhL2phdmEvcmVzL3ZhbHVlcy9zdHJpbmdzLnhtbAorKysgYi9qYXZhL3Jlcy92YWx1ZXMvc3RyaW5ncy54bWwKQEAgLTE4LDE4ICsxOCw2IEBACiAqLwogLS0+CiA8cmVzb3VyY2VzIHhtbG5zOnhsaWZmPSJ1cm46b2FzaXM6bmFtZXM6dGM6eGxpZmY6ZG9jdW1lbnQ6MS4yIj4KLSAgICA8IS0tIEFwcGxpY2F0aW9uIG5hbWUgZm9yIG9wZW5zb3VyY2UgQW5kcm9pZCBrZXlib2FyZC4gQU9TUChBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QpIHNob3VsZCBub3QgYmUgdHJhbnNsYXRlZC4gLS0+Ci0gICAgPHN0cmluZyBuYW1lPSJhb3NwX2FuZHJvaWRfa2V5Ym9hcmRfaW1lX25hbWUiPkFuZHJvaWQgS2V5Ym9hcmQgKEFPU1ApPC9zdHJpbmc+Ci0KLSAgICA8IS0tIFRpdGxlIGZvciBBbmRyb2lkIEtleWJvYXJkIHNldHRpbmdzIHNjcmVlbi4gQU9TUChBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QpIHNob3VsZCBub3QgYmUgdHJhbnNsYXRlZC4gLS0+Ci0gICAgPHN0cmluZyBuYW1lPSJhb3NwX2FuZHJvaWRfa2V5Ym9hcmRfaW1lX3NldHRpbmdzIj5BbmRyb2lkIEtleWJvYXJkIFNldHRpbmdzIChBT1NQKTwvc3RyaW5nPgotCi0gICAgPCEtLSBOYW1lIG9mIEFuZHJvaWQgc3BlbGwgY2hlY2tlciBzZXJ2aWNlLiBBT1NQKEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdCkgc2hvdWxkIG5vdCBiZSB0cmFuc2xhdGVkLiAtLT4KLSAgICA8c3RyaW5nIG5hbWU9ImFvc3Bfc3BlbGxfY2hlY2tlcl9zZXJ2aWNlX25hbWUiPkFuZHJvaWQgU3BlbGwgQ2hlY2tlciAoQU9TUCk8L3N0cmluZz4KLQotICAgIDwhLS0gVGl0bGUgZm9yIHRoZSBzcGVsbCBjaGVja2luZyBzZXJ2aWNlIHNldHRpbmdzIHNjcmVlbi4gQU9TUChBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QpIHNob3VsZCBub3QgYmUgdHJhbnNsYXRlZC4gLS0+Ci0gICAgPHN0cmluZyBuYW1lPSJhb3NwX2FuZHJvaWRfc3BlbGxfY2hlY2tlcl9zZXJ2aWNlX3NldHRpbmdzIj5BbmRyb2lkIFNwZWxsIENoZWNrZXIgU2V0dGluZ3MgKEFPU1ApPC9zdHJpbmc+Ci0KICAgICA8IS0tIFRpdGxlIGZvciBMYXRpbiBrZXlib2FyZCBpbnB1dCBvcHRpb25zIGRpYWxvZyBbQ0hBUiBMSU1JVD0yNV0gLS0+CiAgICAgPHN0cmluZyBuYW1lPSJlbmdsaXNoX2ltZV9pbnB1dF9vcHRpb25zIj5JbnB1dCBvcHRpb25zPC9zdHJpbmc+CiAKZGlmZiAtLWdpdCBhL2phdmEvcmVzL3ZhbHVlcy9zdHlsZXMueG1sIGIvamF2YS9yZXMvdmFsdWVzL3N0eWxlcy54bWwKaW5kZXggNDM2ZTA4MC4uZGFkN2UyMCAxMDA2NDQKLS0tIGEvamF2YS9yZXMvdmFsdWVzL3N0eWxlcy54bWwKKysrIGIvamF2YS9yZXMvdmFsdWVzL3N0eWxlcy54bWwKQEAgLTk0LDggKzk0LDEwIEBACiAgICAgICAgIDxpdGVtIG5hbWU9InNob3dNb3JlS2V5c0tleWJvYXJkQXRUb3VjaGVkUG9pbnQiPkBib29sL2NvbmZpZ19zaG93X21vcmVfa2V5c19rZXlib2FyZF9hdF90b3VjaGVkX3BvaW50PC9pdGVtPgogICAgICAgICA8aXRlbSBuYW1lPSJsYW5ndWFnZU9uU3BhY2ViYXJGaW5hbEFscGhhIj5AaW50ZWdlci9jb25maWdfbGFuZ3VhZ2Vfb25fc3BhY2ViYXJfZmluYWxfYWxwaGE8L2l0ZW0+CiAgICAgICAgIDxpdGVtIG5hbWU9Imxhbmd1YWdlT25TcGFjZWJhckZhZGVvdXRBbmltYXRvciI+QGFuaW0vbGFuZ3VhZ2Vfb25fc3BhY2ViYXJfZmFkZW91dDwvaXRlbT4KKyAgICAgICAgPCEtLSBSZW1vdmUgYW5pbWF0aW9ucyBmb3Igbm93IGJlY2F1c2UgaXQgY291bGQgZHJhaW4gYSBub24tbmVnbGlnaWJsZSBhbW91bnQgb2YgYmF0dGVyeSB3aGlsZSB0eXBpbmcuCiAgICAgICAgIDxpdGVtIG5hbWU9ImFsdENvZGVLZXlXaGlsZVR5cGluZ0ZhZGVvdXRBbmltYXRvciI+QGFuaW0vYWx0X2NvZGVfa2V5X3doaWxlX3R5cGluZ19mYWRlb3V0PC9pdGVtPgogICAgICAgICA8aXRlbSBuYW1lPSJhbHRDb2RlS2V5V2hpbGVUeXBpbmdGYWRlaW5BbmltYXRvciI+QGFuaW0vYWx0X2NvZGVfa2V5X3doaWxlX3R5cGluZ19mYWRlaW48L2l0ZW0+CisgICAgICAgIC0tPgogICAgICAgICA8IS0tIENvbW1vbiBhdHRyaWJ1dGVzIG9mIE1haW5LZXlib2FyZFZpZXcgZm9yIGdlc3R1cmUgdHlwaW5nIGRldGVjdGlvbiBhbmQgcmVjb2duaXRpb24gLS0+CiAgICAgICAgIDxpdGVtIG5hbWU9Imdlc3R1cmVGbG9hdGluZ1ByZXZpZXdUZXh0TGluZ2VyVGltZW91dCI+QGludGVnZXIvY29uZmlnX2dlc3R1cmVfZmxvYXRpbmdfcHJldmlld190ZXh0X2xpbmdlcl90aW1lb3V0PC9pdGVtPgogICAgICAgICA8aXRlbSBuYW1lPSJnZXN0dXJlU3RhdGljVGltZVRocmVzaG9sZEFmdGVyRmFzdFR5cGluZyI+QGludGVnZXIvY29uZmlnX2dlc3R1cmVfc3RhdGljX3RpbWVfdGhyZXNob2xkX2FmdGVyX2Zhc3RfdHlwaW5nPC9pdGVtPgpkaWZmIC0tZ2l0IGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvY29tcGF0L1VzZXJEaWN0aW9uYXJ5Q29tcGF0VXRpbHMuamF2YSBiL2phdmEvc3JjL2NvbS9hbmRyb2lkL2lucHV0bWV0aG9kL2NvbXBhdC9Vc2VyRGljdGlvbmFyeUNvbXBhdFV0aWxzLmphdmEKaW5kZXggZmY2NTYxYy4uYTBkNzY0MSAxMDA2NDQKLS0tIGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvY29tcGF0L1VzZXJEaWN0aW9uYXJ5Q29tcGF0VXRpbHMuamF2YQorKysgYi9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9jb21wYXQvVXNlckRpY3Rpb25hcnlDb21wYXRVdGlscy5qYXZhCkBAIC0yOCw2ICsyOCw3IEBACiAgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgTWV0aG9kIE1FVEhPRF9hZGRXb3JkID0gQ29tcGF0VXRpbHMuZ2V0TWV0aG9kKFdvcmRzLmNsYXNzLCAiYWRkV29yZCIsCiAgICAgICAgICAgICBDb250ZXh0LmNsYXNzLCBTdHJpbmcuY2xhc3MsIEludGVnZXIuVFlQRSwgU3RyaW5nLmNsYXNzLCBMb2NhbGUuY2xhc3MpOwogCisgICAgQFN1cHByZXNzV2FybmluZ3MoImRlcHJlY2F0aW9uIikKICAgICBwdWJsaWMgc3RhdGljIHZvaWQgYWRkV29yZChmaW5hbCBDb250ZXh0IGNvbnRleHQsIGZpbmFsIFN0cmluZyB3b3JkLCBmaW5hbCBpbnQgZnJlcSwKICAgICAgICAgICAgIGZpbmFsIFN0cmluZyBzaG9ydGN1dCwgZmluYWwgTG9jYWxlIGxvY2FsZSkgewogICAgICAgICBpZiAoaGFzTmV3ZXJBZGRXb3JkKCkpIHsKQEAgLTM5LDEzICs0MCwxOCBAQAogICAgICAgICAgICAgaWYgKG51bGwgPT0gbG9jYWxlKSB7CiAgICAgICAgICAgICAgICAgbG9jYWxlVHlwZSA9IFdvcmRzLkxPQ0FMRV9UWVBFX0FMTDsKICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgbG9jYWxlVHlwZSA9IFdvcmRzLkxPQ0FMRV9UWVBFX0NVUlJFTlQ7CisgICAgICAgICAgICAgICAgZmluYWwgTG9jYWxlIGN1cnJlbnRMb2NhbGUgPSBjb250ZXh0LmdldFJlc291cmNlcygpLmdldENvbmZpZ3VyYXRpb24oKS5sb2NhbGU7CisgICAgICAgICAgICAgICAgaWYgKGxvY2FsZS5lcXVhbHMoY3VycmVudExvY2FsZSkpIHsKKyAgICAgICAgICAgICAgICAgICAgbG9jYWxlVHlwZSA9IFdvcmRzLkxPQ0FMRV9UWVBFX0NVUlJFTlQ7CisgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgbG9jYWxlVHlwZSA9IFdvcmRzLkxPQ0FMRV9UWVBFX0FMTDsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBXb3Jkcy5hZGRXb3JkKGNvbnRleHQsIHdvcmQsIGZyZXEsIGxvY2FsZVR5cGUpOwogICAgICAgICB9CiAgICAgfQogCi0gICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgYm9vbGVhbiBoYXNOZXdlckFkZFdvcmQoKSB7CisgICAgcHVibGljIHN0YXRpYyBmaW5hbCBib29sZWFuIGhhc05ld2VyQWRkV29yZCgpIHsKICAgICAgICAgcmV0dXJuIG51bGwgIT0gTUVUSE9EX2FkZFdvcmQ7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvZGljdGlvbmFyeXBhY2svQnV0dG9uU3dpdGNoZXIuamF2YSBiL2phdmEvc3JjL2NvbS9hbmRyb2lkL2lucHV0bWV0aG9kL2RpY3Rpb25hcnlwYWNrL0J1dHRvblN3aXRjaGVyLmphdmEKaW5kZXggMTk2YzIxMS4uMzkxYTE1YyAxMDA2NDQKLS0tIGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvZGljdGlvbmFyeXBhY2svQnV0dG9uU3dpdGNoZXIuamF2YQorKysgYi9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9kaWN0aW9uYXJ5cGFjay9CdXR0b25Td2l0Y2hlci5qYXZhCkBAIC0xNiw5ICsxNiwxMiBAQAogCiBwYWNrYWdlIGNvbS5hbmRyb2lkLmlucHV0bWV0aG9kLmRpY3Rpb25hcnlwYWNrOwogCitpbXBvcnQgYW5kcm9pZC5hbmltYXRpb24uQW5pbWF0b3I7CitpbXBvcnQgYW5kcm9pZC5hbmltYXRpb24uQW5pbWF0b3JMaXN0ZW5lckFkYXB0ZXI7CiBpbXBvcnQgYW5kcm9pZC5jb250ZW50LkNvbnRleHQ7CiBpbXBvcnQgYW5kcm9pZC51dGlsLkF0dHJpYnV0ZVNldDsKIGltcG9ydCBhbmRyb2lkLnZpZXcuVmlldzsKK2ltcG9ydCBhbmRyb2lkLnZpZXcuVmlld1Byb3BlcnR5QW5pbWF0b3I7CiBpbXBvcnQgYW5kcm9pZC53aWRnZXQuQnV0dG9uOwogaW1wb3J0IGFuZHJvaWQud2lkZ2V0LkZyYW1lTGF5b3V0OwogCkBAIC0xMTUsMjIgKzExOCwzNSBAQAogICAgIH0KIAogICAgIHByaXZhdGUgdm9pZCBhbmltYXRlQnV0dG9uUG9zaXRpb24oZmluYWwgaW50IG9sZFN0YXR1cywgZmluYWwgaW50IG5ld1N0YXR1cykgewotICAgICAgICBhbmltYXRlQnV0dG9uKGdldEJ1dHRvbihvbGRTdGF0dXMpLCBBTklNQVRJT05fT1VUKTsKLSAgICAgICAgYW5pbWF0ZUJ1dHRvbihnZXRCdXR0b24obmV3U3RhdHVzKSwgQU5JTUFUSU9OX0lOKTsKKyAgICAgICAgZmluYWwgVmlldyBvbGRCdXR0b24gPSBnZXRCdXR0b24ob2xkU3RhdHVzKTsKKyAgICAgICAgZmluYWwgVmlldyBuZXdCdXR0b24gPSBnZXRCdXR0b24obmV3U3RhdHVzKTsKKyAgICAgICAgaWYgKG51bGwgIT0gb2xkQnV0dG9uICYmIG51bGwgIT0gbmV3QnV0dG9uKSB7CisgICAgICAgICAgICAvLyBUcmFuc2l0aW9uIGJldHdlZW4gdHdvIGJ1dHRvbnMgOiBhbmltYXRlIG91dCwgdGhlbiBpbgorICAgICAgICAgICAgYW5pbWF0ZUJ1dHRvbihvbGRCdXR0b24sIEFOSU1BVElPTl9PVVQpLnNldExpc3RlbmVyKAorICAgICAgICAgICAgICAgICAgICBuZXcgQW5pbWF0b3JMaXN0ZW5lckFkYXB0ZXIoKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBAT3ZlcnJpZGUKKyAgICAgICAgICAgICAgICAgICAgICAgIHB1YmxpYyB2b2lkIG9uQW5pbWF0aW9uRW5kKGZpbmFsIEFuaW1hdG9yIGFuaW1hdGlvbikgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFuaW1hdGVCdXR0b24obmV3QnV0dG9uLCBBTklNQVRJT05fSU4pOworICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgfSBlbHNlIGlmIChudWxsICE9IG9sZEJ1dHRvbikgeworICAgICAgICAgICAgYW5pbWF0ZUJ1dHRvbihvbGRCdXR0b24sIEFOSU1BVElPTl9PVVQpOworICAgICAgICB9IGVsc2UgaWYgKG51bGwgIT0gbmV3QnV0dG9uKSB7CisgICAgICAgICAgICBhbmltYXRlQnV0dG9uKG5ld0J1dHRvbiwgQU5JTUFUSU9OX0lOKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIHB1YmxpYyB2b2lkIHNldEludGVybmFsT25DbGlja0xpc3RlbmVyKGZpbmFsIE9uQ2xpY2tMaXN0ZW5lciBsaXN0ZW5lcikgewogICAgICAgICBtT25DbGlja0xpc3RlbmVyID0gbGlzdGVuZXI7CiAgICAgfQogCi0gICAgcHJpdmF0ZSB2b2lkIGFuaW1hdGVCdXR0b24oZmluYWwgVmlldyBidXR0b24sIGZpbmFsIGludCBkaXJlY3Rpb24pIHsKLSAgICAgICAgaWYgKG51bGwgPT0gYnV0dG9uKSByZXR1cm47CisgICAgcHJpdmF0ZSBWaWV3UHJvcGVydHlBbmltYXRvciBhbmltYXRlQnV0dG9uKGZpbmFsIFZpZXcgYnV0dG9uLCBmaW5hbCBpbnQgZGlyZWN0aW9uKSB7CiAgICAgICAgIGZpbmFsIGZsb2F0IG91dGVyWCA9IGdldFdpZHRoKCk7CiAgICAgICAgIGZpbmFsIGZsb2F0IGlubmVyWCA9IGJ1dHRvbi5nZXRYKCkgLSBidXR0b24uZ2V0VHJhbnNsYXRpb25YKCk7CiAgICAgICAgIGlmIChBTklNQVRJT05fSU4gPT0gZGlyZWN0aW9uKSB7Ci0gICAgICAgICAgICBidXR0b24uYW5pbWF0ZSgpLnRyYW5zbGF0aW9uWCgwKTsKKyAgICAgICAgICAgIHJldHVybiBidXR0b24uYW5pbWF0ZSgpLnRyYW5zbGF0aW9uWCgwKTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGJ1dHRvbi5hbmltYXRlKCkudHJhbnNsYXRpb25YKG91dGVyWCAtIGlubmVyWCk7CisgICAgICAgICAgICByZXR1cm4gYnV0dG9uLmFuaW1hdGUoKS50cmFuc2xhdGlvblgob3V0ZXJYIC0gaW5uZXJYKTsKICAgICAgICAgfQogICAgIH0KIH0KZGlmZiAtLWdpdCBhL2phdmEvc3JjL2NvbS9hbmRyb2lkL2lucHV0bWV0aG9kL2RpY3Rpb25hcnlwYWNrL0RpY3Rpb25hcnlMaXN0SW50ZXJmYWNlU3RhdGUuamF2YSBiL2phdmEvc3JjL2NvbS9hbmRyb2lkL2lucHV0bWV0aG9kL2RpY3Rpb25hcnlwYWNrL0RpY3Rpb25hcnlMaXN0SW50ZXJmYWNlU3RhdGUuamF2YQppbmRleCA4OTc1ZDY5Li5kZTM3MTFjIDEwMDY0NAotLS0gYS9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9kaWN0aW9uYXJ5cGFjay9EaWN0aW9uYXJ5TGlzdEludGVyZmFjZVN0YXRlLmphdmEKKysrIGIvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvZGljdGlvbmFyeXBhY2svRGljdGlvbmFyeUxpc3RJbnRlcmZhY2VTdGF0ZS5qYXZhCkBAIC00NCw2ICs0NCwxMiBAQAogICAgICAgICByZXR1cm4gc3RhdGUubU9wZW47CiAgICAgfQogCisgICAgcHVibGljIGludCBnZXRTdGF0dXMoZmluYWwgU3RyaW5nIHdvcmRsaXN0SWQpIHsKKyAgICAgICAgZmluYWwgU3RhdGUgc3RhdGUgPSBtV29yZGxpc3RUb1N0YXRlLmdldCh3b3JkbGlzdElkKTsKKyAgICAgICAgaWYgKG51bGwgPT0gc3RhdGUpIHJldHVybiBNZXRhZGF0YURiSGVscGVyLlNUQVRVU19VTktOT1dOOworICAgICAgICByZXR1cm4gc3RhdGUubVN0YXR1czsKKyAgICB9CisKICAgICBwdWJsaWMgdm9pZCBzZXRPcGVuKGZpbmFsIFN0cmluZyB3b3JkbGlzdElkLCBmaW5hbCBpbnQgc3RhdHVzKSB7CiAgICAgICAgIGZpbmFsIFN0YXRlIG5ld1N0YXRlOwogICAgICAgICBmaW5hbCBTdGF0ZSBzdGF0ZSA9IG1Xb3JkbGlzdFRvU3RhdGUuZ2V0KHdvcmRsaXN0SWQpOwpkaWZmIC0tZ2l0IGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvZGljdGlvbmFyeXBhY2svV29yZExpc3RQcmVmZXJlbmNlLmphdmEgYi9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9kaWN0aW9uYXJ5cGFjay9Xb3JkTGlzdFByZWZlcmVuY2UuamF2YQppbmRleCAyZDE1YmVkLi4xY2Y5MTk2IDEwMDY0NAotLS0gYS9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9kaWN0aW9uYXJ5cGFjay9Xb3JkTGlzdFByZWZlcmVuY2UuamF2YQorKysgYi9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9kaWN0aW9uYXJ5cGFjay9Xb3JkTGlzdFByZWZlcmVuY2UuamF2YQpAQCAtMTkxLDggKzE5MSwyMCBAQAogICAgICAgICAoKFZpZXdHcm91cCl2aWV3KS5zZXRMYXlvdXRUcmFuc2l0aW9uKG51bGwpOwogICAgICAgICBmaW5hbCBCdXR0b25Td2l0Y2hlciBidXR0b25Td2l0Y2hlciA9CiAgICAgICAgICAgICAgICAgKEJ1dHRvblN3aXRjaGVyKXZpZXcuZmluZFZpZXdCeUlkKFIuaWQud29yZGxpc3RfYnV0dG9uX3N3aXRjaGVyKTsKLSAgICAgICAgYnV0dG9uU3dpdGNoZXIuc2V0U3RhdHVzQW5kVXBkYXRlVmlzdWFscyhtSW50ZXJmYWNlU3RhdGUuaXNPcGVuKG1Xb3JkbGlzdElkKSA/Ci0gICAgICAgICAgICAgICAgZ2V0QnV0dG9uU3dpdGNoZXJTdGF0dXMobVN0YXR1cykgOiBCdXR0b25Td2l0Y2hlci5TVEFUVVNfTk9fQlVUVE9OKTsKKyAgICAgICAgaWYgKG1JbnRlcmZhY2VTdGF0ZS5pc09wZW4obVdvcmRsaXN0SWQpKSB7CisgICAgICAgICAgICAvLyBUaGUgYnV0dG9uIGlzIG9wZW4uCisgICAgICAgICAgICBmaW5hbCBpbnQgcHJldmlvdXNTdGF0dXMgPSBtSW50ZXJmYWNlU3RhdGUuZ2V0U3RhdHVzKG1Xb3JkbGlzdElkKTsKKyAgICAgICAgICAgIGJ1dHRvblN3aXRjaGVyLnNldFN0YXR1c0FuZFVwZGF0ZVZpc3VhbHMoZ2V0QnV0dG9uU3dpdGNoZXJTdGF0dXMocHJldmlvdXNTdGF0dXMpKTsKKyAgICAgICAgICAgIGlmIChwcmV2aW91c1N0YXR1cyAhPSBtU3RhdHVzKSB7CisgICAgICAgICAgICAgICAgLy8gV2UgY29tZSBoZXJlIGlmIHRoZSBzdGF0dXMgaGFzIGNoYW5nZWQgc2luY2UgbGFzdCB0aW1lLiBXZSBuZWVkIHRvIGFuaW1hdGUKKyAgICAgICAgICAgICAgICAvLyB0aGUgdHJhbnNpdGlvbi4KKyAgICAgICAgICAgICAgICBidXR0b25Td2l0Y2hlci5zZXRTdGF0dXNBbmRVcGRhdGVWaXN1YWxzKGdldEJ1dHRvblN3aXRjaGVyU3RhdHVzKG1TdGF0dXMpKTsKKyAgICAgICAgICAgICAgICBtSW50ZXJmYWNlU3RhdGUuc2V0T3BlbihtV29yZGxpc3RJZCwgbVN0YXR1cyk7CisgICAgICAgICAgICB9CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAvLyBUaGUgYnV0dG9uIGlzIGNsb3NlZC4KKyAgICAgICAgICAgIGJ1dHRvblN3aXRjaGVyLnNldFN0YXR1c0FuZFVwZGF0ZVZpc3VhbHMoQnV0dG9uU3dpdGNoZXIuU1RBVFVTX05PX0JVVFRPTik7CisgICAgICAgIH0KICAgICAgICAgYnV0dG9uU3dpdGNoZXIuc2V0SW50ZXJuYWxPbkNsaWNrTGlzdGVuZXIobUFjdGlvbkJ1dHRvbkNsaWNrSGFuZGxlcik7CiAgICAgICAgIHZpZXcuc2V0T25DbGlja0xpc3RlbmVyKG1QcmVmZXJlbmNlQ2xpY2tIYW5kbGVyKTsKICAgICB9CmRpZmYgLS1naXQgYS9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9rZXlib2FyZC9NYWluS2V5Ym9hcmRWaWV3LmphdmEgYi9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9rZXlib2FyZC9NYWluS2V5Ym9hcmRWaWV3LmphdmEKaW5kZXggZDc0NjQ0ZC4uOGQ0YmVlYyAxMDA2NDQKLS0tIGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2Qva2V5Ym9hcmQvTWFpbktleWJvYXJkVmlldy5qYXZhCisrKyBiL2phdmEvc3JjL2NvbS9hbmRyb2lkL2lucHV0bWV0aG9kL2tleWJvYXJkL01haW5LZXlib2FyZFZpZXcuamF2YQpAQCAtMzMzLDYgKzMzMywxMCBAQAogCiAgICAgICAgIHByaXZhdGUgc3RhdGljIHZvaWQgY2FuY2VsQW5kU3RhcnRBbmltYXRvcnMoZmluYWwgT2JqZWN0QW5pbWF0b3IgYW5pbWF0b3JUb0NhbmNlbCwKICAgICAgICAgICAgICAgICBmaW5hbCBPYmplY3RBbmltYXRvciBhbmltYXRvclRvU3RhcnQpIHsKKyAgICAgICAgICAgIGlmIChhbmltYXRvclRvQ2FuY2VsID09IG51bGwgfHwgYW5pbWF0b3JUb1N0YXJ0ID09IG51bGwpIHsKKyAgICAgICAgICAgICAgICAvLyBUT0RPOiBTdG9wIHVzaW5nIG51bGwgYXMgYSBuby1vcGVyYXRpb24gYW5pbWF0b3IuCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQogICAgICAgICAgICAgZmxvYXQgc3RhcnRGcmFjdGlvbiA9IDAuMGY7CiAgICAgICAgICAgICBpZiAoYW5pbWF0b3JUb0NhbmNlbC5pc1N0YXJ0ZWQoKSkgewogICAgICAgICAgICAgICAgIGFuaW1hdG9yVG9DYW5jZWwuY2FuY2VsKCk7CkBAIC01ODEsNiArNTg1LDcgQEAKIAogICAgIHByaXZhdGUgT2JqZWN0QW5pbWF0b3IgbG9hZE9iamVjdEFuaW1hdG9yKGZpbmFsIGludCByZXNJZCwgZmluYWwgT2JqZWN0IHRhcmdldCkgewogICAgICAgICBpZiAocmVzSWQgPT0gMCkgeworICAgICAgICAgICAgLy8gVE9ETzogU3RvcCByZXR1cm5pbmcgbnVsbC4KICAgICAgICAgICAgIHJldHVybiBudWxsOwogICAgICAgICB9CiAgICAgICAgIGZpbmFsIE9iamVjdEFuaW1hdG9yIGFuaW1hdG9yID0gKE9iamVjdEFuaW1hdG9yKUFuaW1hdG9ySW5mbGF0ZXIubG9hZEFuaW1hdG9yKApAQCAtMTA1NCw2ICsxMDU5LDcgQEAKIAogICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyB2b2lkIG9uU2hvd01vcmVLZXlzUGFuZWwoZmluYWwgTW9yZUtleXNQYW5lbCBwYW5lbCkgeworICAgICAgICBsb2NhdGVQcmV2aWV3UGxhY2VyVmlldygpOwogICAgICAgICBpZiAoaXNTaG93aW5nTW9yZUtleXNQYW5lbCgpKSB7CiAgICAgICAgICAgICBvbkRpc21pc3NNb3JlS2V5c1BhbmVsKCk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL2phdmEvc3JjL2NvbS9hbmRyb2lkL2lucHV0bWV0aG9kL2xhdGluL1NldHRpbmdzRnJhZ21lbnQuamF2YSBiL2phdmEvc3JjL2NvbS9hbmRyb2lkL2lucHV0bWV0aG9kL2xhdGluL1NldHRpbmdzRnJhZ21lbnQuamF2YQppbmRleCBjNzgwNjRiLi44MzBjYWU5IDEwMDY0NAotLS0gYS9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9sYXRpbi9TZXR0aW5nc0ZyYWdtZW50LmphdmEKKysrIGIvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvbGF0aW4vU2V0dGluZ3NGcmFnbWVudC5qYXZhCkBAIC0yNSw3ICsyNSw2IEBACiBpbXBvcnQgYW5kcm9pZC5jb250ZW50LnBtLlJlc29sdmVJbmZvOwogaW1wb3J0IGFuZHJvaWQuY29udGVudC5yZXMuUmVzb3VyY2VzOwogaW1wb3J0IGFuZHJvaWQubWVkaWEuQXVkaW9NYW5hZ2VyOwotaW1wb3J0IGFuZHJvaWQub3MuQnVpbGQ7CiBpbXBvcnQgYW5kcm9pZC5vcy5CdW5kbGU7CiBpbXBvcnQgYW5kcm9pZC5wcmVmZXJlbmNlLkNoZWNrQm94UHJlZmVyZW5jZTsKIGltcG9ydCBhbmRyb2lkLnByZWZlcmVuY2UuTGlzdFByZWZlcmVuY2U7CkBAIC00Niw3ICs0NSw3IEBACiAKIHB1YmxpYyBmaW5hbCBjbGFzcyBTZXR0aW5nc0ZyYWdtZW50IGV4dGVuZHMgSW5wdXRNZXRob2RTZXR0aW5nc0ZyYWdtZW50CiAgICAgICAgIGltcGxlbWVudHMgU2hhcmVkUHJlZmVyZW5jZXMuT25TaGFyZWRQcmVmZXJlbmNlQ2hhbmdlTGlzdGVuZXIgewotICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGJvb2xlYW4gREJHX1VTRV9JTlRFUk5BTF9VU0VSX1NFVFRJTkdTID0gZmFsc2U7CisgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgYm9vbGVhbiBEQkdfVVNFX0lOVEVSTkFMX1VTRVJfRElDVElPTkFSWV9TRVRUSU5HUyA9IGZhbHNlOwogCiAgICAgcHJpdmF0ZSBMaXN0UHJlZmVyZW5jZSBtVm9pY2VQcmVmZXJlbmNlOwogICAgIHByaXZhdGUgTGlzdFByZWZlcmVuY2UgbVNob3dDb3JyZWN0aW9uU3VnZ2VzdGlvbnNQcmVmZXJlbmNlOwpAQCAtMjAyLDEzICsyMDEsOCBAQAogICAgICAgICBmaW5hbCBJbnRlbnQgZWRpdFBlcnNvbmFsRGljdGlvbmFyeUludGVudCA9IGVkaXRQZXJzb25hbERpY3Rpb25hcnkuZ2V0SW50ZW50KCk7CiAgICAgICAgIGZpbmFsIFJlc29sdmVJbmZvIHJpID0gY29udGV4dC5nZXRQYWNrYWdlTWFuYWdlcigpLnJlc29sdmVBY3Rpdml0eSgKICAgICAgICAgICAgICAgICBlZGl0UGVyc29uYWxEaWN0aW9uYXJ5SW50ZW50LCBQYWNrYWdlTWFuYWdlci5NQVRDSF9ERUZBVUxUX09OTFkpOwotICAgICAgICBpZiAoREJHX1VTRV9JTlRFUk5BTF9VU0VSX1NFVFRJTkdTIHx8IHJpID09IG51bGwpIHsKLSAgICAgICAgICAgIC8vIFRPRE86IFN1cHBvcnQgSUNTCi0gICAgICAgICAgICBpZiAoQnVpbGQuVkVSU0lPTi5TREtfSU5UID49IEJ1aWxkLlZFUlNJT05fQ09ERVMuSkVMTFlfQkVBTikgewotICAgICAgICAgICAgICAgIHVwZGF0ZVVzZXJEaWN0aW9uYXJ5UHJlZmVyZW5jZShlZGl0UGVyc29uYWxEaWN0aW9uYXJ5KTsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgcmVtb3ZlUHJlZmVyZW5jZShTZXR0aW5ncy5QUkVGX0VESVRfUEVSU09OQUxfRElDVElPTkFSWSwgZ2V0UHJlZmVyZW5jZVNjcmVlbigpKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgaWYgKERCR19VU0VfSU5URVJOQUxfVVNFUl9ESUNUSU9OQVJZX1NFVFRJTkdTIHx8IHJpID09IG51bGwpIHsKKyAgICAgICAgICAgIHVwZGF0ZVVzZXJEaWN0aW9uYXJ5UHJlZmVyZW5jZShlZGl0UGVyc29uYWxEaWN0aW9uYXJ5KTsKICAgICAgICAgfQogCiAgICAgICAgIGlmICghU2V0dGluZ3MucmVhZEZyb21CdWlsZENvbmZpZ0lmR2VzdHVyZUlucHV0RW5hYmxlZChyZXMpKSB7CmRpZmYgLS1naXQgYS9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9sYXRpbi9zZXR1cC9TZXR1cEFjdGl2aXR5LmphdmEgYi9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9sYXRpbi9zZXR1cC9TZXR1cEFjdGl2aXR5LmphdmEKaW5kZXggNTc4Nzg3ZC4uMjllZTYzZCAxMDA2NDQKLS0tIGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvbGF0aW4vc2V0dXAvU2V0dXBBY3Rpdml0eS5qYXZhCisrKyBiL2phdmEvc3JjL2NvbS9hbmRyb2lkL2lucHV0bWV0aG9kL2xhdGluL3NldHVwL1NldHVwQWN0aXZpdHkuamF2YQpAQCAtMjM2LDggKzIzNiw3IEBACiAgICAgICAgIGZpbmFsIEludGVudCBpbnRlbnQgPSBuZXcgSW50ZW50KCk7CiAgICAgICAgIGludGVudC5zZXRDbGFzcyh0aGlzLCBTZXR0aW5nc0FjdGl2aXR5LmNsYXNzKTsKICAgICAgICAgaW50ZW50LnNldEZsYWdzKEludGVudC5GTEFHX0FDVElWSVRZX1JFU0VUX1RBU0tfSUZfTkVFREVECi0gICAgICAgICAgICAgICAgfCBJbnRlbnQuRkxBR19BQ1RJVklUWV9DTEVBUl9UT1AKLSAgICAgICAgICAgICAgICB8IEludGVudC5GTEFHX0FDVElWSVRZX05PX0hJU1RPUlkpOworICAgICAgICAgICAgICAgIHwgSW50ZW50LkZMQUdfQUNUSVZJVFlfQ0xFQVJfVE9QKTsKICAgICAgICAgc3RhcnRBY3Rpdml0eShpbnRlbnQpOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvbGF0aW4vdXNlcmRpY3Rpb25hcnkvVXNlckRpY3Rpb25hcnlBZGRXb3JkQ29udGVudHMuamF2YSBiL2phdmEvc3JjL2NvbS9hbmRyb2lkL2lucHV0bWV0aG9kL2xhdGluL3VzZXJkaWN0aW9uYXJ5L1VzZXJEaWN0aW9uYXJ5QWRkV29yZENvbnRlbnRzLmphdmEKaW5kZXggZjBkYzUyNi4uMmI2ZmRhMyAxMDA2NDQKLS0tIGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvbGF0aW4vdXNlcmRpY3Rpb25hcnkvVXNlckRpY3Rpb25hcnlBZGRXb3JkQ29udGVudHMuamF2YQorKysgYi9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9sYXRpbi91c2VyZGljdGlvbmFyeS9Vc2VyRGljdGlvbmFyeUFkZFdvcmRDb250ZW50cy5qYXZhCkBAIC0xNiw2ICsxNiw3IEBACiAKIHBhY2thZ2UgY29tLmFuZHJvaWQuaW5wdXRtZXRob2QubGF0aW4udXNlcmRpY3Rpb25hcnk7CiAKK2ltcG9ydCBjb20uYW5kcm9pZC5pbnB1dG1ldGhvZC5jb21wYXQuVXNlckRpY3Rpb25hcnlDb21wYXRVdGlsczsKIGltcG9ydCBjb20uYW5kcm9pZC5pbnB1dG1ldGhvZC5sYXRpbi5Mb2NhbGVVdGlsczsKIGltcG9ydCBjb20uYW5kcm9pZC5pbnB1dG1ldGhvZC5sYXRpbi5SOwogCkBAIC02OCwxOCArNjksMjggQEAKICAgICAvKiBwYWNrYWdlICovIFVzZXJEaWN0aW9uYXJ5QWRkV29yZENvbnRlbnRzKGZpbmFsIFZpZXcgdmlldywgZmluYWwgQnVuZGxlIGFyZ3MpIHsKICAgICAgICAgbVdvcmRFZGl0VGV4dCA9IChFZGl0VGV4dCl2aWV3LmZpbmRWaWV3QnlJZChSLmlkLnVzZXJfZGljdGlvbmFyeV9hZGRfd29yZF90ZXh0KTsKICAgICAgICAgbVNob3J0Y3V0RWRpdFRleHQgPSAoRWRpdFRleHQpdmlldy5maW5kVmlld0J5SWQoUi5pZC51c2VyX2RpY3Rpb25hcnlfYWRkX3Nob3J0Y3V0KTsKKyAgICAgICAgaWYgKCFVc2VyRGljdGlvbmFyeVNldHRpbmdzLklTX1NIT1JUQ1VUX0FQSV9TVVBQT1JURUQpIHsKKyAgICAgICAgICAgIG1TaG9ydGN1dEVkaXRUZXh0LnNldFZpc2liaWxpdHkoVmlldy5HT05FKTsKKyAgICAgICAgICAgIHZpZXcuZmluZFZpZXdCeUlkKFIuaWQudXNlcl9kaWN0aW9uYXJ5X2FkZF9zaG9ydGN1dF9sYWJlbCkuc2V0VmlzaWJpbGl0eShWaWV3LkdPTkUpOworICAgICAgICB9CiAgICAgICAgIGZpbmFsIFN0cmluZyB3b3JkID0gYXJncy5nZXRTdHJpbmcoRVhUUkFfV09SRCk7CiAgICAgICAgIGlmIChudWxsICE9IHdvcmQpIHsKICAgICAgICAgICAgIG1Xb3JkRWRpdFRleHQuc2V0VGV4dCh3b3JkKTsKICAgICAgICAgICAgIG1Xb3JkRWRpdFRleHQuc2V0U2VsZWN0aW9uKHdvcmQubGVuZ3RoKCkpOwogICAgICAgICB9Ci0gICAgICAgIGZpbmFsIFN0cmluZyBzaG9ydGN1dCA9IGFyZ3MuZ2V0U3RyaW5nKEVYVFJBX1NIT1JUQ1VUKTsKLSAgICAgICAgaWYgKG51bGwgIT0gc2hvcnRjdXQgJiYgbnVsbCAhPSBtU2hvcnRjdXRFZGl0VGV4dCkgewotICAgICAgICAgICAgbVNob3J0Y3V0RWRpdFRleHQuc2V0VGV4dChzaG9ydGN1dCk7CisgICAgICAgIGZpbmFsIFN0cmluZyBzaG9ydGN1dDsKKyAgICAgICAgaWYgKFVzZXJEaWN0aW9uYXJ5U2V0dGluZ3MuSVNfU0hPUlRDVVRfQVBJX1NVUFBPUlRFRCkgeworICAgICAgICAgICAgc2hvcnRjdXQgPSBhcmdzLmdldFN0cmluZyhFWFRSQV9TSE9SVENVVCk7CisgICAgICAgICAgICBpZiAobnVsbCAhPSBzaG9ydGN1dCAmJiBudWxsICE9IG1TaG9ydGN1dEVkaXRUZXh0KSB7CisgICAgICAgICAgICAgICAgbVNob3J0Y3V0RWRpdFRleHQuc2V0VGV4dChzaG9ydGN1dCk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBtT2xkU2hvcnRjdXQgPSBhcmdzLmdldFN0cmluZyhFWFRSQV9TSE9SVENVVCk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICBzaG9ydGN1dCA9IG51bGw7CisgICAgICAgICAgICBtT2xkU2hvcnRjdXQgPSBudWxsOwogICAgICAgICB9CiAgICAgICAgIG1Nb2RlID0gYXJncy5nZXRJbnQoRVhUUkFfTU9ERSk7IC8vIGRlZmF1bHQgcmV0dXJuIHZhbHVlIGZvciAjZ2V0SW50KCkgaXMgMCA9IE1PREVfRURJVAogICAgICAgICBtT2xkV29yZCA9IGFyZ3MuZ2V0U3RyaW5nKEVYVFJBX1dPUkQpOwotICAgICAgICBtT2xkU2hvcnRjdXQgPSBhcmdzLmdldFN0cmluZyhFWFRSQV9TSE9SVENVVCk7CiAgICAgICAgIHVwZGF0ZUxvY2FsZShhcmdzLmdldFN0cmluZyhFWFRSQV9MT0NBTEUpKTsKICAgICB9CiAKQEAgLTExMCw3ICsxMjEsOCBAQAogICAgICAgICAvLyBJZiB3ZSBhcmUgaW4gYWRkIG1vZGUsIG5vdGhpbmcgd2FzIGFkZGVkLCBzbyB3ZSBkb24ndCBuZWVkIHRvIGRvIGFueXRoaW5nLgogICAgIH0KIAotICAgIC8qIHBhY2thZ2UgKi8gaW50IGFwcGx5KGZpbmFsIENvbnRleHQgY29udGV4dCwgZmluYWwgQnVuZGxlIG91dFBhcmFtZXRlcnMpIHsKKyAgICAvKiBwYWNrYWdlICovCisgICAgaW50IGFwcGx5KGZpbmFsIENvbnRleHQgY29udGV4dCwgZmluYWwgQnVuZGxlIG91dFBhcmFtZXRlcnMpIHsKICAgICAgICAgaWYgKG51bGwgIT0gb3V0UGFyYW1ldGVycykgc2F2ZVN0YXRlSW50b0J1bmRsZShvdXRQYXJhbWV0ZXJzKTsKICAgICAgICAgZmluYWwgQ29udGVudFJlc29sdmVyIHJlc29sdmVyID0gY29udGV4dC5nZXRDb250ZW50UmVzb2x2ZXIoKTsKICAgICAgICAgaWYgKE1PREVfRURJVCA9PSBtTW9kZSAmJiAhVGV4dFV0aWxzLmlzRW1wdHkobU9sZFdvcmQpKSB7CkBAIC0xMTksNyArMTMxLDkgQEAKICAgICAgICAgfQogICAgICAgICBmaW5hbCBTdHJpbmcgbmV3V29yZCA9IG1Xb3JkRWRpdFRleHQuZ2V0VGV4dCgpLnRvU3RyaW5nKCk7CiAgICAgICAgIGZpbmFsIFN0cmluZyBuZXdTaG9ydGN1dDsKLSAgICAgICAgaWYgKG51bGwgPT0gbVNob3J0Y3V0RWRpdFRleHQpIHsKKyAgICAgICAgaWYgKCFVc2VyRGljdGlvbmFyeVNldHRpbmdzLklTX1NIT1JUQ1VUX0FQSV9TVVBQT1JURUQpIHsKKyAgICAgICAgICAgIG5ld1Nob3J0Y3V0ID0gbnVsbDsKKyAgICAgICAgfSBlbHNlIGlmIChudWxsID09IG1TaG9ydGN1dEVkaXRUZXh0KSB7CiAgICAgICAgICAgICBuZXdTaG9ydGN1dCA9IG51bGw7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBmaW5hbCBTdHJpbmcgdG1wU2hvcnRjdXQgPSBtU2hvcnRjdXRFZGl0VGV4dC5nZXRUZXh0KCkudG9TdHJpbmcoKTsKQEAgLTE1MCw5ICsxNjQsOSBAQAogCiAgICAgICAgIC8vIEluIHRoaXMgY2xhc3Mgd2UgdXNlIHRoZSBlbXB0eSBzdHJpbmcgdG8gcmVwcmVzZW50ICdhbGwgbG9jYWxlcycgYW5kIG1Mb2NhbGUgY2Fubm90CiAgICAgICAgIC8vIGJlIG51bGwuIEhvd2V2ZXIgdGhlIGFkZFdvcmQgbWV0aG9kIHRha2VzIG51bGwgdG8gbWVhbiAnYWxsIGxvY2FsZXMnLgotICAgICAgICBVc2VyRGljdGlvbmFyeS5Xb3Jkcy5hZGRXb3JkKGNvbnRleHQsIG5ld1dvcmQudG9TdHJpbmcoKSwKLSAgICAgICAgICAgICAgICBGUkVRVUVOQ1lfRk9SX1VTRVJfRElDVElPTkFSWV9BRERTLCBuZXdTaG9ydGN1dCwKLSAgICAgICAgICAgICAgICBUZXh0VXRpbHMuaXNFbXB0eShtTG9jYWxlKSA/IG51bGwgOiBMb2NhbGVVdGlscy5jb25zdHJ1Y3RMb2NhbGVGcm9tU3RyaW5nKG1Mb2NhbGUpKTsKKyAgICAgICAgVXNlckRpY3Rpb25hcnlDb21wYXRVdGlscy5hZGRXb3JkKGNvbnRleHQsIG5ld1dvcmQudG9TdHJpbmcoKSwKKyAgICAgICAgICAgICAgICBGUkVRVUVOQ1lfRk9SX1VTRVJfRElDVElPTkFSWV9BRERTLCBuZXdTaG9ydGN1dCwgVGV4dFV0aWxzLmlzRW1wdHkobUxvY2FsZSkgPworICAgICAgICAgICAgICAgICAgICAgICAgbnVsbCA6IExvY2FsZVV0aWxzLmNvbnN0cnVjdExvY2FsZUZyb21TdHJpbmcobUxvY2FsZSkpOwogCiAgICAgICAgIHJldHVybiBDT0RFX1dPUkRfQURERUQ7CiAgICAgfQpkaWZmIC0tZ2l0IGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvbGF0aW4vdXNlcmRpY3Rpb25hcnkvVXNlckRpY3Rpb25hcnlBZGRXb3JkRnJhZ21lbnQuamF2YSBiL2phdmEvc3JjL2NvbS9hbmRyb2lkL2lucHV0bWV0aG9kL2xhdGluL3VzZXJkaWN0aW9uYXJ5L1VzZXJEaWN0aW9uYXJ5QWRkV29yZEZyYWdtZW50LmphdmEKaW5kZXggNzk3MGEzNi4uNWY0YzQ0NiAxMDA2NDQKLS0tIGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvbGF0aW4vdXNlcmRpY3Rpb25hcnkvVXNlckRpY3Rpb25hcnlBZGRXb3JkRnJhZ21lbnQuamF2YQorKysgYi9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9sYXRpbi91c2VyZGljdGlvbmFyeS9Vc2VyRGljdGlvbmFyeUFkZFdvcmRGcmFnbWVudC5qYXZhCkBAIC00OSw3ICs0OSw4IEBACiBwdWJsaWMgY2xhc3MgVXNlckRpY3Rpb25hcnlBZGRXb3JkRnJhZ21lbnQgZXh0ZW5kcyBGcmFnbWVudAogICAgICAgICBpbXBsZW1lbnRzIEFkYXB0ZXJWaWV3Lk9uSXRlbVNlbGVjdGVkTGlzdGVuZXIsIExvY2F0aW9uQ2hhbmdlZExpc3RlbmVyIHsKIAotICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBPUFRJT05TX01FTlVfREVMRVRFID0gTWVudS5GSVJTVDsKKyAgICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgT1BUSU9OU19NRU5VX0FERCA9IE1lbnUuRklSU1Q7CisgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IE9QVElPTlNfTUVOVV9ERUxFVEUgPSBNZW51LkZJUlNUICsgMTsKIAogICAgIHByaXZhdGUgVXNlckRpY3Rpb25hcnlBZGRXb3JkQ29udGVudHMgbUNvbnRlbnRzOwogICAgIHByaXZhdGUgVmlldyBtUm9vdFZpZXc7CkBAIC03MywyMSArNzQsMjkgQEAKIAogICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyB2b2lkIG9uQ3JlYXRlT3B0aW9uc01lbnUoTWVudSBtZW51LCBNZW51SW5mbGF0ZXIgaW5mbGF0ZXIpIHsKLSAgICAgICAgTWVudUl0ZW0gYWN0aW9uSXRlbSA9IG1lbnUuYWRkKDAsIE9QVElPTlNfTUVOVV9ERUxFVEUsIDAsCisgICAgICAgIGZpbmFsIE1lbnVJdGVtIGFjdGlvbkl0ZW1EZWxldGUgPSBtZW51LmFkZCgwLCBPUFRJT05TX01FTlVfREVMRVRFLCAwLAogICAgICAgICAgICAgICAgIFIuc3RyaW5nLnVzZXJfZGljdF9zZXR0aW5nc19kZWxldGUpLnNldEljb24oYW5kcm9pZC5SLmRyYXdhYmxlLmljX21lbnVfZGVsZXRlKTsKLSAgICAgICAgYWN0aW9uSXRlbS5zZXRTaG93QXNBY3Rpb24oTWVudUl0ZW0uU0hPV19BU19BQ1RJT05fSUZfUk9PTSB8Ci0gICAgICAgICAgICAgICAgTWVudUl0ZW0uU0hPV19BU19BQ1RJT05fV0lUSF9URVhUKTsKKyAgICAgICAgYWN0aW9uSXRlbURlbGV0ZS5zZXRTaG93QXNBY3Rpb24oCisgICAgICAgICAgICAgICAgTWVudUl0ZW0uU0hPV19BU19BQ1RJT05fSUZfUk9PTSB8IE1lbnVJdGVtLlNIT1dfQVNfQUNUSU9OX1dJVEhfVEVYVCk7CisgICAgICAgIGZpbmFsIE1lbnVJdGVtIGFjdGlvbkl0ZW1BZGQgPSBtZW51LmFkZCgwLCBPUFRJT05TX01FTlVfQURELCAwLAorICAgICAgICAgICAgICAgIFIuc3RyaW5nLnVzZXJfZGljdF9zZXR0aW5nc19kZWxldGUpLnNldEljb24oUi5kcmF3YWJsZS5pY19tZW51X2FkZCk7CisgICAgICAgIGFjdGlvbkl0ZW1BZGQuc2V0U2hvd0FzQWN0aW9uKAorICAgICAgICAgICAgICAgIE1lbnVJdGVtLlNIT1dfQVNfQUNUSU9OX0lGX1JPT00gfCBNZW51SXRlbS5TSE9XX0FTX0FDVElPTl9XSVRIX1RFWFQpOwogICAgIH0KIAogICAgIC8qKgogICAgICAqIENhbGxiYWNrIGZvciB0aGUgZnJhbWV3b3JrIHdoZW4gYSBtZW51IG9wdGlvbiBpcyBwcmVzc2VkLgogICAgICAqCi0gICAgICogVGhpcyBjbGFzcyBvbmx5IHN1cHBvcnRzIHRoZSBkZWxldGUgbWVudSBpdGVtLgogICAgICAqIEBwYXJhbSBNZW51SXRlbSB0aGUgaXRlbSB0aGF0IHdhcyBwcmVzc2VkCiAgICAgICogQHJldHVybiBmYWxzZSB0byBhbGxvdyBub3JtYWwgbWVudSBwcm9jZXNzaW5nIHRvIHByb2NlZWQsIHRydWUgdG8gY29uc3VtZSBpdCBoZXJlCiAgICAgICovCiAgICAgQE92ZXJyaWRlCiAgICAgcHVibGljIGJvb2xlYW4gb25PcHRpb25zSXRlbVNlbGVjdGVkKE1lbnVJdGVtIGl0ZW0pIHsKKyAgICAgICAgaWYgKGl0ZW0uZ2V0SXRlbUlkKCkgPT0gT1BUSU9OU19NRU5VX0FERCkgeworICAgICAgICAgICAgLy8gYWRkZWQgdGhlIGVudHJ5IGluICJvblBhdXNlIgorICAgICAgICAgICAgZ2V0QWN0aXZpdHkoKS5vbkJhY2tQcmVzc2VkKCk7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQogICAgICAgICBpZiAoaXRlbS5nZXRJdGVtSWQoKSA9PSBPUFRJT05TX01FTlVfREVMRVRFKSB7CiAgICAgICAgICAgICBtQ29udGVudHMuZGVsZXRlKGdldEFjdGl2aXR5KCkpOwogICAgICAgICAgICAgbUlzRGVsZXRpbmcgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvbGF0aW4vdXNlcmRpY3Rpb25hcnkvVXNlckRpY3Rpb25hcnlMaXN0LmphdmEgYi9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9sYXRpbi91c2VyZGljdGlvbmFyeS9Vc2VyRGljdGlvbmFyeUxpc3QuamF2YQppbmRleCAyZDE0N2FhLi42ZTY0ODgyIDEwMDY0NAotLS0gYS9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9sYXRpbi91c2VyZGljdGlvbmFyeS9Vc2VyRGljdGlvbmFyeUxpc3QuamF2YQorKysgYi9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9sYXRpbi91c2VyZGljdGlvbmFyeS9Vc2VyRGljdGlvbmFyeUxpc3QuamF2YQpAQCAtMjcsNiArMjcsNyBAQAogaW1wb3J0IGFuZHJvaWQucHJlZmVyZW5jZS5QcmVmZXJlbmNlRnJhZ21lbnQ7CiBpbXBvcnQgYW5kcm9pZC5wcmVmZXJlbmNlLlByZWZlcmVuY2VHcm91cDsKIGltcG9ydCBhbmRyb2lkLnByb3ZpZGVyLlVzZXJEaWN0aW9uYXJ5OworaW1wb3J0IGFuZHJvaWQudGV4dC5UZXh0VXRpbHM7CiAKIGltcG9ydCBqYXZhLnV0aWwuTG9jYWxlOwogaW1wb3J0IGphdmEudXRpbC5UcmVlU2V0OwpAQCAtNTIsMTYgKzUzLDI2IEBACiAgICAgICAgICAgICAgICAgbmV3IFN0cmluZ1tdIHsgVXNlckRpY3Rpb25hcnkuV29yZHMuTE9DQUxFIH0sCiAgICAgICAgICAgICAgICAgbnVsbCwgbnVsbCwgbnVsbCk7CiAgICAgICAgIGZpbmFsIFRyZWVTZXQ8U3RyaW5nPiBsb2NhbGVMaXN0ID0gbmV3IFRyZWVTZXQ8U3RyaW5nPigpOworICAgICAgICBib29sZWFuIGFkZGVkQWxsTG9jYWxlID0gZmFsc2U7CiAgICAgICAgIGlmIChudWxsID09IGN1cnNvcikgewogICAgICAgICAgICAgLy8gVGhlIHVzZXIgZGljdGlvbmFyeSBzZXJ2aWNlIGlzIG5vdCBwcmVzZW50IG9yIGRpc2FibGVkLiBSZXR1cm4gbnVsbC4KICAgICAgICAgICAgIHJldHVybiBudWxsOwogICAgICAgICB9IGVsc2UgaWYgKGN1cnNvci5tb3ZlVG9GaXJzdCgpKSB7CiAgICAgICAgICAgICBmaW5hbCBpbnQgY29sdW1uSW5kZXggPSBjdXJzb3IuZ2V0Q29sdW1uSW5kZXgoVXNlckRpY3Rpb25hcnkuV29yZHMuTE9DQUxFKTsKICAgICAgICAgICAgIGRvIHsKLSAgICAgICAgICAgICAgICBTdHJpbmcgbG9jYWxlID0gY3Vyc29yLmdldFN0cmluZyhjb2x1bW5JbmRleCk7Ci0gICAgICAgICAgICAgICAgbG9jYWxlTGlzdC5hZGQobnVsbCAhPSBsb2NhbGUgPyBsb2NhbGUgOiAiIik7CisgICAgICAgICAgICAgICAgZmluYWwgU3RyaW5nIGxvY2FsZSA9IGN1cnNvci5nZXRTdHJpbmcoY29sdW1uSW5kZXgpOworICAgICAgICAgICAgICAgIGZpbmFsIGJvb2xlYW4gYWxsTG9jYWxlID0gVGV4dFV0aWxzLmlzRW1wdHkobG9jYWxlKTsKKyAgICAgICAgICAgICAgICBsb2NhbGVMaXN0LmFkZChhbGxMb2NhbGUgPyAiIiA6IGxvY2FsZSk7CisgICAgICAgICAgICAgICAgaWYgKGFsbExvY2FsZSkgeworICAgICAgICAgICAgICAgICAgICBhZGRlZEFsbExvY2FsZSA9IHRydWU7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfSB3aGlsZSAoY3Vyc29yLm1vdmVUb05leHQoKSk7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKCFVc2VyRGljdGlvbmFyeVNldHRpbmdzLklTX1NIT1JUQ1VUX0FQSV9TVVBQT1JURUQgJiYgIWFkZGVkQWxsTG9jYWxlKSB7CisgICAgICAgICAgICAvLyBGb3IgSUNTLCB3ZSBuZWVkIHRvIHNob3cgIkZvciBhbGwgbGFuZ3VhZ2VzIiBpbiBjYXNlIHRoYXQgdGhlIGtleWJvYXJkIGxvY2FsZQorICAgICAgICAgICAgLy8gaXMgZGlmZmVyZW50IGZyb20gdGhlIHN5c3RlbSBsb2NhbGUKKyAgICAgICAgICAgIGxvY2FsZUxpc3QuYWRkKCIiKTsKKyAgICAgICAgfQogICAgICAgICBsb2NhbGVMaXN0LmFkZChMb2NhbGUuZ2V0RGVmYXVsdCgpLnRvU3RyaW5nKCkpOwogICAgICAgICByZXR1cm4gbG9jYWxlTGlzdDsKICAgICB9CmRpZmYgLS1naXQgYS9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9sYXRpbi91c2VyZGljdGlvbmFyeS9Vc2VyRGljdGlvbmFyeVNldHRpbmdzLmphdmEgYi9qYXZhL3NyYy9jb20vYW5kcm9pZC9pbnB1dG1ldGhvZC9sYXRpbi91c2VyZGljdGlvbmFyeS9Vc2VyRGljdGlvbmFyeVNldHRpbmdzLmphdmEKaW5kZXggYTI1MGMyNC4uMzZiYzViYSAxMDA2NDQKLS0tIGEvamF2YS9zcmMvY29tL2FuZHJvaWQvaW5wdXRtZXRob2QvbGF0aW4vdXNlcmRpY3Rpb25hcnkvVXNlckRpY3Rpb25hcnlTZXR0aW5ncy5qYXZhCisrKyBiL2phdmEvc3JjL2NvbS9hbmRyb2lkL2lucHV0bWV0aG9kL2xhdGluL3VzZXJkaWN0aW9uYXJ5L1VzZXJEaWN0aW9uYXJ5U2V0dGluZ3MuamF2YQpAQCAtMjMsNiArMjMsNyBAQAogaW1wb3J0IGFuZHJvaWQuY29udGVudC5Db250ZXh0OwogaW1wb3J0IGFuZHJvaWQuY29udGVudC5JbnRlbnQ7CiBpbXBvcnQgYW5kcm9pZC5kYXRhYmFzZS5DdXJzb3I7CitpbXBvcnQgYW5kcm9pZC5vcy5CdWlsZDsKIGltcG9ydCBhbmRyb2lkLm9zLkJ1bmRsZTsKIGltcG9ydCBhbmRyb2lkLnByb3ZpZGVyLlVzZXJEaWN0aW9uYXJ5OwogaW1wb3J0IGFuZHJvaWQudGV4dC5UZXh0VXRpbHM7CkBAIC00NywxMyArNDgsNDIgQEAKIAogcHVibGljIGNsYXNzIFVzZXJEaWN0aW9uYXJ5U2V0dGluZ3MgZXh0ZW5kcyBMaXN0RnJhZ21lbnQgewogCi0gICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nW10gUVVFUllfUFJPSkVDVElPTiA9IHsKLSAgICAgICAgVXNlckRpY3Rpb25hcnkuV29yZHMuX0lELCBVc2VyRGljdGlvbmFyeS5Xb3Jkcy5XT1JELCBVc2VyRGljdGlvbmFyeS5Xb3Jkcy5TSE9SVENVVAotICAgIH07CisgICAgcHVibGljIHN0YXRpYyBmaW5hbCBib29sZWFuIElTX1NIT1JUQ1VUX0FQSV9TVVBQT1JURUQgPQorICAgICAgICAgICAgQnVpbGQuVkVSU0lPTi5TREtfSU5UID49IEJ1aWxkLlZFUlNJT05fQ09ERVMuSkVMTFlfQkVBTjsKKworICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZ1tdIFFVRVJZX1BST0pFQ1RJT05fU0hPUlRDVVRfVU5TVVBQT1JURUQgPQorICAgICAgICAgICAgeyBVc2VyRGljdGlvbmFyeS5Xb3Jkcy5fSUQsIFVzZXJEaWN0aW9uYXJ5LldvcmRzLldPUkR9OworICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZ1tdIFFVRVJZX1BST0pFQ1RJT05fU0hPUlRDVVRfU1VQUE9SVEVEID0KKyAgICAgICAgICAgIHsgVXNlckRpY3Rpb25hcnkuV29yZHMuX0lELCBVc2VyRGljdGlvbmFyeS5Xb3Jkcy5XT1JELCBVc2VyRGljdGlvbmFyeS5Xb3Jkcy5TSE9SVENVVH07CisgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nW10gUVVFUllfUFJPSkVDVElPTiA9CisgICAgICAgICAgICBJU19TSE9SVENVVF9BUElfU1VQUE9SVEVEID8KKyAgICAgICAgICAgICAgICAgICAgUVVFUllfUFJPSkVDVElPTl9TSE9SVENVVF9TVVBQT1JURUQgOiBRVUVSWV9QUk9KRUNUSU9OX1NIT1JUQ1VUX1VOU1VQUE9SVEVEOwogCiAgICAgLy8gVGhlIGluZGV4IG9mIHRoZSBzaG9ydGN1dCBpbiB0aGUgYWJvdmUgYXJyYXkuCiAgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IElOREVYX1NIT1JUQ1VUID0gMjsKIAorICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZ1tdIEFEQVBURVJfRlJPTV9TSE9SVENVVF9VTlNVUFBPUlRFRCA9IHsKKyAgICAgICAgVXNlckRpY3Rpb25hcnkuV29yZHMuV09SRCwKKyAgICB9OworCisgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nW10gQURBUFRFUl9GUk9NX1NIT1JUQ1VUX1NVUFBPUlRFRCA9IHsKKyAgICAgICAgVXNlckRpY3Rpb25hcnkuV29yZHMuV09SRCwgVXNlckRpY3Rpb25hcnkuV29yZHMuU0hPUlRDVVQKKyAgICB9OworCisgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgU3RyaW5nW10gQURBUFRFUl9GUk9NID0gSVNfU0hPUlRDVVRfQVBJX1NVUFBPUlRFRCA/CisgICAgICAgICAgICBBREFQVEVSX0ZST01fU0hPUlRDVVRfU1VQUE9SVEVEIDogQURBUFRFUl9GUk9NX1NIT1JUQ1VUX1VOU1VQUE9SVEVEOworCisgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50W10gQURBUFRFUl9UT19TSE9SVENVVF9VTlNVUFBPUlRFRCA9IHsKKyAgICAgICAgYW5kcm9pZC5SLmlkLnRleHQxLAorICAgIH07CisKKyAgICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnRbXSBBREFQVEVSX1RPX1NIT1JUQ1VUX1NVUFBPUlRFRCA9IHsKKyAgICAgICAgYW5kcm9pZC5SLmlkLnRleHQxLCBhbmRyb2lkLlIuaWQudGV4dDIKKyAgICB9OworCisgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50W10gQURBUFRFUl9UTyA9IElTX1NIT1JUQ1VUX0FQSV9TVVBQT1JURUQgPworICAgICAgICAgICAgQURBUFRFUl9UT19TSE9SVENVVF9TVVBQT1JURUQgOiBBREFQVEVSX1RPX1NIT1JUQ1VUX1VOU1VQUE9SVEVEOworCiAgICAgLy8gRWl0aGVyIHRoZSBsb2NhbGUgaXMgZW1wdHkgKG1lYW5zIHRoZSB3b3JkIGlzIGFwcGxpY2FibGUgdG8gYWxsIGxvY2FsZXMpCiAgICAgLy8gb3IgdGhlIHdvcmQgZXF1YWxzIG91ciBjdXJyZW50IGxvY2FsZQogICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBRVUVSWV9TRUxFQ1RJT04gPQpAQCAtNjYsNiArOTYsOCBAQAogICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIFN0cmluZyBERUxFVEVfU0VMRUNUSU9OX1dJVEhPVVRfU0hPUlRDVVQgPSBVc2VyRGljdGlvbmFyeS5Xb3Jkcy5XT1JECiAgICAgICAgICAgICArICI9PyBBTkQgIiArIFVzZXJEaWN0aW9uYXJ5LldvcmRzLlNIT1JUQ1VUICsgIiBpcyBudWxsIE9SICIKICAgICAgICAgICAgICsgVXNlckRpY3Rpb25hcnkuV29yZHMuU0hPUlRDVVQgKyAiPScnIjsKKyAgICBwcml2YXRlIHN0YXRpYyBmaW5hbCBTdHJpbmcgREVMRVRFX1NFTEVDVElPTl9TSE9SVENVVF9VTlNVUFBPUlRFRCA9CisgICAgICAgICAgICBVc2VyRGljdGlvbmFyeS5Xb3Jkcy5XT1JEICsgIj0/IjsKIAogICAgIHByaXZhdGUgc3RhdGljIGZpbmFsIGludCBPUFRJT05TX01FTlVfQUREID0gTWVudS5GSVJTVDsKIApAQCAtMTQ2LDEwICsxNzgsOCBAQAogICAgIH0KIAogICAgIHByaXZhdGUgTGlzdEFkYXB0ZXIgY3JlYXRlQWRhcHRlcigpIHsKLSAgICAgICAgcmV0dXJuIG5ldyBNeUFkYXB0ZXIoZ2V0QWN0aXZpdHkoKSwKLSAgICAgICAgICAgICAgICBSLmxheW91dC51c2VyX2RpY3Rpb25hcnlfaXRlbSwgbUN1cnNvciwKLSAgICAgICAgICAgICAgICBuZXcgU3RyaW5nW10geyBVc2VyRGljdGlvbmFyeS5Xb3Jkcy5XT1JELCBVc2VyRGljdGlvbmFyeS5Xb3Jkcy5TSE9SVENVVCB9LAotICAgICAgICAgICAgICAgIG5ldyBpbnRbXSB7IGFuZHJvaWQuUi5pZC50ZXh0MSwgYW5kcm9pZC5SLmlkLnRleHQyIH0sIHRoaXMpOworICAgICAgICByZXR1cm4gbmV3IE15QWRhcHRlcihnZXRBY3Rpdml0eSgpLCBSLmxheW91dC51c2VyX2RpY3Rpb25hcnlfaXRlbSwgbUN1cnNvciwKKyAgICAgICAgICAgICAgICBBREFQVEVSX0ZST00sIEFEQVBURVJfVE8sIHRoaXMpOwogICAgIH0KIAogICAgIEBPdmVycmlkZQpAQCAtMTYzLDExICsxOTMsMjAgQEAKIAogICAgIEBPdmVycmlkZQogICAgIHB1YmxpYyB2b2lkIG9uQ3JlYXRlT3B0aW9uc01lbnUoTWVudSBtZW51LCBNZW51SW5mbGF0ZXIgaW5mbGF0ZXIpIHsKKyAgICAgICAgaWYgKCFVc2VyRGljdGlvbmFyeVNldHRpbmdzLklTX1NIT1JUQ1VUX0FQSV9TVVBQT1JURUQpIHsKKyAgICAgICAgICAgIGZpbmFsIExvY2FsZSBzeXN0ZW1Mb2NhbGUgPSBnZXRSZXNvdXJjZXMoKS5nZXRDb25maWd1cmF0aW9uKCkubG9jYWxlOworICAgICAgICAgICAgaWYgKCFUZXh0VXRpbHMuaXNFbXB0eShtTG9jYWxlKSAmJiAhbUxvY2FsZS5lcXVhbHMoc3lzdGVtTG9jYWxlLnRvU3RyaW5nKCkpKSB7CisgICAgICAgICAgICAgICAgLy8gSGlkZSB0aGUgYWRkIGJ1dHRvbiBmb3IgSUNTIGJlY2F1c2UgaXQgZG9lc24ndCBzdXBwb3J0IHNwZWNpZnlpbmcgYSBsb2NhbGUKKyAgICAgICAgICAgICAgICAvLyBmb3IgYW4gZW50cnkuIFRoaXMgbmV3ICJsb2NhbGUiLWF3YXJlIEFQSSBoYXMgYmVlbiBhZGRlZCBpbiBjb25qdW5jdGlvbgorICAgICAgICAgICAgICAgIC8vIHdpdGggdGhlIHNob3J0Y3V0IEFQSS4KKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICAgICAgTWVudUl0ZW0gYWN0aW9uSXRlbSA9CiAgICAgICAgICAgICAgICAgbWVudS5hZGQoMCwgT1BUSU9OU19NRU5VX0FERCwgMCwgUi5zdHJpbmcudXNlcl9kaWN0X3NldHRpbmdzX2FkZF9tZW51X3RpdGxlKQogICAgICAgICAgICAgICAgIC5zZXRJY29uKFIuZHJhd2FibGUuaWNfbWVudV9hZGQpOwotICAgICAgICBhY3Rpb25JdGVtLnNldFNob3dBc0FjdGlvbihNZW51SXRlbS5TSE9XX0FTX0FDVElPTl9JRl9ST09NIHwKLSAgICAgICAgICAgICAgICBNZW51SXRlbS5TSE9XX0FTX0FDVElPTl9XSVRIX1RFWFQpOworICAgICAgICBhY3Rpb25JdGVtLnNldFNob3dBc0FjdGlvbigKKyAgICAgICAgICAgICAgICBNZW51SXRlbS5TSE9XX0FTX0FDVElPTl9JRl9ST09NIHwgTWVudUl0ZW0uU0hPV19BU19BQ1RJT05fV0lUSF9URVhUKTsKICAgICB9CiAKICAgICBAT3ZlcnJpZGUKQEAgLTIwOSw2ICsyNDgsNyBAQAogICAgIH0KIAogICAgIHByaXZhdGUgU3RyaW5nIGdldFNob3J0Y3V0KGZpbmFsIGludCBwb3NpdGlvbikgeworICAgICAgICBpZiAoIUlTX1NIT1JUQ1VUX0FQSV9TVVBQT1JURUQpIHJldHVybiBudWxsOwogICAgICAgICBpZiAobnVsbCA9PSBtQ3Vyc29yKSByZXR1cm4gbnVsbDsKICAgICAgICAgbUN1cnNvci5tb3ZlVG9Qb3NpdGlvbihwb3NpdGlvbik7CiAgICAgICAgIC8vIEhhbmRsZSBhIHBvc3NpYmxlIHJhY2UtY29uZGl0aW9uCkBAIC0yMjAsNyArMjYwLDEwIEBACiAKICAgICBwdWJsaWMgc3RhdGljIHZvaWQgZGVsZXRlV29yZChmaW5hbCBTdHJpbmcgd29yZCwgZmluYWwgU3RyaW5nIHNob3J0Y3V0LAogICAgICAgICAgICAgZmluYWwgQ29udGVudFJlc29sdmVyIHJlc29sdmVyKSB7Ci0gICAgICAgIGlmIChUZXh0VXRpbHMuaXNFbXB0eShzaG9ydGN1dCkpIHsKKyAgICAgICAgaWYgKCFJU19TSE9SVENVVF9BUElfU1VQUE9SVEVEKSB7CisgICAgICAgICAgICByZXNvbHZlci5kZWxldGUoVXNlckRpY3Rpb25hcnkuV29yZHMuQ09OVEVOVF9VUkksIERFTEVURV9TRUxFQ1RJT05fU0hPUlRDVVRfVU5TVVBQT1JURUQsCisgICAgICAgICAgICAgICAgICAgIG5ldyBTdHJpbmdbXSB7IHdvcmQgfSk7CisgICAgICAgIH0gZWxzZSBpZiAoVGV4dFV0aWxzLmlzRW1wdHkoc2hvcnRjdXQpKSB7CiAgICAgICAgICAgICByZXNvbHZlci5kZWxldGUoCiAgICAgICAgICAgICAgICAgICAgIFVzZXJEaWN0aW9uYXJ5LldvcmRzLkNPTlRFTlRfVVJJLCBERUxFVEVfU0VMRUNUSU9OX1dJVEhPVVRfU0hPUlRDVVQsCiAgICAgICAgICAgICAgICAgICAgIG5ldyBTdHJpbmdbXSB7IHdvcmQgfSk7CkBAIC0yMzksNiArMjgyLDEwIEBACiAKICAgICAgICAgICAgIEBPdmVycmlkZQogICAgICAgICAgICAgcHVibGljIGJvb2xlYW4gc2V0Vmlld1ZhbHVlKFZpZXcgdiwgQ3Vyc29yIGMsIGludCBjb2x1bW5JbmRleCkgeworICAgICAgICAgICAgICAgIGlmICghSVNfU0hPUlRDVVRfQVBJX1NVUFBPUlRFRCkgeworICAgICAgICAgICAgICAgICAgICAvLyBqdXN0IGxldCBTaW1wbGVDdXJzb3JBZGFwdGVyIHNldCB0aGUgdmlldyB2YWx1ZXMKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBpZiAoY29sdW1uSW5kZXggPT0gSU5ERVhfU0hPUlRDVVQpIHsKICAgICAgICAgICAgICAgICAgICAgZmluYWwgU3RyaW5nIHNob3J0Y3V0ID0gYy5nZXRTdHJpbmcoSU5ERVhfU0hPUlRDVVQpOwogICAgICAgICAgICAgICAgICAgICBpZiAoVGV4dFV0aWxzLmlzRW1wdHkoc2hvcnRjdXQpKSB7CmRpZmYgLS1naXQgYS9uYXRpdmUvam5pL3NyYy9zdWdnZXN0L2NvcmUvcG9saWN5L3RyYXZlcnNhbC5oIGIvbmF0aXZlL2puaS9zcmMvc3VnZ2VzdC9jb3JlL3BvbGljeS90cmF2ZXJzYWwuaAppbmRleCAwMmMzNThhLi5kMzE0NmRhIDEwMDY0NAotLS0gYS9uYXRpdmUvam5pL3NyYy9zdWdnZXN0L2NvcmUvcG9saWN5L3RyYXZlcnNhbC5oCisrKyBiL25hdGl2ZS9qbmkvc3JjL3N1Z2dlc3QvY29yZS9wb2xpY3kvdHJhdmVyc2FsLmgKQEAgLTI4LDcgKzI4LDggQEAKICAgICB2aXJ0dWFsIGludCBnZXRNYXhQb2ludGVyQ291bnQoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBib29sIGFsbG93c0Vycm9yQ29ycmVjdGlvbnMoY29uc3QgRGljTm9kZSAqY29uc3QgZGljTm9kZSkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBpc09taXNzaW9uKGNvbnN0IERpY1RyYXZlcnNlU2Vzc2lvbiAqY29uc3QgdHJhdmVyc2VTZXNzaW9uLAotICAgICAgICAgICAgY29uc3QgRGljTm9kZSAqY29uc3QgZGljTm9kZSwgY29uc3QgRGljTm9kZSAqY29uc3QgY2hpbGREaWNOb2RlKSBjb25zdCA9IDA7CisgICAgICAgICAgICBjb25zdCBEaWNOb2RlICpjb25zdCBkaWNOb2RlLCBjb25zdCBEaWNOb2RlICpjb25zdCBjaGlsZERpY05vZGUsCisgICAgICAgICAgICBjb25zdCBib29sIGFsbG93c0Vycm9yQ29ycmVjdGlvbnMpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgaXNTcGFjZVN1YnN0aXR1dGlvblRlcm1pbmFsKGNvbnN0IERpY1RyYXZlcnNlU2Vzc2lvbiAqY29uc3QgdHJhdmVyc2VTZXNzaW9uLAogICAgICAgICAgICAgY29uc3QgRGljTm9kZSAqY29uc3QgZGljTm9kZSkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgYm9vbCBpc1NwYWNlT21pc3Npb25UZXJtaW5hbChjb25zdCBEaWNUcmF2ZXJzZVNlc3Npb24gKmNvbnN0IHRyYXZlcnNlU2Vzc2lvbiwKZGlmZiAtLWdpdCBhL25hdGl2ZS9qbmkvc3JjL3N1Z2dlc3QvY29yZS9zdWdnZXN0LmNwcCBiL25hdGl2ZS9qbmkvc3JjL3N1Z2dlc3QvY29yZS9zdWdnZXN0LmNwcAppbmRleCBiMWE1ZmYyLi40Zjk0YTlhIDEwMDY0NAotLS0gYS9uYXRpdmUvam5pL3NyYy9zdWdnZXN0L2NvcmUvc3VnZ2VzdC5jcHAKKysrIGIvbmF0aXZlL2puaS9zcmMvc3VnZ2VzdC9jb3JlL3N1Z2dlc3QuY3BwCkBAIC0yOTYsOCArMjk2LDggQEAKICAgICAgICAgICAgICAgICAgICAgY29ycmVjdGlvbkRpY05vZGUuYWR2YW5jZURpZ3JhcGhJbmRleCgpOwogICAgICAgICAgICAgICAgICAgICBwcm9jZXNzRGljTm9kZUFzRGlncmFwaCh0cmF2ZXJzZVNlc3Npb24sICZjb3JyZWN0aW9uRGljTm9kZSk7CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGlmIChhbGxvd3NFcnJvckNvcnJlY3Rpb25zCi0gICAgICAgICAgICAgICAgICAgICAgICAmJiBUUkFWRVJTQUwtPmlzT21pc3Npb24odHJhdmVyc2VTZXNzaW9uLCAmZGljTm9kZSwgY2hpbGREaWNOb2RlKSkgeworICAgICAgICAgICAgICAgIGlmIChUUkFWRVJTQUwtPmlzT21pc3Npb24odHJhdmVyc2VTZXNzaW9uLCAmZGljTm9kZSwgY2hpbGREaWNOb2RlLAorICAgICAgICAgICAgICAgICAgICAgICAgYWxsb3dzRXJyb3JDb3JyZWN0aW9ucykpIHsKICAgICAgICAgICAgICAgICAgICAgLy8gVE9ETzogKEdlc3R1cmUpIENoYW5nZSB3ZWlnaHQgYmV0d2VlbiBvbWlzc2lvbiBhbmQgc3Vic3RpdHV0aW9uIGVycm9ycwogICAgICAgICAgICAgICAgICAgICAvLyBUT0RPOiAoR2VzdHVyZSkgVGVybWluYWwgbm9kZSBzaG91bGQgbm90IGJlIGhhbmRsZWQgYXMgb21pc3Npb24KICAgICAgICAgICAgICAgICAgICAgY29ycmVjdGlvbkRpY05vZGUuaW5pdEJ5Q29weShjaGlsZERpY05vZGUpOwpkaWZmIC0tZ2l0IGEvbmF0aXZlL2puaS9zcmMvc3VnZ2VzdC9wb2xpY3lpbXBsL3R5cGluZy90eXBpbmdfdHJhdmVyc2FsLmggYi9uYXRpdmUvam5pL3NyYy9zdWdnZXN0L3BvbGljeWltcGwvdHlwaW5nL3R5cGluZ190cmF2ZXJzYWwuaAppbmRleCA5ZjgzNDc0Li5mYjFmYjc5IDEwMDY0NAotLS0gYS9uYXRpdmUvam5pL3NyYy9zdWdnZXN0L3BvbGljeWltcGwvdHlwaW5nL3R5cGluZ190cmF2ZXJzYWwuaAorKysgYi9uYXRpdmUvam5pL3NyYy9zdWdnZXN0L3BvbGljeWltcGwvdHlwaW5nL3R5cGluZ190cmF2ZXJzYWwuaApAQCAtNDMsMTAgKzQzLDE3IEBACiAgICAgfQogCiAgICAgQUtfRk9SQ0VfSU5MSU5FIGJvb2wgaXNPbWlzc2lvbihjb25zdCBEaWNUcmF2ZXJzZVNlc3Npb24gKmNvbnN0IHRyYXZlcnNlU2Vzc2lvbiwKLSAgICAgICAgICAgIGNvbnN0IERpY05vZGUgKmNvbnN0IGRpY05vZGUsIGNvbnN0IERpY05vZGUgKmNvbnN0IGNoaWxkRGljTm9kZSkgY29uc3QgeworICAgICAgICAgICAgY29uc3QgRGljTm9kZSAqY29uc3QgZGljTm9kZSwgY29uc3QgRGljTm9kZSAqY29uc3QgY2hpbGREaWNOb2RlLAorICAgICAgICAgICAgY29uc3QgYm9vbCBhbGxvd3NFcnJvckNvcnJlY3Rpb25zKSBjb25zdCB7CiAgICAgICAgIGlmICghQ09SUkVDVF9PTUlTU0lPTikgewogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9CisgICAgICAgIC8vIE5vdGU6IEFsd2F5cyBjb25zaWRlciBpbnRlbnRpb25hbCBvbWlzc2lvbnMgKGxpa2UgYXBvc3Ryb3BoZXMpIHNpbmNlIHRoZXkgYXJlIGNvbW1vbi4KKyAgICAgICAgY29uc3QgYm9vbCBjYW5Db25zaWRlck9taXNzaW9uID0KKyAgICAgICAgICAgICAgICBhbGxvd3NFcnJvckNvcnJlY3Rpb25zIHx8IGNoaWxkRGljTm9kZS0+Y2FuQmVJbnRlbnRpb25hbE9taXNzaW9uKCk7CisgICAgICAgIGlmICghY2FuQ29uc2lkZXJPbWlzc2lvbikgeworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CiAgICAgICAgIGNvbnN0IGludCBpbnB1dFNpemUgPSB0cmF2ZXJzZVNlc3Npb24tPmdldElucHV0U2l6ZSgpOwogICAgICAgICAvLyBUT0RPOiBEb24ndCByZWZlciB0byBpc0NvbXBsZXRpb24/CiAgICAgICAgIGlmIChkaWNOb2RlLT5pc0NvbXBsZXRpb24oaW5wdXRTaXplKSkgewo=