146642 2015-07-06 09:32:27 -0700 [Mac] Inactive AirPlay route should automatically timeout 2015-07-06 11:06:23 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue webkit-bug-importer oldest_to_newest 1107116 0 eric.carlson 2015-07-06 09:32:27 -0700 Invalidate an AirPlay route when a media element has been paused for long enough. 1107118 1 eric.carlson 2015-07-06 09:41:06 -0700 <rdar://problem/21602955> 1107129 2 256218 eric.carlson 2015-07-06 10:19:08 -0700 Created attachment 256218 Proposed patch. 1107130 3 commit-queue 2015-07-06 10:22:04 -0700 Attachment 256218 did not pass style-queue: ERROR: Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp:179: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1107140 4 256220 eric.carlson 2015-07-06 10:55:19 -0700 Created attachment 256220 Updated patch. 1107146 5 256220 bfulgham 2015-07-06 10:59:32 -0700 Comment on attachment 256220 Updated patch. View in context: https://bugs.webkit.org/attachment.cgi?id=256220&action=review r=me. Please correct that indentation issue. > Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp:181 > +} Whoops! This brace needs to be indented to match the "if" statement. 1107152 6 eric.carlson 2015-07-06 11:06:23 -0700 Committed r186361: https://trac.webkit.org/r186361 256218 2015-07-06 10:19:08 -0700 2015-07-06 10:55:19 -0700 Proposed patch. watchdog_timer_patch_3.txt text/plain 12937 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NjM1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDE1LTA3LTA2ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIEluYWN0aXZl IEFpclBsYXkgcm91dGUgc2hvdWxkIGF1dG9tYXRpY2FsbHkgdGltZW91dAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2NjQyCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8yMTYwMjk1NT4KKworICAgICAgICBBdXRvbWF0aWNhbGx5IGNsZWFyIGEgbWVk aWEgZWxlbWVudCdzIEFpclBsYXkgY29ubmVjdGlvbiBhZnRlciBpdCBoYXMgYmVlbiBwYXVzZWQK KyAgICAgICAgZm9yIDYwIG1pbnV0ZXMsIG9yIGFmdGVyIDggbWludXRlcyBpZiBpdCBwbGF5ZWQg dG8gdGhlIGVuZCBiZWZvcmUgcGF1c2luZy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzZXNzaW9uL1dlYk1lZGlhU2Vzc2lv bk1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6 V2ViTWVkaWFTZXNzaW9uTWFuYWdlcik6IEluaXRpYWxpemUgbV93YXRjaGRvZ1RpbWVyLgorICAg ICAgICAoV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6Y2xpZW50U3RhdGVEaWRDaGFu Z2UpOiBTY2hlZHVsZSB3YXRjaGRvZyB0aW1lciBjb25maWd1cmF0aW9uCisgICAgICAgICAgaWYg dGhlIGNsaWVudCBzdGFydGVkIHBsYXlpbmcgb3IgcGF1c2VkLgorICAgICAgICAoV2ViQ29yZTo6 V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6Y29uZmlndXJlUGxheWJhY2tUYXJnZXRDbGllbnRzKTog U2NoZWR1bGUgd2F0Y2hkb2cgdGltZXIgY29uZmlndXJhdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6 OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnRvU3RyaW5nKTogUHJpbnQgd2F0Y2hkb2cgY29uZmln dXJhdGlvbiBmbGFnLgorICAgICAgICAoV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6 dGFza1RpbWVyRmlyZWQpOiBDYWxsIGNvbmZpZ3VyZVdhdGNoZG9nVGltZXIuCisgICAgICAgIChX ZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpjb25maWd1cmVXYXRjaGRvZ1RpbWVyKTog TmV3LCBzdGFydCBvciBzdG9wIHdhdGNoZG9nIHRpbWVyLgorICAgICAgICAoV2ViQ29yZTo6V2Vi TWVkaWFTZXNzaW9uTWFuYWdlcjo6d2F0Y2hkb2dUaW1lckZpcmVkKTogU3RvcCBtb25pdG9yaW5n IGZvciB0YXJnZXRzLCB3aGljaCAKKyAgICAgICAgICBjbGVhcnMgdGhlIHJvdXRlLgorICAgICAg ICAqIE1vZHVsZXMvbWVkaWFzZXNzaW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXIuaDoKKworICAg ICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50OjptZWRpYVN0YXRlKTogU2V0IERpZFBsYXlUb0VuZCB3aGVuIGFwcHJvcHJp YXRlLgorCisgICAgICAgICogcGFnZS9NZWRpYVByb2R1Y2VyLmg6IEFkZCBEaWRQbGF5VG9FbmQu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXliYWNrVGFyZ2V0UGlja2VyTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5YmFj a1RhcmdldFBpY2tlck1hYzo6fk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWMpOiBDbGVhciBt X2NsaWVudCwgY2FsbAorICAgICAgICAgIHN0b3BNb25pdG9yaW5nUGxheWJhY2tUYXJnZXRzLgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYzo6cGVuZGluZ0Fj dGlvblRpbWVyRmlyZWQpOiBTZW5kIGEgbmV1dGVyZWQgCisgICAgICAgICAgTWVkaWFQbGF5YmFj a1RhcmdldCB3aGVuIG1fb3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXIgaXMgTlVMTC4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6OmRldmljZVBpY2tlcik6 IEFkZCBsb2dnaW5nLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5YmFja1RhcmdldFBpY2tl ck1hYzo6c3RvcE1vbml0b3JpbmdQbGF5YmFja1RhcmdldHMpOiBDbGVhciB0aGUgbWVudQorICAg ICAgICAgIGNvbnRyb2xsZXIgdG8gY2FuY2VsIHRoZSByb3V0ZS4KKwogMjAxNS0wNy0wNiAgWmFu IERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRml4IGJ1 aWxkIGVycm9ycyB3aXRoIE9wZW5HTCBFUwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlci5j cHAJKHJldmlzaW9uIDE4NjI4OCkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNz aW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NSw2ICs1 NSw3IEBAIHN0cnVjdCBDbGllbnRTdGF0ZSB7CiAgICAgV2ViQ29yZTo6TWVkaWFQcm9kdWNlcjo6 TWVkaWFTdGF0ZUZsYWdzIGZsYWdzIHsgV2ViQ29yZTo6TWVkaWFQcm9kdWNlcjo6SXNOb3RQbGF5 aW5nIH07CiAgICAgYm9vbCByZXF1ZXN0ZWRQaWNrZXIgeyBmYWxzZSB9OwogICAgIGJvb2wgY29u ZmlndXJhdGlvblJlcXVpcmVkIHsgdHJ1ZSB9OworICAgIGJvb2wgcGxheWVkVG9FbmQgeyBmYWxz ZSB9OwogfTsKIAogc3RhdGljIGJvb2wgZmxhZ3NBcmVTZXQoTWVkaWFQcm9kdWNlcjo6TWVkaWFT dGF0ZUZsYWdzIHZhbHVlLCB1bnNpZ25lZCBmbGFncykKQEAgLTg3LDYgKzg4LDcgQEAgc3RhdGlj IFN0cmluZyBtZWRpYVByb2R1Y2VyU3RhdGVTdHJpbmcoTQogCiBXZWJNZWRpYVNlc3Npb25NYW5h Z2VyOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyKCkKICAgICA6IG1fdGFza1RpbWVyKFJ1bkxvb3A6 OmN1cnJlbnQoKSwgdGhpcywgJldlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnRhc2tUaW1lckZpcmVk KQorICAgICwgbV93YXRjaGRvZ1RpbWVyKFJ1bkxvb3A6OmN1cnJlbnQoKSwgdGhpcywgJldlYk1l ZGlhU2Vzc2lvbk1hbmFnZXI6OndhdGNoZG9nVGltZXJGaXJlZCkKIHsKIH0KIApAQCAtMTcxLDYg KzE3MywxMyBAQCB2b2lkIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OmNsaWVudFN0YXRlCiAgICAg aWYgKCFmbGFnc0FyZVNldChvbGRGbGFncywgTWVkaWFQcm9kdWNlcjo6UmVxdWlyZXNQbGF5YmFj a1RhcmdldE1vbml0b3JpbmcpICYmIGZsYWdzQXJlU2V0KG5ld0ZsYWdzLCBNZWRpYVByb2R1Y2Vy OjpSZXF1aXJlc1BsYXliYWNrVGFyZ2V0TW9uaXRvcmluZykpCiAgICAgICAgIHNjaGVkdWxlRGVs YXllZFRhc2soVGFyZ2V0TW9uaXRvcmluZ0NvbmZpZ3VyYXRpb25UYXNrKTsKIAorICAgIE1lZGlh UHJvZHVjZXI6Ok1lZGlhU3RhdGVGbGFncyBwbGF5aW5nVG9UYXJnZXRGbGFncyA9IE1lZGlhUHJv ZHVjZXI6OklzUGxheWluZ1RvRXh0ZXJuYWxEZXZpY2UgfCBNZWRpYVByb2R1Y2VyOjpJc1BsYXlp bmdWaWRlbzsKKyAgICBpZiAoKG9sZEZsYWdzICYgcGxheWluZ1RvVGFyZ2V0RmxhZ3MpICE9IChu ZXdGbGFncyAmIHBsYXlpbmdUb1RhcmdldEZsYWdzKSkgeworICAgICAgICBpZiAoZmxhZ3NBcmVT ZXQob2xkRmxhZ3MsIE1lZGlhUHJvZHVjZXI6OklzUGxheWluZ1ZpZGVvKSAmJiAhZmxhZ3NBcmVT ZXQobmV3RmxhZ3MsIE1lZGlhUHJvZHVjZXI6OklzUGxheWluZ1ZpZGVvKSAmJiBmbGFnc0FyZVNl dChuZXdGbGFncywgTWVkaWFQcm9kdWNlcjo6RGlkUGxheVRvRW5kKSkKKyAgICAgICAgICAgICBj aGFuZ2VkQ2xpZW50U3RhdGUtPnBsYXllZFRvRW5kID0gdHJ1ZTsKKyAgICAgICAgc2NoZWR1bGVE ZWxheWVkVGFzayhXYXRjaGRvZ1RpbWVyQ29uZmlndXJhdGlvblRhc2spOworfSAKKwogICAgIGlm ICghbV9wbGF5YmFja1RhcmdldCB8fCAhbV9wbGF5YmFja1RhcmdldC0+aGFzQWN0aXZlUm91dGUo KSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0yNzYsNiArMjg1LDggQEAgdm9pZCBXZWJNZWRpYVNl c3Npb25NYW5hZ2VyOjpjb25maWd1cmVQbAogICAgICAgICBpZiAoIWZsYWdzQXJlU2V0KHN0YXRl LT5mbGFncywgTWVkaWFQcm9kdWNlcjo6SXNQbGF5aW5nVG9FeHRlcm5hbERldmljZSkpCiAgICAg ICAgICAgICBzdGF0ZS0+Y2xpZW50LnNldFNob3VsZFBsYXlUb1BsYXliYWNrVGFyZ2V0KHN0YXRl LT5jb250ZXh0SWQsIHRydWUpOwogICAgIH0KKworICAgIGNvbmZpZ3VyZVdhdGNoZG9nVGltZXIo KTsKIH0KIAogdm9pZCBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpjb25maWd1cmVQbGF5YmFja1Rh cmdldE1vbml0b3JpbmcoKQpAQCAtMzA2LDYgKzMxNyw4IEBAIFN0cmluZyBXZWJNZWRpYVNlc3Np b25NYW5hZ2VyOjp0b1N0cmluZygKICAgICAgICAgc3RyaW5nLmFwcGVuZCgiVGFyZ2V0Q2xpZW50 c0NvbmZpZ3VyYXRpb25UYXNrICsgIik7CiAgICAgaWYgKHRhc2tzICYgVGFyZ2V0TW9uaXRvcmlu Z0NvbmZpZ3VyYXRpb25UYXNrKQogICAgICAgICBzdHJpbmcuYXBwZW5kKCJUYXJnZXRNb25pdG9y aW5nQ29uZmlndXJhdGlvblRhc2sgKyAiKTsKKyAgICBpZiAodGFza3MgJiBXYXRjaGRvZ1RpbWVy Q29uZmlndXJhdGlvblRhc2spCisgICAgICAgIHN0cmluZy5hcHBlbmQoIldhdGNoZG9nVGltZXJD b25maWd1cmF0aW9uVGFzayArICIpOwogICAgIGlmIChzdHJpbmcuaXNFbXB0eSgpKQogICAgICAg ICBzdHJpbmcuYXBwZW5kKCJOb1Rhc2siKTsKICAgICBlbHNlCkBAIC0zMzMsNiArMzQ2LDggQEAg dm9pZCBXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjp0YXNrVGltZXJGaQogICAgICAgICBjb25maWd1 cmVQbGF5YmFja1RhcmdldENsaWVudHMoKTsKICAgICBpZiAobV90YXNrRmxhZ3MgJiBUYXJnZXRN b25pdG9yaW5nQ29uZmlndXJhdGlvblRhc2spCiAgICAgICAgIGNvbmZpZ3VyZVBsYXliYWNrVGFy Z2V0TW9uaXRvcmluZygpOworICAgIGlmIChtX3Rhc2tGbGFncyAmIFdhdGNoZG9nVGltZXJDb25m aWd1cmF0aW9uVGFzaykKKyAgICAgICAgY29uZmlndXJlV2F0Y2hkb2dUaW1lcigpOwogCiAgICAg bV90YXNrRmxhZ3MgPSBOb1Rhc2s7CiB9CkBAIC0zNDcsNiArMzYyLDQ5IEBAIHNpemVfdCBXZWJN ZWRpYVNlc3Npb25NYW5hZ2VyOjpmaW5kKFdlYk0KICAgICByZXR1cm4gbm90Rm91bmQ7CiB9CiAK K3ZvaWQgV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6Y29uZmlndXJlV2F0Y2hkb2dUaW1lcigpCit7 CisgICAgc3RhdGljIGNvbnN0IGRvdWJsZSB3YXRjaGRvZ1RpbWVySW50ZXJ2YWxBZnRlclBhdXNp bmcgPSA2MCAqIDYwOworICAgIHN0YXRpYyBjb25zdCBkb3VibGUgd2F0Y2hkb2dUaW1lckludGVy dmFsQWZ0ZXJQbGF5aW5nVG9FbmQgPSA4ICogNjA7CisKKyAgICBpZiAoIW1fcGxheWJhY2tUYXJn ZXQgfHwgIW1fcGxheWJhY2tUYXJnZXQtPmhhc0FjdGl2ZVJvdXRlKCkpIHsKKyAgICAgICAgbV93 YXRjaGRvZ1RpbWVyLnN0b3AoKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGJvb2wg c3RvcFRpbWVyID0gZmFsc2U7CisgICAgYm9vbCBkaWRQbGF5VG9FbmQgPSBmYWxzZTsKKyAgICBm b3IgKGF1dG8mIHN0YXRlIDogbV9jbGllbnRTdGF0ZSkgeworICAgICAgICBpZiAoZmxhZ3NBcmVT ZXQoc3RhdGUtPmZsYWdzLCBNZWRpYVByb2R1Y2VyOjpJc1BsYXlpbmdUb0V4dGVybmFsRGV2aWNl KSAmJiBmbGFnc0FyZVNldChzdGF0ZS0+ZmxhZ3MsIE1lZGlhUHJvZHVjZXI6OklzUGxheWluZ1Zp ZGVvKSkKKyAgICAgICAgICAgIHN0b3BUaW1lciA9IHRydWU7CisgICAgICAgIGlmIChzdGF0ZS0+ cGxheWVkVG9FbmQpCisgICAgICAgICAgICBkaWRQbGF5VG9FbmQgPSB0cnVlOworICAgICAgICBz dGF0ZS0+cGxheWVkVG9FbmQgPSBmYWxzZTsKKyAgICB9CisKKyAgICBpZiAoc3RvcFRpbWVyKSB7 CisgICAgICAgIG1fY3VycmVudFdhdGNoZG9nSW50ZXJ2YWwgPSAwOworICAgICAgICBtX3dhdGNo ZG9nVGltZXIuc3RvcCgpOworICAgICAgICBMT0coTWVkaWEsICJXZWJNZWRpYVNlc3Npb25NYW5h Z2VyOjpjb25maWd1cmVXYXRjaGRvZ1RpbWVyIC0gdGltZXIgc3RvcHBlZCIpOworICAgIH0gZWxz ZSB7CisgICAgICAgIGRvdWJsZSBpbnRlcnZhbCA9IGRpZFBsYXlUb0VuZCA/IHdhdGNoZG9nVGlt ZXJJbnRlcnZhbEFmdGVyUGxheWluZ1RvRW5kIDogd2F0Y2hkb2dUaW1lckludGVydmFsQWZ0ZXJQ YXVzaW5nOworICAgICAgICBpZiAoaW50ZXJ2YWwgIT0gbV9jdXJyZW50V2F0Y2hkb2dJbnRlcnZh bCB8fCAhbV93YXRjaGRvZ1RpbWVyLmlzQWN0aXZlKCkpIHsKKyAgICAgICAgICAgIG1fd2F0Y2hk b2dUaW1lci5zdGFydE9uZVNob3QoaW50ZXJ2YWwpOworICAgICAgICAgICAgTE9HKE1lZGlhLCAi V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6Y29uZmlndXJlV2F0Y2hkb2dUaW1lciAtIHRpbWVyIHNj aGVkdWxlZCBmb3IgJS4wZiIsIGludGVydmFsKTsKKyAgICAgICAgfQorICAgICAgICBtX2N1cnJl bnRXYXRjaGRvZ0ludGVydmFsID0gaW50ZXJ2YWw7CisgICAgfQorfQorCit2b2lkIFdlYk1lZGlh U2Vzc2lvbk1hbmFnZXI6OndhdGNoZG9nVGltZXJGaXJlZCgpCit7CisgICAgTE9HKE1lZGlhLCAi V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6d2F0Y2hkb2dUaW1lckZpcmVkIik7CisgICAgaWYgKCFt X3BsYXliYWNrVGFyZ2V0KQorICAgICAgICByZXR1cm47CisKKyAgICB0YXJnZXRQaWNrZXIoKS5z dG9wTW9uaXRvcmluZ1BsYXliYWNrVGFyZ2V0cygpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCiAKICNlbmRpZiAvLyBFTkFCTEUoV0lSRUxFU1NfUExBWUJBQ0tfVEFSR0VUKSAmJiAhUExB VEZPUk0oSU9TKQpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vV2Vi TWVkaWFTZXNzaW9uTWFuYWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzZXNzaW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXIuaAkocmV2aXNpb24gMTg2Mjg4 KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9u TWFuYWdlci5oCSh3b3JraW5nIGNvcHkpCkBAIC02NywyMyArNjcsMzAgQEAgcHJpdmF0ZToKICAg ICB2b2lkIGNvbmZpZ3VyZVBsYXliYWNrVGFyZ2V0Q2xpZW50cygpOwogICAgIHZvaWQgY29uZmln dXJlTmV3Q2xpZW50cygpOwogICAgIHZvaWQgY29uZmlndXJlUGxheWJhY2tUYXJnZXRNb25pdG9y aW5nKCk7CisgICAgdm9pZCBjb25maWd1cmVXYXRjaGRvZ1RpbWVyKCk7CiAKICAgICBlbnVtIENv bmZpZ3VyYXRpb25UYXNrRmxhZ3MgewogICAgICAgICBOb1Rhc2sgPSAwLAogICAgICAgICBJbml0 aWFsQ29uZmlndXJhdGlvblRhc2sgPSAxIDw8IDAsCiAgICAgICAgIFRhcmdldENsaWVudHNDb25m aWd1cmF0aW9uVGFzayA9IDEgPDwgMSwKICAgICAgICAgVGFyZ2V0TW9uaXRvcmluZ0NvbmZpZ3Vy YXRpb25UYXNrID0gMSA8PCAyLAorICAgICAgICBXYXRjaGRvZ1RpbWVyQ29uZmlndXJhdGlvblRh c2sgPSAxIDw8IDMsCiAgICAgfTsKICAgICB0eXBlZGVmIHVuc2lnbmVkIENvbmZpZ3VyYXRpb25U YXNrczsKICAgICBTdHJpbmcgdG9TdHJpbmcoQ29uZmlndXJhdGlvblRhc2tzKTsKIAogICAgIHZv aWQgc2NoZWR1bGVEZWxheWVkVGFzayhDb25maWd1cmF0aW9uVGFza3MpOwogICAgIHZvaWQgdGFz a1RpbWVyRmlyZWQoKTsKKworICAgIHZvaWQgd2F0Y2hkb2dUaW1lckZpcmVkKCk7CisKICAgICBS dW5Mb29wOjpUaW1lcjxXZWJNZWRpYVNlc3Npb25NYW5hZ2VyPiBtX3Rhc2tUaW1lcjsKKyAgICBS dW5Mb29wOjpUaW1lcjxXZWJNZWRpYVNlc3Npb25NYW5hZ2VyPiBtX3dhdGNoZG9nVGltZXI7CiAK ICAgICBWZWN0b3I8c3RkOjp1bmlxdWVfcHRyPENsaWVudFN0YXRlPj4gbV9jbGllbnRTdGF0ZTsK ICAgICBSZWZQdHI8TWVkaWFQbGF5YmFja1RhcmdldD4gbV9wbGF5YmFja1RhcmdldDsKICAgICBD b25maWd1cmF0aW9uVGFza3MgbV90YXNrRmxhZ3MgeyBOb1Rhc2sgfTsKKyAgICBkb3VibGUgbV9j dXJyZW50V2F0Y2hkb2dJbnRlcnZhbCB7IDAgfTsKICAgICBib29sIG1fZXh0ZXJuYWxPdXRwdXRE ZXZpY2VBdmFpbGFibGUgeyBmYWxzZSB9OwogfTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MTWVkaWFFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZpc2lvbiAxODYyODgpCisrKyBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MzcyLDYgKzYz NzIsOSBAQCBNZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlRmxhZ3MgSFRNTE1lZGlhCiAgICAgYm9v bCByZXF1aXJlVXNlckdlc3R1cmUgPSBtX21lZGlhU2Vzc2lvbi0+aGFzQmVoYXZpb3JSZXN0cmlj dGlvbihNZWRpYUVsZW1lbnRTZXNzaW9uOjpSZXF1aXJlVXNlckdlc3R1cmVUb0F1dG9wbGF5VG9F eHRlcm5hbERldmljZSk7CiAgICAgaWYgKGhhc0FjdGl2ZVZpZGVvICYmICghcmVxdWlyZVVzZXJH ZXN0dXJlIHx8IChoYXNBdWRpbyAmJiAhbV9pbml0aWFsbHlNdXRlZCAmJiAhbG9vcCgpKSkgJiYg IW1fZmFpbGVkVG9QbGF5VG9XaXJlbGVzc1RhcmdldCkKICAgICAgICAgc3RhdGUgfD0gRXh0ZXJu YWxEZXZpY2VBdXRvUGxheUNhbmRpZGF0ZTsKKworICAgIGlmIChoYXNBY3RpdmVWaWRlbyAmJiBl bmRlZFBsYXliYWNrKCkpCisgICAgICAgIHN0YXRlIHw9IERpZFBsYXlUb0VuZDsKICNlbmRpZgog CiAgICAgaWYgKCFpc1BsYXlpbmcoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvTWVkaWFQ cm9kdWNlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvTWVkaWFQcm9kdWNl ci5oCShyZXZpc2lvbiAxODYyODgpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL01lZGlhUHJvZHVj ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzcsNiArMzcsNyBAQCBwdWJsaWM6CiAgICAgICAgIElz UGxheWluZ1RvRXh0ZXJuYWxEZXZpY2UgPSAxIDw8IDIsCiAgICAgICAgIFJlcXVpcmVzUGxheWJh Y2tUYXJnZXRNb25pdG9yaW5nID0gMSA8PCAzLAogICAgICAgICBFeHRlcm5hbERldmljZUF1dG9Q bGF5Q2FuZGlkYXRlID0gMSA8PCA0LAorICAgICAgICBEaWRQbGF5VG9FbmQgPSAxIDw8IDUsCiAg ICAgfTsKICAgICB0eXBlZGVmIHVuc2lnbmVkIE1lZGlhU3RhdGVGbGFnczsKIApJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 YmFja1RhcmdldFBpY2tlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXliYWNrVGFyZ2V0UGlja2Vy TWFjLm1tCShyZXZpc2lvbiAxODYyODgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTWFjLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC04MywzNCArODMsMzEgQEAgTWVkaWFQbGF5YmFja1RhcmdldFBpY2tl ck1hYzo6TWVkaWFQbGF5YgogCiBNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTWFjOjp+TWVkaWFQ bGF5YmFja1RhcmdldFBpY2tlck1hYygpCiB7CisgICAgbV9jbGllbnQgPSBudWxscHRyOwogICAg IG1fcGVuZGluZ0FjdGlvblRpbWVyLnN0b3AoKTsKICAgICBbbV9vdXRwdXREZXZpY2VNZW51Q29u dHJvbGxlckRlbGVnYXRlIGNsZWFyQ2FsbGJhY2tdOwogCi0gICAgaWYgKG1fb3V0cHV0RGV2aWNl TWVudUNvbnRyb2xsZXIpIHsKLSAgICAgICAgW21fb3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXIg cmVtb3ZlT2JzZXJ2ZXI6bV9vdXRwdXREZXZpY2VNZW51Q29udHJvbGxlckRlbGVnYXRlLmdldCgp IGZvcktleVBhdGg6ZXh0ZXJuYWxPdXRwdXREZXZpY2VBdmFpbGFibGVLZXlOYW1lXTsKLSAgICAg ICAgW21fb3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXIgcmVtb3ZlT2JzZXJ2ZXI6bV9vdXRwdXRE ZXZpY2VNZW51Q29udHJvbGxlckRlbGVnYXRlLmdldCgpIGZvcktleVBhdGg6ZXh0ZXJuYWxPdXRw dXREZXZpY2VQaWNrZWRLZXlOYW1lXTsKLSAgICAgICAgbV9vdXRwdXREZXZpY2VNZW51Q29udHJv bGxlciA9IG51bGxwdHI7Ci0gICAgfQorICAgIHN0b3BNb25pdG9yaW5nUGxheWJhY2tUYXJnZXRz KCk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYzo6cGVuZGluZ0FjdGlv blRpbWVyRmlyZWQoKQogewogICAgIExPRyhNZWRpYSwgIk1lZGlhUGxheWJhY2tUYXJnZXRQaWNr ZXJNYWM6OnBlbmRpbmdBY3Rpb25UaW1lckZpcmVkIC0gZmxhZ3MgPSAweCV4IiwgbV9wZW5kaW5n QWN0aW9uRmxhZ3MpOwogCi0gICAgaWYgKCFtX291dHB1dERldmljZU1lbnVDb250cm9sbGVyIHx8 ICFtX2NsaWVudCkKKyAgICBpZiAoIW1fY2xpZW50KQogICAgICAgICByZXR1cm47CiAKICAgICBQ ZW5kaW5nQWN0aW9uRmxhZ3MgcGVuZGluZ0FjdGlvbnMgPSBtX3BlbmRpbmdBY3Rpb25GbGFnczsK ICAgICBtX3BlbmRpbmdBY3Rpb25GbGFncyA9IDA7CiAKKyAgICBpZiAocGVuZGluZ0FjdGlvbnMg JiBDdXJyZW50RGV2aWNlRGlkQ2hhbmdlKSB7CisgICAgICAgIEFWT3V0cHV0Q29udGV4dCogY29u dGV4dCA9IG1fb3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXIgPyBbbV9vdXRwdXREZXZpY2VNZW51 Q29udHJvbGxlci5nZXQoKSBvdXRwdXRDb250ZXh0XSA6IG51bGxwdHI7CisgICAgICAgIG1fY2xp ZW50LT5zZXRQbGF5YmFja1RhcmdldChXZWJDb3JlOjpNZWRpYVBsYXliYWNrVGFyZ2V0TWFjOjpj cmVhdGUoY29udGV4dCkpOworICAgIH0KKwogICAgIGlmIChwZW5kaW5nQWN0aW9ucyAmIE91dHB1 dERldmljZUF2YWlsYWJpbGl0eUNoYW5nZWQpCiAgICAgICAgIG1fY2xpZW50LT5leHRlcm5hbE91 dHB1dERldmljZUF2YWlsYWJsZURpZENoYW5nZShkZXZpY2VQaWNrZXIoKS5leHRlcm5hbE91dHB1 dERldmljZUF2YWlsYWJsZSk7CiAKLSAgICBpZiAocGVuZGluZ0FjdGlvbnMgJiBDdXJyZW50RGV2 aWNlRGlkQ2hhbmdlKSB7Ci0gICAgICAgIEFWT3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXJUeXBl KiBkZXZpY2VQaWNrZXIgPSB0aGlzLT5kZXZpY2VQaWNrZXIoKTsKLSAgICAgICAgaWYgKGRldmlj ZVBpY2tlcikKLSAgICAgICAgICAgIG1fY2xpZW50LT5zZXRQbGF5YmFja1RhcmdldChXZWJDb3Jl OjpNZWRpYVBsYXliYWNrVGFyZ2V0TWFjOjpjcmVhdGUoW2RldmljZVBpY2tlciBvdXRwdXRDb250 ZXh0XSkpOwotICAgIH0KIH0KIAogdm9pZCBNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTWFjOjph dmFpbGFibGVEZXZpY2VzRGlkQ2hhbmdlKCkKQEAgLTEyOSw2ICsxMjYsOCBAQCBBVk91dHB1dERl dmljZU1lbnVDb250cm9sbGVyVHlwZSAqTWVkaWFQCiAgICAgICAgIHJldHVybiBudWxscHRyOwog CiAgICAgaWYgKCFtX291dHB1dERldmljZU1lbnVDb250cm9sbGVyKSB7CisgICAgICAgIExPRyhN ZWRpYSwgIk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6OmRldmljZVBpY2tlciAtIGFsbG9j YXRpbmcgcGlja2VyIik7CisKICAgICAgICAgUmV0YWluUHRyPEFWT3V0cHV0Q29udGV4dFR5cGU+ IGNvbnRleHQgPSBhZG9wdE5TKFtbZ2V0QVZPdXRwdXRDb250ZXh0Q2xhc3MoKSBhbGxvY10gaW5p dF0pOwogICAgICAgICBtX291dHB1dERldmljZU1lbnVDb250cm9sbGVyID0gYWRvcHROUyhbW2dl dEFWT3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXJDbGFzcygpIGFsbG9jXSBpbml0V2l0aE91dHB1 dENvbnRleHQ6Y29udGV4dC5nZXQoKV0pOwogCkBAIC0xOTAsNyArMTg5LDEyIEBAIHZvaWQgTWVk aWFQbGF5YmFja1RhcmdldFBpY2tlck1hYzo6c3RvcE0KIHsKICAgICBMT0coTWVkaWEsICJNZWRp YVBsYXliYWNrVGFyZ2V0UGlja2VyTWFjOjpzdG9wTW9uaXRvcmluZ1BsYXliYWNrVGFyZ2V0cyIp OwogCi0gICAgLy8gRklYTUU6IHVwZGF0ZSBvbmNlIHJkYXI6Ly8yMTA2MjUzNiBoYXMgYmVlbiBm aXhlZC4KKyAgICBpZiAobV9vdXRwdXREZXZpY2VNZW51Q29udHJvbGxlcikgeworICAgICAgICBb bV9vdXRwdXREZXZpY2VNZW51Q29udHJvbGxlciByZW1vdmVPYnNlcnZlcjptX291dHB1dERldmlj ZU1lbnVDb250cm9sbGVyRGVsZWdhdGUuZ2V0KCkgZm9yS2V5UGF0aDpleHRlcm5hbE91dHB1dERl dmljZUF2YWlsYWJsZUtleU5hbWVdOworICAgICAgICBbbV9vdXRwdXREZXZpY2VNZW51Q29udHJv bGxlciByZW1vdmVPYnNlcnZlcjptX291dHB1dERldmljZU1lbnVDb250cm9sbGVyRGVsZWdhdGUu Z2V0KCkgZm9yS2V5UGF0aDpleHRlcm5hbE91dHB1dERldmljZVBpY2tlZEtleU5hbWVdOworICAg ICAgICBtX291dHB1dERldmljZU1lbnVDb250cm9sbGVyID0gbnVsbHB0cjsKKyAgICB9CisgICAg Y3VycmVudERldmljZURpZENoYW5nZSgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 256220 2015-07-06 10:55:19 -0700 2015-07-06 10:59:32 -0700 Updated patch. watchdog_timer_patch_3.txt text/plain 12935 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NjM1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDE1LTA3LTA2ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIEluYWN0aXZl IEFpclBsYXkgcm91dGUgc2hvdWxkIGF1dG9tYXRpY2FsbHkgdGltZW91dAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2NjQyCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8yMTYwMjk1NT4KKworICAgICAgICBBdXRvbWF0aWNhbGx5IGNsZWFyIGEgbWVk aWEgZWxlbWVudCdzIEFpclBsYXkgY29ubmVjdGlvbiBhZnRlciBpdCBoYXMgYmVlbiBwYXVzZWQK KyAgICAgICAgZm9yIDYwIG1pbnV0ZXMsIG9yIGFmdGVyIDggbWludXRlcyBpZiBpdCBwbGF5ZWQg dG8gdGhlIGVuZCBiZWZvcmUgcGF1c2luZy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzZXNzaW9uL1dlYk1lZGlhU2Vzc2lv bk1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6 V2ViTWVkaWFTZXNzaW9uTWFuYWdlcik6IEluaXRpYWxpemUgbV93YXRjaGRvZ1RpbWVyLgorICAg ICAgICAoV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6Y2xpZW50U3RhdGVEaWRDaGFu Z2UpOiBTY2hlZHVsZSB3YXRjaGRvZyB0aW1lciBjb25maWd1cmF0aW9uCisgICAgICAgICAgaWYg dGhlIGNsaWVudCBzdGFydGVkIHBsYXlpbmcgb3IgcGF1c2VkLgorICAgICAgICAoV2ViQ29yZTo6 V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6Y29uZmlndXJlUGxheWJhY2tUYXJnZXRDbGllbnRzKTog U2NoZWR1bGUgd2F0Y2hkb2cgdGltZXIgY29uZmlndXJhdGlvbi4KKyAgICAgICAgKFdlYkNvcmU6 OldlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnRvU3RyaW5nKTogUHJpbnQgd2F0Y2hkb2cgY29uZmln dXJhdGlvbiBmbGFnLgorICAgICAgICAoV2ViQ29yZTo6V2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6 dGFza1RpbWVyRmlyZWQpOiBDYWxsIGNvbmZpZ3VyZVdhdGNoZG9nVGltZXIuCisgICAgICAgIChX ZWJDb3JlOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyOjpjb25maWd1cmVXYXRjaGRvZ1RpbWVyKTog TmV3LCBzdGFydCBvciBzdG9wIHdhdGNoZG9nIHRpbWVyLgorICAgICAgICAoV2ViQ29yZTo6V2Vi TWVkaWFTZXNzaW9uTWFuYWdlcjo6d2F0Y2hkb2dUaW1lckZpcmVkKTogU3RvcCBtb25pdG9yaW5n IGZvciB0YXJnZXRzLCB3aGljaCAKKyAgICAgICAgICBjbGVhcnMgdGhlIHJvdXRlLgorICAgICAg ICAqIE1vZHVsZXMvbWVkaWFzZXNzaW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXIuaDoKKworICAg ICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50OjptZWRpYVN0YXRlKTogU2V0IERpZFBsYXlUb0VuZCB3aGVuIGFwcHJvcHJp YXRlLgorCisgICAgICAgICogcGFnZS9NZWRpYVByb2R1Y2VyLmg6IEFkZCBEaWRQbGF5VG9FbmQu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBs YXliYWNrVGFyZ2V0UGlja2VyTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5YmFj a1RhcmdldFBpY2tlck1hYzo6fk1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWMpOiBDbGVhciBt X2NsaWVudCwgY2FsbAorICAgICAgICAgIHN0b3BNb25pdG9yaW5nUGxheWJhY2tUYXJnZXRzLgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYzo6cGVuZGluZ0Fj dGlvblRpbWVyRmlyZWQpOiBTZW5kIGEgbmV1dGVyZWQgCisgICAgICAgICAgTWVkaWFQbGF5YmFj a1RhcmdldCB3aGVuIG1fb3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXIgaXMgTlVMTC4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6OmRldmljZVBpY2tlcik6 IEFkZCBsb2dnaW5nLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5YmFja1RhcmdldFBpY2tl ck1hYzo6c3RvcE1vbml0b3JpbmdQbGF5YmFja1RhcmdldHMpOiBDbGVhciB0aGUgbWVudQorICAg ICAgICAgIGNvbnRyb2xsZXIgdG8gY2FuY2VsIHRoZSByb3V0ZS4KKwogMjAxNS0wNy0wNiAgWmFu IERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRml4IGJ1 aWxkIGVycm9ycyB3aXRoIE9wZW5HTCBFUwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNlc3Npb24vV2ViTWVkaWFTZXNzaW9uTWFuYWdlci5j cHAJKHJldmlzaW9uIDE4NjI4OCkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNz aW9uL1dlYk1lZGlhU2Vzc2lvbk1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NSw2ICs1 NSw3IEBAIHN0cnVjdCBDbGllbnRTdGF0ZSB7CiAgICAgV2ViQ29yZTo6TWVkaWFQcm9kdWNlcjo6 TWVkaWFTdGF0ZUZsYWdzIGZsYWdzIHsgV2ViQ29yZTo6TWVkaWFQcm9kdWNlcjo6SXNOb3RQbGF5 aW5nIH07CiAgICAgYm9vbCByZXF1ZXN0ZWRQaWNrZXIgeyBmYWxzZSB9OwogICAgIGJvb2wgY29u ZmlndXJhdGlvblJlcXVpcmVkIHsgdHJ1ZSB9OworICAgIGJvb2wgcGxheWVkVG9FbmQgeyBmYWxz ZSB9OwogfTsKIAogc3RhdGljIGJvb2wgZmxhZ3NBcmVTZXQoTWVkaWFQcm9kdWNlcjo6TWVkaWFT dGF0ZUZsYWdzIHZhbHVlLCB1bnNpZ25lZCBmbGFncykKQEAgLTg3LDYgKzg4LDcgQEAgc3RhdGlj IFN0cmluZyBtZWRpYVByb2R1Y2VyU3RhdGVTdHJpbmcoTQogCiBXZWJNZWRpYVNlc3Npb25NYW5h Z2VyOjpXZWJNZWRpYVNlc3Npb25NYW5hZ2VyKCkKICAgICA6IG1fdGFza1RpbWVyKFJ1bkxvb3A6 OmN1cnJlbnQoKSwgdGhpcywgJldlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OnRhc2tUaW1lckZpcmVk KQorICAgICwgbV93YXRjaGRvZ1RpbWVyKFJ1bkxvb3A6OmN1cnJlbnQoKSwgdGhpcywgJldlYk1l ZGlhU2Vzc2lvbk1hbmFnZXI6OndhdGNoZG9nVGltZXJGaXJlZCkKIHsKIH0KIApAQCAtMTcxLDYg KzE3MywxMyBAQCB2b2lkIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OmNsaWVudFN0YXRlCiAgICAg aWYgKCFmbGFnc0FyZVNldChvbGRGbGFncywgTWVkaWFQcm9kdWNlcjo6UmVxdWlyZXNQbGF5YmFj a1RhcmdldE1vbml0b3JpbmcpICYmIGZsYWdzQXJlU2V0KG5ld0ZsYWdzLCBNZWRpYVByb2R1Y2Vy OjpSZXF1aXJlc1BsYXliYWNrVGFyZ2V0TW9uaXRvcmluZykpCiAgICAgICAgIHNjaGVkdWxlRGVs YXllZFRhc2soVGFyZ2V0TW9uaXRvcmluZ0NvbmZpZ3VyYXRpb25UYXNrKTsKIAorICAgIE1lZGlh UHJvZHVjZXI6Ok1lZGlhU3RhdGVGbGFncyBwbGF5aW5nVG9UYXJnZXRGbGFncyA9IE1lZGlhUHJv ZHVjZXI6OklzUGxheWluZ1RvRXh0ZXJuYWxEZXZpY2UgfCBNZWRpYVByb2R1Y2VyOjpJc1BsYXlp bmdWaWRlbzsKKyAgICBpZiAoKG9sZEZsYWdzICYgcGxheWluZ1RvVGFyZ2V0RmxhZ3MpICE9IChu ZXdGbGFncyAmIHBsYXlpbmdUb1RhcmdldEZsYWdzKSkgeworICAgICAgICBpZiAoZmxhZ3NBcmVT ZXQob2xkRmxhZ3MsIE1lZGlhUHJvZHVjZXI6OklzUGxheWluZ1ZpZGVvKSAmJiAhZmxhZ3NBcmVT ZXQobmV3RmxhZ3MsIE1lZGlhUHJvZHVjZXI6OklzUGxheWluZ1ZpZGVvKSAmJiBmbGFnc0FyZVNl dChuZXdGbGFncywgTWVkaWFQcm9kdWNlcjo6RGlkUGxheVRvRW5kKSkKKyAgICAgICAgICAgIGNo YW5nZWRDbGllbnRTdGF0ZS0+cGxheWVkVG9FbmQgPSB0cnVlOworICAgICAgICBzY2hlZHVsZURl bGF5ZWRUYXNrKFdhdGNoZG9nVGltZXJDb25maWd1cmF0aW9uVGFzayk7Cit9CisKICAgICBpZiAo IW1fcGxheWJhY2tUYXJnZXQgfHwgIW1fcGxheWJhY2tUYXJnZXQtPmhhc0FjdGl2ZVJvdXRlKCkp CiAgICAgICAgIHJldHVybjsKIApAQCAtMjc2LDYgKzI4NSw4IEBAIHZvaWQgV2ViTWVkaWFTZXNz aW9uTWFuYWdlcjo6Y29uZmlndXJlUGwKICAgICAgICAgaWYgKCFmbGFnc0FyZVNldChzdGF0ZS0+ ZmxhZ3MsIE1lZGlhUHJvZHVjZXI6OklzUGxheWluZ1RvRXh0ZXJuYWxEZXZpY2UpKQogICAgICAg ICAgICAgc3RhdGUtPmNsaWVudC5zZXRTaG91bGRQbGF5VG9QbGF5YmFja1RhcmdldChzdGF0ZS0+ Y29udGV4dElkLCB0cnVlKTsKICAgICB9CisKKyAgICBjb25maWd1cmVXYXRjaGRvZ1RpbWVyKCk7 CiB9CiAKIHZvaWQgV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6Y29uZmlndXJlUGxheWJhY2tUYXJn ZXRNb25pdG9yaW5nKCkKQEAgLTMwNiw2ICszMTcsOCBAQCBTdHJpbmcgV2ViTWVkaWFTZXNzaW9u TWFuYWdlcjo6dG9TdHJpbmcoCiAgICAgICAgIHN0cmluZy5hcHBlbmQoIlRhcmdldENsaWVudHND b25maWd1cmF0aW9uVGFzayArICIpOwogICAgIGlmICh0YXNrcyAmIFRhcmdldE1vbml0b3JpbmdD b25maWd1cmF0aW9uVGFzaykKICAgICAgICAgc3RyaW5nLmFwcGVuZCgiVGFyZ2V0TW9uaXRvcmlu Z0NvbmZpZ3VyYXRpb25UYXNrICsgIik7CisgICAgaWYgKHRhc2tzICYgV2F0Y2hkb2dUaW1lckNv bmZpZ3VyYXRpb25UYXNrKQorICAgICAgICBzdHJpbmcuYXBwZW5kKCJXYXRjaGRvZ1RpbWVyQ29u ZmlndXJhdGlvblRhc2sgKyAiKTsKICAgICBpZiAoc3RyaW5nLmlzRW1wdHkoKSkKICAgICAgICAg c3RyaW5nLmFwcGVuZCgiTm9UYXNrIik7CiAgICAgZWxzZQpAQCAtMzMzLDYgKzM0Niw4IEBAIHZv aWQgV2ViTWVkaWFTZXNzaW9uTWFuYWdlcjo6dGFza1RpbWVyRmkKICAgICAgICAgY29uZmlndXJl UGxheWJhY2tUYXJnZXRDbGllbnRzKCk7CiAgICAgaWYgKG1fdGFza0ZsYWdzICYgVGFyZ2V0TW9u aXRvcmluZ0NvbmZpZ3VyYXRpb25UYXNrKQogICAgICAgICBjb25maWd1cmVQbGF5YmFja1Rhcmdl dE1vbml0b3JpbmcoKTsKKyAgICBpZiAobV90YXNrRmxhZ3MgJiBXYXRjaGRvZ1RpbWVyQ29uZmln dXJhdGlvblRhc2spCisgICAgICAgIGNvbmZpZ3VyZVdhdGNoZG9nVGltZXIoKTsKIAogICAgIG1f dGFza0ZsYWdzID0gTm9UYXNrOwogfQpAQCAtMzQ3LDYgKzM2Miw0OSBAQCBzaXplX3QgV2ViTWVk aWFTZXNzaW9uTWFuYWdlcjo6ZmluZChXZWJNCiAgICAgcmV0dXJuIG5vdEZvdW5kOwogfQogCit2 b2lkIFdlYk1lZGlhU2Vzc2lvbk1hbmFnZXI6OmNvbmZpZ3VyZVdhdGNoZG9nVGltZXIoKQorewor ICAgIHN0YXRpYyBjb25zdCBkb3VibGUgd2F0Y2hkb2dUaW1lckludGVydmFsQWZ0ZXJQYXVzaW5n ID0gNjAgKiA2MDsKKyAgICBzdGF0aWMgY29uc3QgZG91YmxlIHdhdGNoZG9nVGltZXJJbnRlcnZh bEFmdGVyUGxheWluZ1RvRW5kID0gOCAqIDYwOworCisgICAgaWYgKCFtX3BsYXliYWNrVGFyZ2V0 IHx8ICFtX3BsYXliYWNrVGFyZ2V0LT5oYXNBY3RpdmVSb3V0ZSgpKSB7CisgICAgICAgIG1fd2F0 Y2hkb2dUaW1lci5zdG9wKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBib29sIHN0 b3BUaW1lciA9IGZhbHNlOworICAgIGJvb2wgZGlkUGxheVRvRW5kID0gZmFsc2U7CisgICAgZm9y IChhdXRvJiBzdGF0ZSA6IG1fY2xpZW50U3RhdGUpIHsKKyAgICAgICAgaWYgKGZsYWdzQXJlU2V0 KHN0YXRlLT5mbGFncywgTWVkaWFQcm9kdWNlcjo6SXNQbGF5aW5nVG9FeHRlcm5hbERldmljZSkg JiYgZmxhZ3NBcmVTZXQoc3RhdGUtPmZsYWdzLCBNZWRpYVByb2R1Y2VyOjpJc1BsYXlpbmdWaWRl bykpCisgICAgICAgICAgICBzdG9wVGltZXIgPSB0cnVlOworICAgICAgICBpZiAoc3RhdGUtPnBs YXllZFRvRW5kKQorICAgICAgICAgICAgZGlkUGxheVRvRW5kID0gdHJ1ZTsKKyAgICAgICAgc3Rh dGUtPnBsYXllZFRvRW5kID0gZmFsc2U7CisgICAgfQorCisgICAgaWYgKHN0b3BUaW1lcikgewor ICAgICAgICBtX2N1cnJlbnRXYXRjaGRvZ0ludGVydmFsID0gMDsKKyAgICAgICAgbV93YXRjaGRv Z1RpbWVyLnN0b3AoKTsKKyAgICAgICAgTE9HKE1lZGlhLCAiV2ViTWVkaWFTZXNzaW9uTWFuYWdl cjo6Y29uZmlndXJlV2F0Y2hkb2dUaW1lciAtIHRpbWVyIHN0b3BwZWQiKTsKKyAgICB9IGVsc2Ug eworICAgICAgICBkb3VibGUgaW50ZXJ2YWwgPSBkaWRQbGF5VG9FbmQgPyB3YXRjaGRvZ1RpbWVy SW50ZXJ2YWxBZnRlclBsYXlpbmdUb0VuZCA6IHdhdGNoZG9nVGltZXJJbnRlcnZhbEFmdGVyUGF1 c2luZzsKKyAgICAgICAgaWYgKGludGVydmFsICE9IG1fY3VycmVudFdhdGNoZG9nSW50ZXJ2YWwg fHwgIW1fd2F0Y2hkb2dUaW1lci5pc0FjdGl2ZSgpKSB7CisgICAgICAgICAgICBtX3dhdGNoZG9n VGltZXIuc3RhcnRPbmVTaG90KGludGVydmFsKTsKKyAgICAgICAgICAgIExPRyhNZWRpYSwgIldl Yk1lZGlhU2Vzc2lvbk1hbmFnZXI6OmNvbmZpZ3VyZVdhdGNoZG9nVGltZXIgLSB0aW1lciBzY2hl ZHVsZWQgZm9yICUuMGYiLCBpbnRlcnZhbCk7CisgICAgICAgIH0KKyAgICAgICAgbV9jdXJyZW50 V2F0Y2hkb2dJbnRlcnZhbCA9IGludGVydmFsOworICAgIH0KK30KKwordm9pZCBXZWJNZWRpYVNl c3Npb25NYW5hZ2VyOjp3YXRjaGRvZ1RpbWVyRmlyZWQoKQoreworICAgIExPRyhNZWRpYSwgIldl Yk1lZGlhU2Vzc2lvbk1hbmFnZXI6OndhdGNoZG9nVGltZXJGaXJlZCIpOworICAgIGlmICghbV9w bGF5YmFja1RhcmdldCkKKyAgICAgICAgcmV0dXJuOworCisgICAgdGFyZ2V0UGlja2VyKCkuc3Rv cE1vbml0b3JpbmdQbGF5YmFja1RhcmdldHMoKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQogCiAjZW5kaWYgLy8gRU5BQkxFKFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkgJiYgIVBMQVRG T1JNKElPUykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNzaW9uL1dlYk1l ZGlhU2Vzc2lvbk1hbmFnZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc2Vzc2lvbi9XZWJNZWRpYVNlc3Npb25NYW5hZ2VyLmgJKHJldmlzaW9uIDE4NjI4OCkK KysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzZXNzaW9uL1dlYk1lZGlhU2Vzc2lvbk1h bmFnZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNjcsMjMgKzY3LDMwIEBAIHByaXZhdGU6CiAgICAg dm9pZCBjb25maWd1cmVQbGF5YmFja1RhcmdldENsaWVudHMoKTsKICAgICB2b2lkIGNvbmZpZ3Vy ZU5ld0NsaWVudHMoKTsKICAgICB2b2lkIGNvbmZpZ3VyZVBsYXliYWNrVGFyZ2V0TW9uaXRvcmlu ZygpOworICAgIHZvaWQgY29uZmlndXJlV2F0Y2hkb2dUaW1lcigpOwogCiAgICAgZW51bSBDb25m aWd1cmF0aW9uVGFza0ZsYWdzIHsKICAgICAgICAgTm9UYXNrID0gMCwKICAgICAgICAgSW5pdGlh bENvbmZpZ3VyYXRpb25UYXNrID0gMSA8PCAwLAogICAgICAgICBUYXJnZXRDbGllbnRzQ29uZmln dXJhdGlvblRhc2sgPSAxIDw8IDEsCiAgICAgICAgIFRhcmdldE1vbml0b3JpbmdDb25maWd1cmF0 aW9uVGFzayA9IDEgPDwgMiwKKyAgICAgICAgV2F0Y2hkb2dUaW1lckNvbmZpZ3VyYXRpb25UYXNr ID0gMSA8PCAzLAogICAgIH07CiAgICAgdHlwZWRlZiB1bnNpZ25lZCBDb25maWd1cmF0aW9uVGFz a3M7CiAgICAgU3RyaW5nIHRvU3RyaW5nKENvbmZpZ3VyYXRpb25UYXNrcyk7CiAKICAgICB2b2lk IHNjaGVkdWxlRGVsYXllZFRhc2soQ29uZmlndXJhdGlvblRhc2tzKTsKICAgICB2b2lkIHRhc2tU aW1lckZpcmVkKCk7CisKKyAgICB2b2lkIHdhdGNoZG9nVGltZXJGaXJlZCgpOworCiAgICAgUnVu TG9vcDo6VGltZXI8V2ViTWVkaWFTZXNzaW9uTWFuYWdlcj4gbV90YXNrVGltZXI7CisgICAgUnVu TG9vcDo6VGltZXI8V2ViTWVkaWFTZXNzaW9uTWFuYWdlcj4gbV93YXRjaGRvZ1RpbWVyOwogCiAg ICAgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxDbGllbnRTdGF0ZT4+IG1fY2xpZW50U3RhdGU7CiAg ICAgUmVmUHRyPE1lZGlhUGxheWJhY2tUYXJnZXQ+IG1fcGxheWJhY2tUYXJnZXQ7CiAgICAgQ29u ZmlndXJhdGlvblRhc2tzIG1fdGFza0ZsYWdzIHsgTm9UYXNrIH07CisgICAgZG91YmxlIG1fY3Vy cmVudFdhdGNoZG9nSW50ZXJ2YWwgeyAwIH07CiAgICAgYm9vbCBtX2V4dGVybmFsT3V0cHV0RGV2 aWNlQXZhaWxhYmxlIHsgZmFsc2UgfTsKIH07CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gMTg2Mjg4KQorKysgU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjM3Miw2ICs2Mzcy LDkgQEAgTWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZUZsYWdzIEhUTUxNZWRpYQogICAgIGJvb2wg cmVxdWlyZVVzZXJHZXN0dXJlID0gbV9tZWRpYVNlc3Npb24tPmhhc0JlaGF2aW9yUmVzdHJpY3Rp b24oTWVkaWFFbGVtZW50U2Vzc2lvbjo6UmVxdWlyZVVzZXJHZXN0dXJlVG9BdXRvcGxheVRvRXh0 ZXJuYWxEZXZpY2UpOwogICAgIGlmIChoYXNBY3RpdmVWaWRlbyAmJiAoIXJlcXVpcmVVc2VyR2Vz dHVyZSB8fCAoaGFzQXVkaW8gJiYgIW1faW5pdGlhbGx5TXV0ZWQgJiYgIWxvb3AoKSkpICYmICFt X2ZhaWxlZFRvUGxheVRvV2lyZWxlc3NUYXJnZXQpCiAgICAgICAgIHN0YXRlIHw9IEV4dGVybmFs RGV2aWNlQXV0b1BsYXlDYW5kaWRhdGU7CisKKyAgICBpZiAoaGFzQWN0aXZlVmlkZW8gJiYgZW5k ZWRQbGF5YmFjaygpKQorICAgICAgICBzdGF0ZSB8PSBEaWRQbGF5VG9FbmQ7CiAjZW5kaWYKIAog ICAgIGlmICghaXNQbGF5aW5nKCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL01lZGlhUHJv ZHVjZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL01lZGlhUHJvZHVjZXIu aAkocmV2aXNpb24gMTg2Mjg4KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9NZWRpYVByb2R1Y2Vy LmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDYgKzM3LDcgQEAgcHVibGljOgogICAgICAgICBJc1Bs YXlpbmdUb0V4dGVybmFsRGV2aWNlID0gMSA8PCAyLAogICAgICAgICBSZXF1aXJlc1BsYXliYWNr VGFyZ2V0TW9uaXRvcmluZyA9IDEgPDwgMywKICAgICAgICAgRXh0ZXJuYWxEZXZpY2VBdXRvUGxh eUNhbmRpZGF0ZSA9IDEgPDwgNCwKKyAgICAgICAgRGlkUGxheVRvRW5kID0gMSA8PCA1LAogICAg IH07CiAgICAgdHlwZWRlZiB1bnNpZ25lZCBNZWRpYVN0YXRlRmxhZ3M7CiAKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWJh Y2tUYXJnZXRQaWNrZXJNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1h Yy5tbQkocmV2aXNpb24gMTg2Mjg4KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYy5tbQkod29y a2luZyBjb3B5KQpAQCAtODMsMzQgKzgzLDMxIEBAIE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJN YWM6Ok1lZGlhUGxheWIKIAogTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYzo6fk1lZGlhUGxh eWJhY2tUYXJnZXRQaWNrZXJNYWMoKQogeworICAgIG1fY2xpZW50ID0gbnVsbHB0cjsKICAgICBt X3BlbmRpbmdBY3Rpb25UaW1lci5zdG9wKCk7CiAgICAgW21fb3V0cHV0RGV2aWNlTWVudUNvbnRy b2xsZXJEZWxlZ2F0ZSBjbGVhckNhbGxiYWNrXTsKIAotICAgIGlmIChtX291dHB1dERldmljZU1l bnVDb250cm9sbGVyKSB7Ci0gICAgICAgIFttX291dHB1dERldmljZU1lbnVDb250cm9sbGVyIHJl bW92ZU9ic2VydmVyOm1fb3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXJEZWxlZ2F0ZS5nZXQoKSBm b3JLZXlQYXRoOmV4dGVybmFsT3V0cHV0RGV2aWNlQXZhaWxhYmxlS2V5TmFtZV07Ci0gICAgICAg IFttX291dHB1dERldmljZU1lbnVDb250cm9sbGVyIHJlbW92ZU9ic2VydmVyOm1fb3V0cHV0RGV2 aWNlTWVudUNvbnRyb2xsZXJEZWxlZ2F0ZS5nZXQoKSBmb3JLZXlQYXRoOmV4dGVybmFsT3V0cHV0 RGV2aWNlUGlja2VkS2V5TmFtZV07Ci0gICAgICAgIG1fb3V0cHV0RGV2aWNlTWVudUNvbnRyb2xs ZXIgPSBudWxscHRyOwotICAgIH0KKyAgICBzdG9wTW9uaXRvcmluZ1BsYXliYWNrVGFyZ2V0cygp OwogfQogCiB2b2lkIE1lZGlhUGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6OnBlbmRpbmdBY3Rpb25U aW1lckZpcmVkKCkKIHsKICAgICBMT0coTWVkaWEsICJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2Vy TWFjOjpwZW5kaW5nQWN0aW9uVGltZXJGaXJlZCAtIGZsYWdzID0gMHgleCIsIG1fcGVuZGluZ0Fj dGlvbkZsYWdzKTsKIAotICAgIGlmICghbV9vdXRwdXREZXZpY2VNZW51Q29udHJvbGxlciB8fCAh bV9jbGllbnQpCisgICAgaWYgKCFtX2NsaWVudCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgUGVu ZGluZ0FjdGlvbkZsYWdzIHBlbmRpbmdBY3Rpb25zID0gbV9wZW5kaW5nQWN0aW9uRmxhZ3M7CiAg ICAgbV9wZW5kaW5nQWN0aW9uRmxhZ3MgPSAwOwogCisgICAgaWYgKHBlbmRpbmdBY3Rpb25zICYg Q3VycmVudERldmljZURpZENoYW5nZSkgeworICAgICAgICBBVk91dHB1dENvbnRleHQqIGNvbnRl eHQgPSBtX291dHB1dERldmljZU1lbnVDb250cm9sbGVyID8gW21fb3V0cHV0RGV2aWNlTWVudUNv bnRyb2xsZXIuZ2V0KCkgb3V0cHV0Q29udGV4dF0gOiBudWxscHRyOworICAgICAgICBtX2NsaWVu dC0+c2V0UGxheWJhY2tUYXJnZXQoV2ViQ29yZTo6TWVkaWFQbGF5YmFja1RhcmdldE1hYzo6Y3Jl YXRlKGNvbnRleHQpKTsKKyAgICB9CisKICAgICBpZiAocGVuZGluZ0FjdGlvbnMgJiBPdXRwdXRE ZXZpY2VBdmFpbGFiaWxpdHlDaGFuZ2VkKQogICAgICAgICBtX2NsaWVudC0+ZXh0ZXJuYWxPdXRw dXREZXZpY2VBdmFpbGFibGVEaWRDaGFuZ2UoZGV2aWNlUGlja2VyKCkuZXh0ZXJuYWxPdXRwdXRE ZXZpY2VBdmFpbGFibGUpOwogCi0gICAgaWYgKHBlbmRpbmdBY3Rpb25zICYgQ3VycmVudERldmlj ZURpZENoYW5nZSkgewotICAgICAgICBBVk91dHB1dERldmljZU1lbnVDb250cm9sbGVyVHlwZSog ZGV2aWNlUGlja2VyID0gdGhpcy0+ZGV2aWNlUGlja2VyKCk7Ci0gICAgICAgIGlmIChkZXZpY2VQ aWNrZXIpCi0gICAgICAgICAgICBtX2NsaWVudC0+c2V0UGxheWJhY2tUYXJnZXQoV2ViQ29yZTo6 TWVkaWFQbGF5YmFja1RhcmdldE1hYzo6Y3JlYXRlKFtkZXZpY2VQaWNrZXIgb3V0cHV0Q29udGV4 dF0pKTsKLSAgICB9CiB9CiAKIHZvaWQgTWVkaWFQbGF5YmFja1RhcmdldFBpY2tlck1hYzo6YXZh aWxhYmxlRGV2aWNlc0RpZENoYW5nZSgpCkBAIC0xMjksNiArMTI2LDggQEAgQVZPdXRwdXREZXZp Y2VNZW51Q29udHJvbGxlclR5cGUgKk1lZGlhUAogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAog ICAgIGlmICghbV9vdXRwdXREZXZpY2VNZW51Q29udHJvbGxlcikgeworICAgICAgICBMT0coTWVk aWEsICJNZWRpYVBsYXliYWNrVGFyZ2V0UGlja2VyTWFjOjpkZXZpY2VQaWNrZXIgLSBhbGxvY2F0 aW5nIHBpY2tlciIpOworCiAgICAgICAgIFJldGFpblB0cjxBVk91dHB1dENvbnRleHRUeXBlPiBj b250ZXh0ID0gYWRvcHROUyhbW2dldEFWT3V0cHV0Q29udGV4dENsYXNzKCkgYWxsb2NdIGluaXRd KTsKICAgICAgICAgbV9vdXRwdXREZXZpY2VNZW51Q29udHJvbGxlciA9IGFkb3B0TlMoW1tnZXRB Vk91dHB1dERldmljZU1lbnVDb250cm9sbGVyQ2xhc3MoKSBhbGxvY10gaW5pdFdpdGhPdXRwdXRD b250ZXh0OmNvbnRleHQuZ2V0KCldKTsKIApAQCAtMTkwLDcgKzE4OSwxMiBAQCB2b2lkIE1lZGlh UGxheWJhY2tUYXJnZXRQaWNrZXJNYWM6OnN0b3BNCiB7CiAgICAgTE9HKE1lZGlhLCAiTWVkaWFQ bGF5YmFja1RhcmdldFBpY2tlck1hYzo6c3RvcE1vbml0b3JpbmdQbGF5YmFja1RhcmdldHMiKTsK IAotICAgIC8vIEZJWE1FOiB1cGRhdGUgb25jZSByZGFyOi8vMjEwNjI1MzYgaGFzIGJlZW4gZml4 ZWQuCisgICAgaWYgKG1fb3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXIpIHsKKyAgICAgICAgW21f b3V0cHV0RGV2aWNlTWVudUNvbnRyb2xsZXIgcmVtb3ZlT2JzZXJ2ZXI6bV9vdXRwdXREZXZpY2VN ZW51Q29udHJvbGxlckRlbGVnYXRlLmdldCgpIGZvcktleVBhdGg6ZXh0ZXJuYWxPdXRwdXREZXZp Y2VBdmFpbGFibGVLZXlOYW1lXTsKKyAgICAgICAgW21fb3V0cHV0RGV2aWNlTWVudUNvbnRyb2xs ZXIgcmVtb3ZlT2JzZXJ2ZXI6bV9vdXRwdXREZXZpY2VNZW51Q29udHJvbGxlckRlbGVnYXRlLmdl dCgpIGZvcktleVBhdGg6ZXh0ZXJuYWxPdXRwdXREZXZpY2VQaWNrZWRLZXlOYW1lXTsKKyAgICAg ICAgbV9vdXRwdXREZXZpY2VNZW51Q29udHJvbGxlciA9IG51bGxwdHI7CisgICAgfQorICAgIGN1 cnJlbnREZXZpY2VEaWRDaGFuZ2UoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=