148724 2015-09-02 14:15:53 -0700 [iOS] Playback does not pause when deselecting route and locking screen. 2015-12-02 13:24:35 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue webkit-bug-importer oldest_to_newest 1122908 0 jer.noble 2015-09-02 14:15:53 -0700 [iOS] Playback does not pause when deselecting route and locking screen. 1122928 1 jer.noble 2015-09-02 15:14:25 -0700 <rdar://problem/22100651> 1122944 2 260449 jer.noble 2015-09-02 16:09:05 -0700 Created attachment 260449 Patch 1122949 3 260449 eric.carlson 2015-09-02 16:23:32 -0700 Comment on attachment 260449 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=260449&action=review > Source/WebCore/html/MediaElementSession.cpp:295 > + bool oldHasActiveRoute = m_playbackTarget && m_playbackTarget->hasActiveRoute(); > + bool newHasActiveRoute = device->hasActiveRoute(); > m_playbackTarget = WTF::move(device); > client().setWirelessPlaybackTarget(*m_playbackTarget.copyRef()); > + if (oldHasActiveRoute != newHasActiveRoute) > + isPlayingToWirelessPlaybackTargetChanged(newHasActiveRoute); as discussed on irc, this isn't correct or necessary for iOS. > Source/WebCore/platform/audio/PlatformMediaSessionManager.h:61 > + bool isApplicationInBackground() const { return m_isApplicationInBackground; } Nit: this isn't used. 1122953 4 260453 jer.noble 2015-09-02 16:25:44 -0700 Created attachment 260453 Patch for landing 1123221 5 260453 commit-queue 2015-09-03 16:53:39 -0700 Comment on attachment 260453 Patch for landing Clearing flags on attachment: 260453 Committed r189322: <http://trac.webkit.org/changeset/189322> 260449 2015-09-02 16:09:05 -0700 2015-09-02 16:23:32 -0700 Patch bug-148724-20150902160903.patch text/plain 10017 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY1MGY4YzkwZTZlYzMy OWQyODgzMzJkYTlhZWNiZDA3NmNhM2IxMS4uMDRkNmVjMzRiNjVkOTY0NjAyODM2NDdmYjAzNDM5 MWZhMDBkN2E5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE1LTA5LTAyICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFBsYXliYWNrIGRv ZXMgbm90IHBhdXNlIHdoZW4gZGVzZWxlY3Rpbmcgcm91dGUgYW5kIGxvY2tpbmcgc2NyZWVuLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NzI0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBkZXNl bGVjdGluZyBhIHJvdXRlLCB0aGUgcm91dGUgY2hhbmdlIG5vdGlmaWNhdGlvbiBjYW4gYmUgZGVs YXllZCBmb3Igc29tZSBhbW91bnQKKyAgICAgICAgb2YgdGltZS4gSWYgdGhlIHNjcmVlbiBpcyBs b2NrZWQgYmVmb3JlIHRoZSBub3RpZmljYXRpb24gaXMgZmlyZWQsIHRoZSBQbGF0Zm9ybU1lZGlh U2Vzc2lvbk1hbmFnZXIKKyAgICAgICAgY2FuIHJlZnVzZSB0byBwYXVzZSB0aGUgdmlkZW8gd2hl biBlbnRlcmluZyB0aGUgYmFja2dyb3VuZCBkdWUgdG8gYSB3aXJlbGVzcyBwbGF5YmFjayByb3V0 ZQorICAgICAgICBzdGlsbCBiZWluZyBhY3RpdmUuCisKKyAgICAgICAgV2hlbiB0aGUgbWVkaWEg ZWxlbWVudCB0cmFuc2l0aW9ucyBmcm9tIGhhdmluZyBhbiBhY3RpdmUgcm91dGUgdG8gbm90IGhh dmluZyBvbmUgKG9yIHZpY2UgdmVyc2EpLAorICAgICAgICByZS1ydW4gdGhlIGludGVycnVwdGlv biBjaGVjay4gSW4gb3JkZXIgdG8gY29ycmVjdGx5IGRldGVybWluZSwgd2hlbiB0aGF0IG9jY3Vy cywgd2hldGhlcgorICAgICAgICB3ZSBhcmUgaW4gYW4gJ2FwcGxpY2F0aW9uIGJhY2tncm91bmQn IHN0YXRlLCBjYWNoZSB0aGF0IHZhbHVlIHRvIGFuIGl2YXIgd2hlbiBoYW5kbGluZworICAgICAg ICBhcHBsaWNhdGlvbntXaWxsLERpZH1FbnRlcntCYWNrZ3JvdW5kLEZvcmVncm91bmR9LgorCisg ICAgICAgIEJlY2F1c2Ugd2Ugb25seSB3YW50IHRvIHJ1biB0aGlzIHN0ZXAgZHVyaW5nIGFuIGFj dHVhbCB0cmFuc2l0aW9uIGJldHdlZW4gcGxheWluZyB0byBhIHJvdXRlIC0+CisgICAgICAgIHBs YXlpbmcgbG9jYWxseSwgY2FjaGUgdGhlIHZhbHVlIG9mIGlzUGxheWluZ1RvV2lyZWxlc3NQbGF5 YmFjayB0byBhbm90aGVyIGl2YXIsIGFuZCBvbmx5CisgICAgICAgIGluZm9ybSB0aGUgUGxhdGZv cm1NZWRpYVNlc3Npb25NYW5hZ2VyIHdoZW4gdGhhdCB2YWx1ZSBhY3R1YWxseSBjaGFuZ2VzLgor CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyQ3VycmVudFBsYXliYWNrVGFyZ2V0SXNXaXJl bGVzc0NoYW5nZWQpOgorICAgICAgICAqIGh0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpNZWRpYUVsZW1lbnRTZXNzaW9uOjpzZXRQbGF5YmFja1RhcmdldCk6 IAorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFTZXNzaW9uOjppc1BsYXlpbmdUb1dpcmVsZXNz UGxheWJhY2tUYXJnZXRDaGFuZ2VkKTogU2V0IG9yIGNsZWFyIG1faXNQbGF5aW5nVG9XaXJlbGVz c1BsYXliYWNrVGFyZ2V0LgorICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFT ZXNzaW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6aXNQbGF5 aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0KTogU2ltcGxlIGdldHRlci4KKyAgICAgICAgKiBw bGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjphcHBsaWNhdGlvbldpbGxFbnRl ckJhY2tncm91bmQpOiBTZXQgbV9pc0FwcGxpY2F0aW9uSW5CYWNrZ3JvdW5kLgorICAgICAgICAo V2ViQ29yZTo6UGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjphcHBsaWNhdGlvbkRpZEVudGVy QmFja2dyb3VuZCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1NZWRpYVNlc3Np b25NYW5hZ2VyOjphcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQpOiBDbGVhciBtX2lzQXBw bGljYXRpb25JbkJhY2tncm91bmQuCisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhU2Vz c2lvbk1hbmFnZXI6OnNlc3Npb25Jc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXRDaGFu Z2VkKTogUnVuIGludGVycnVwdGlvbgorICAgICAgICAgICAgaWYgYXBwbGljYXRpb24gaXMgaW4g YmFja2dyb3VuZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lv bk1hbmFnZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdl cjo6aXNBcHBsaWNhdGlvbkluQmFja2dyb3VuZCk6IFNpbXBsZSBnZXR0ZXIuCisKIDIwMTUtMDgt MjggIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gQWRk IFdlYktpdC9XZWJLaXQyIHNldHRpbmdzIHRvIGNvbnRyb2wgYXV0b21hdGljIGRhdGEgbG9hZGlu ZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXggNzQ5MDYxOWYx YWViZTRhNzdjNTFlY2ZiMTZlNjBmY2IwOTRiY2NmNC4uNzQwOWE1MWY2ODI4OTBkNmYzNjMxNmNl N2U3NjcwYTQyZTg2NDIyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVk aWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu Y3BwCkBAIC01MDMxLDkgKzUwMzEsMTAgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp3aXJlbGVz c1JvdXRlc0F2YWlsYWJsZURpZENoYW5nZSgpCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlh UGxheWVyQ3VycmVudFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzc0NoYW5nZWQoTWVkaWFQbGF5ZXIq KQogewogICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyQ3VycmVu dFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzc0NoYW5nZWQoJXApIC0gd2Via2l0Q3VycmVudFBsYXli YWNrVGFyZ2V0SXNXaXJlbGVzcyA9ICVzIiwgdGhpcywgYm9vbFN0cmluZyh3ZWJraXRDdXJyZW50 UGxheWJhY2tUYXJnZXRJc1dpcmVsZXNzKCkpKTsKLQorICAgIEFTU0VSVChtX3BsYXllcik7CiAg ICAgY29uZmlndXJlTWVkaWFDb250cm9scygpOwogICAgIHNjaGVkdWxlRXZlbnQoZXZlbnROYW1l cygpLndlYmtpdGN1cnJlbnRwbGF5YmFja3RhcmdldGlzd2lyZWxlc3NjaGFuZ2VkRXZlbnQpOwor ICAgIG1fbWVkaWFTZXNzaW9uLT5pc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXRDaGFu Z2VkKG1fcGxheWVyLT5pc0N1cnJlbnRQbGF5YmFja1RhcmdldFdpcmVsZXNzKCkpOwogICAgIHVw ZGF0ZU1lZGlhU3RhdGUoVXBkYXRlTWVkaWFTdGF0ZTo6QXN5bmNocm9ub3VzbHkpOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3BwIGIv U291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcAppbmRleCBkZjVkNDlj N2QwYmE5MGFiNjkwZTI1ZTIyMDI2NTc0YzMzMmMzZjBjLi5mMjU4OWE0ZjdiNmIyYzBmNzRkZmMw YzMxMWY1NGNiNGQ2M2Y2YWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL01lZGlh RWxlbWVudFNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50 U2Vzc2lvbi5jcHAKQEAgLTI4Nyw4ICsyODcsMTIgQEAgdm9pZCBNZWRpYUVsZW1lbnRTZXNzaW9u OjpzZXRIYXNQbGF5YmFja1RhcmdldEF2YWlsYWJpbGl0eUxpc3RlbmVycyhjb25zdCBIVE1MTWUK IAogdm9pZCBNZWRpYUVsZW1lbnRTZXNzaW9uOjpzZXRQbGF5YmFja1RhcmdldChSZWY8TWVkaWFQ bGF5YmFja1RhcmdldD4mJiBkZXZpY2UpCiB7CisgICAgYm9vbCBvbGRIYXNBY3RpdmVSb3V0ZSA9 IG1fcGxheWJhY2tUYXJnZXQgJiYgbV9wbGF5YmFja1RhcmdldC0+aGFzQWN0aXZlUm91dGUoKTsK KyAgICBib29sIG5ld0hhc0FjdGl2ZVJvdXRlID0gZGV2aWNlLT5oYXNBY3RpdmVSb3V0ZSgpOwog ICAgIG1fcGxheWJhY2tUYXJnZXQgPSBXVEY6Om1vdmUoZGV2aWNlKTsKICAgICBjbGllbnQoKS5z ZXRXaXJlbGVzc1BsYXliYWNrVGFyZ2V0KCptX3BsYXliYWNrVGFyZ2V0LmNvcHlSZWYoKSk7Cisg ICAgaWYgKG9sZEhhc0FjdGl2ZVJvdXRlICE9IG5ld0hhc0FjdGl2ZVJvdXRlKQorICAgICAgICBp c1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXRDaGFuZ2VkKG5ld0hhc0FjdGl2ZVJvdXRl KTsKIH0KIAogdm9pZCBNZWRpYUVsZW1lbnRTZXNzaW9uOjp0YXJnZXRBdmFpbGFiaWxpdHlDaGFu Z2VkVGltZXJGaXJlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp by9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp by9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKaW5kZXggZDk4MGY0ZDU3MmI1N2JiYTE1MjBiNzY5 ZDg2Njc2MTczZTllZDY0MS4uZWFlODI3M2NiZDJhYzM2MTg3MDNjZDk4ZTAyNjE0Mzc1MGMxMGNk ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRp YVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3Jt TWVkaWFTZXNzaW9uLmNwcApAQCAtMjU1LDYgKzI1NSwxNSBAQCBib29sIFBsYXRmb3JtTWVkaWFT ZXNzaW9uOjppc0hpZGRlbigpIGNvbnN0CiAgICAgcmV0dXJuIG1fY2xpZW50LmVsZW1lbnRJc0hp ZGRlbigpOwogfQogCit2b2lkIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjppc1BsYXlpbmdUb1dpcmVs ZXNzUGxheWJhY2tUYXJnZXRDaGFuZ2VkKGJvb2wgaXNXaXJlbGVzcykKK3sKKyAgICBpZiAoaXNX aXJlbGVzcyA9PSBtX2lzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldCkKKyAgICAgICAg cmV0dXJuOworCisgICAgbV9pc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQgPSBpc1dp cmVsZXNzOworICAgIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVkTWFuYWdlcigp LnNlc3Npb25Jc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXRDaGFuZ2VkKCp0aGlzKTsK K30KKwogUGxhdGZvcm1NZWRpYVNlc3Npb246OkRpc3BsYXlUeXBlIFBsYXRmb3JtTWVkaWFTZXNz aW9uOjpkaXNwbGF5VHlwZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1fY2xpZW50LmRpc3BsYXlU eXBlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9y bU1lZGlhU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1N ZWRpYVNlc3Npb24uaAppbmRleCA4MjBlYWRmYmE1MGRmZGFmYWExMjA1MDg3YTU0MWM3NTI1M2Nh NTUwLi41YTNjZjNjMjZiYjc0ZGViMjQzODFhNGY0NWE3NzkzNzk3OTY4YmJmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmgK QEAgLTEyNSw3ICsxMjUsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0hpZGRlbigpIGNvbnN0Owog CiAgICAgdmlydHVhbCBib29sIGNhblBsYXlUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKSBjb25z dCB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgYm9vbCBpc1BsYXlpbmdUb1dpcmVsZXNz UGxheWJhY2tUYXJnZXQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwgYm9v bCBpc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKSBjb25zdCB7IHJldHVybiBtX2lz UGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldDsgfQorICAgIHZvaWQgaXNQbGF5aW5nVG9X aXJlbGVzc1BsYXliYWNrVGFyZ2V0Q2hhbmdlZChib29sKTsKIAogI2lmIEVOQUJMRShXSVJFTEVT U19QTEFZQkFDS19UQVJHRVQpCiAgICAgLy8gTWVkaWFQbGF5YmFja1RhcmdldENsaWVudApAQCAt MTUxLDYgKzE1Miw3IEBAIHByaXZhdGU6CiAgICAgU3RhdGUgbV9zdGF0ZVRvUmVzdG9yZTsKICAg ICBpbnQgbV9pbnRlcnJ1cHRpb25Db3VudCB7IDAgfTsKICAgICBib29sIG1fbm90aWZ5aW5nQ2xp ZW50OworICAgIGJvb2wgbV9pc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQgeyBmYWxz ZSB9OwogCiAgICAgZnJpZW5kIGNsYXNzIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjsKIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlh U2Vzc2lvbk1hbmFnZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vUGxhdGZv cm1NZWRpYVNlc3Npb25NYW5hZ2VyLmNwcAppbmRleCAyMjU2NDYxYTc0YTI1NTdmN2NhY2U0YWNj OTljOTdhOGI0YjRkYTAzLi4xYTU4Y2I1ZTUyNmVkMjAyZDcxYTBjMDJlNjA2N2E0NTQ5MzhjZGFj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlh U2Vzc2lvbk1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1Bs YXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAKQEAgLTI3NSw2ICsyNzUsMTIgQEAgYm9vbCBQ bGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNlc3Npb25DYW5Mb2FkTWVkaWEoY29uc3QgUGxh dGZvcm1NZWRpYVNlc3Npb24KIHZvaWQgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjphcHBs aWNhdGlvbldpbGxFbnRlckJhY2tncm91bmQoKSBjb25zdAogewogICAgIExPRyhNZWRpYSwgIlBs YXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6YXBwbGljYXRpb25XaWxsRW50ZXJCYWNrZ3JvdW5k Iik7CisKKyAgICBpZiAobV9pc0FwcGxpY2F0aW9uSW5CYWNrZ3JvdW5kKQorICAgICAgICByZXR1 cm47CisKKyAgICBtX2lzQXBwbGljYXRpb25JbkJhY2tncm91bmQgPSB0cnVlOworICAgIAogICAg IFZlY3RvcjxQbGF0Zm9ybU1lZGlhU2Vzc2lvbio+IHNlc3Npb25zID0gbV9zZXNzaW9uczsKICAg ICBmb3IgKGF1dG8qIHNlc3Npb24gOiBzZXNzaW9ucykgewogICAgICAgICBpZiAobV9yZXN0cmlj dGlvbnNbc2Vzc2lvbi0+bWVkaWFUeXBlKCldICYgQmFja2dyb3VuZFByb2Nlc3NQbGF5YmFja1Jl c3RyaWN0ZWQpCkBAIC0yOTksNiArMzA1LDEyIEBAIHZvaWQgUGxhdGZvcm1NZWRpYVNlc3Npb25N YW5hZ2VyOjphcHBsaWNhdGlvbkRpZEVudGVyQmFja2dyb3VuZChib29sIGlzU3VzcGVuZGVkCiB2 b2lkIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6YXBwbGljYXRpb25XaWxsRW50ZXJGb3Jl Z3JvdW5kKCkgY29uc3QKIHsKICAgICBMT0coTWVkaWEsICJQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1h bmFnZXI6OmFwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZCIpOworCisgICAgaWYgKCFtX2lz QXBwbGljYXRpb25JbkJhY2tncm91bmQpCisgICAgICAgIHJldHVybjsKKworICAgIG1faXNBcHBs aWNhdGlvbkluQmFja2dyb3VuZCA9IGZhbHNlOworCiAgICAgVmVjdG9yPFBsYXRmb3JtTWVkaWFT ZXNzaW9uKj4gc2Vzc2lvbnMgPSBtX3Nlc3Npb25zOwogICAgIGZvciAoYXV0byogc2Vzc2lvbiA6 IHNlc3Npb25zKSB7CiAgICAgICAgIGlmIChtX3Jlc3RyaWN0aW9uc1tzZXNzaW9uLT5tZWRpYVR5 cGUoKV0gJiBCYWNrZ3JvdW5kUHJvY2Vzc1BsYXliYWNrUmVzdHJpY3RlZCkKQEAgLTMwNiw2ICsz MTgsMTUgQEAgdm9pZCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OmFwcGxpY2F0aW9uV2ls bEVudGVyRm9yZWdyb3VuZCgpIGNvbnN0CiAgICAgfQogfQogCit2b2lkIFBsYXRmb3JtTWVkaWFT ZXNzaW9uTWFuYWdlcjo6c2Vzc2lvbklzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldENo YW5nZWQoUGxhdGZvcm1NZWRpYVNlc3Npb24mIHNlc3Npb24pCit7CisgICAgaWYgKCFtX2lzQXBw bGljYXRpb25JbkJhY2tncm91bmQgfHwgIShtX3Jlc3RyaWN0aW9uc1tzZXNzaW9uLm1lZGlhVHlw ZSgpXSAmIEJhY2tncm91bmRQcm9jZXNzUGxheWJhY2tSZXN0cmljdGVkKSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgaWYgKHNlc3Npb24uc3RhdGUoKSAhPSBQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6 SW50ZXJydXB0ZWQgJiYgc2Vzc2lvbi5zaG91bGREb0ludGVycnVwdGlvbihQbGF0Zm9ybU1lZGlh U2Vzc2lvbjo6RW50ZXJpbmdCYWNrZ3JvdW5kKSkKKyAgICAgICAgc2Vzc2lvbi5kb0ludGVycnVw dGlvbigpOworfQorCiAjaWYgIVBMQVRGT1JNKENPQ09BKQogdm9pZCBQbGF0Zm9ybU1lZGlhU2Vz c2lvbk1hbmFnZXI6OnVwZGF0ZVNlc3Npb25TdGF0ZSgpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlci5o CmluZGV4IDU5YzI1ZjY2ZDJhNjRkNzY5Mzc0NTM1NjlhYzUwYzI5NGFkMWE1MTYuLmQ5ZTNjMDAx NzE1NmRhYjNlOTA1ZTZiYThhZmQyNzZlYjA0OWNkZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlci5o CkBAIC01OCw2ICs1OCw3IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGFwcGxp Y2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZCgpIGNvbnN0OwogICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgYXBwbGljYXRpb25XaWxsRW50ZXJCYWNrZ3JvdW5kKCkgY29uc3Q7CiAgICAgV0VCQ09SRV9F WFBPUlQgdm9pZCBhcHBsaWNhdGlvbkRpZEVudGVyQmFja2dyb3VuZChib29sIGlzU3VzcGVuZGVk VW5kZXJMb2NrKSBjb25zdDsKKyAgICBib29sIGlzQXBwbGljYXRpb25JbkJhY2tncm91bmQoKSBj b25zdCB7IHJldHVybiBtX2lzQXBwbGljYXRpb25JbkJhY2tncm91bmQ7IH0KIAogICAgIHZvaWQg c3RvcEFsbE1lZGlhUGxheWJhY2tGb3JEb2N1bWVudChjb25zdCBEb2N1bWVudCopOwogICAgIFdF QkNPUkVfRVhQT1JUIHZvaWQgc3RvcEFsbE1lZGlhUGxheWJhY2tGb3JQcm9jZXNzKCk7CkBAIC04 OCw2ICs4OSw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEN1cnJlbnRTZXNzaW9uKFBsYXRmb3Jt TWVkaWFTZXNzaW9uJik7CiAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb24qIGN1cnJlbnRTZXNzaW9u KCk7CiAKKyAgICB2b2lkIHNlc3Npb25Jc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXRD aGFuZ2VkKFBsYXRmb3JtTWVkaWFTZXNzaW9uJik7CisKIHByb3RlY3RlZDoKICAgICBmcmllbmQg Y2xhc3MgUGxhdGZvcm1NZWRpYVNlc3Npb247CiAgICAgZXhwbGljaXQgUGxhdGZvcm1NZWRpYVNl c3Npb25NYW5hZ2VyKCk7CkBAIC0xMjYsNiArMTI5LDcgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAg ICAgYm9vbCBtX2ludGVycnVwdGVkIHsgZmFsc2UgfTsKKyAgICBtdXRhYmxlIGJvb2wgbV9pc0Fw cGxpY2F0aW9uSW5CYWNrZ3JvdW5kIHsgZmFsc2UgfTsKIH07CiAKIH0K 260453 2015-09-02 16:25:44 -0700 2015-09-03 16:53:39 -0700 Patch for landing bug-148724-20150902162543.patch text/plain 8385 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTY1MGY4YzkwZTZlYzMy OWQyODgzMzJkYTlhZWNiZDA3NmNhM2IxMS4uN2YwZGJiMDE3Njk4ZGE2NmM5NzVmMTUyMmU1OTYx OWJmODcyYmUwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE1LTA5LTAyICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFBsYXliYWNrIGRv ZXMgbm90IHBhdXNlIHdoZW4gZGVzZWxlY3Rpbmcgcm91dGUgYW5kIGxvY2tpbmcgc2NyZWVuLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NzI0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIFdoZW4gZGVzZWxl Y3RpbmcgYSByb3V0ZSwgdGhlIHJvdXRlIGNoYW5nZSBub3RpZmljYXRpb24gY2FuIGJlIGRlbGF5 ZWQgZm9yIHNvbWUgYW1vdW50CisgICAgICAgIG9mIHRpbWUuIElmIHRoZSBzY3JlZW4gaXMgbG9j a2VkIGJlZm9yZSB0aGUgbm90aWZpY2F0aW9uIGlzIGZpcmVkLCB0aGUgUGxhdGZvcm1NZWRpYVNl c3Npb25NYW5hZ2VyCisgICAgICAgIGNhbiByZWZ1c2UgdG8gcGF1c2UgdGhlIHZpZGVvIHdoZW4g ZW50ZXJpbmcgdGhlIGJhY2tncm91bmQgZHVlIHRvIGEgd2lyZWxlc3MgcGxheWJhY2sgcm91dGUK KyAgICAgICAgc3RpbGwgYmVpbmcgYWN0aXZlLgorCisgICAgICAgIFdoZW4gdGhlIG1lZGlhIGVs ZW1lbnQgdHJhbnNpdGlvbnMgZnJvbSBoYXZpbmcgYW4gYWN0aXZlIHJvdXRlIHRvIG5vdCBoYXZp bmcgb25lIChvciB2aWNlIHZlcnNhKSwKKyAgICAgICAgcmUtcnVuIHRoZSBpbnRlcnJ1cHRpb24g Y2hlY2suIEluIG9yZGVyIHRvIGNvcnJlY3RseSBkZXRlcm1pbmUsIHdoZW4gdGhhdCBvY2N1cnMs IHdoZXRoZXIKKyAgICAgICAgd2UgYXJlIGluIGFuICdhcHBsaWNhdGlvbiBiYWNrZ3JvdW5kJyBz dGF0ZSwgY2FjaGUgdGhhdCB2YWx1ZSB0byBhbiBpdmFyIHdoZW4gaGFuZGxpbmcKKyAgICAgICAg YXBwbGljYXRpb257V2lsbCxEaWR9RW50ZXJ7QmFja2dyb3VuZCxGb3JlZ3JvdW5kfS4KKworICAg ICAgICBCZWNhdXNlIHdlIG9ubHkgd2FudCB0byBydW4gdGhpcyBzdGVwIGR1cmluZyBhbiBhY3R1 YWwgdHJhbnNpdGlvbiBiZXR3ZWVuIHBsYXlpbmcgdG8gYSByb3V0ZSAtPgorICAgICAgICBwbGF5 aW5nIGxvY2FsbHksIGNhY2hlIHRoZSB2YWx1ZSBvZiBpc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJh Y2sgdG8gYW5vdGhlciBpdmFyLCBhbmQgb25seQorICAgICAgICBpbmZvcm0gdGhlIFBsYXRmb3Jt TWVkaWFTZXNzaW9uTWFuYWdlciB3aGVuIHRoYXQgdmFsdWUgYWN0dWFsbHkgY2hhbmdlcy4KKwor ICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpI VE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllckN1cnJlbnRQbGF5YmFja1RhcmdldElzV2lyZWxl c3NDaGFuZ2VkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lv bi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6aXNQbGF5aW5n VG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0Q2hhbmdlZCk6IFNldCBvciBjbGVhciBtX2lzUGxheWlu Z1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldC4KKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9QbGF0 Zm9ybU1lZGlhU2Vzc2lvbi5oOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1NZWRpYVNlc3Np b246OmlzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldCk6IFNpbXBsZSBnZXR0ZXIuCisg ICAgICAgICogcGxhdGZvcm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6YXBwbGljYXRp b25XaWxsRW50ZXJCYWNrZ3JvdW5kKTogU2V0IG1faXNBcHBsaWNhdGlvbkluQmFja2dyb3VuZC4K KyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6YXBwbGljYXRp b25EaWRFbnRlckJhY2tncm91bmQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3Jt TWVkaWFTZXNzaW9uTWFuYWdlcjo6YXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kKTogQ2xl YXIgbV9pc0FwcGxpY2F0aW9uSW5CYWNrZ3JvdW5kLgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZv cm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzZXNzaW9uSXNQbGF5aW5nVG9XaXJlbGVzc1BsYXliYWNr VGFyZ2V0Q2hhbmdlZCk6IFJ1biBpbnRlcnJ1cHRpb24KKyAgICAgICAgICAgIGlmIGFwcGxpY2F0 aW9uIGlzIGluIGJhY2tncm91bmQuCisKIDIwMTUtMDgtMjggIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gQWRkIFdlYktpdC9XZWJLaXQyIHNldHRpbmdz IHRvIGNvbnRyb2wgYXV0b21hdGljIGRhdGEgbG9hZGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHAKaW5kZXggNzQ5MDYxOWYxYWViZTRhNzdjNTFlY2ZiMTZlNjBmY2Iw OTRiY2NmNC4uNzQwOWE1MWY2ODI4OTBkNmYzNjMxNmNlN2U3NjcwYTQyZTg2NDIyYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC01MDMxLDkgKzUwMzEsMTAg QEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp3aXJlbGVzc1JvdXRlc0F2YWlsYWJsZURpZENoYW5n ZSgpCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyQ3VycmVudFBsYXliYWNrVGFy Z2V0SXNXaXJlbGVzc0NoYW5nZWQoTWVkaWFQbGF5ZXIqKQogewogICAgIExPRyhNZWRpYSwgIkhU TUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyQ3VycmVudFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVz c0NoYW5nZWQoJXApIC0gd2Via2l0Q3VycmVudFBsYXliYWNrVGFyZ2V0SXNXaXJlbGVzcyA9ICVz IiwgdGhpcywgYm9vbFN0cmluZyh3ZWJraXRDdXJyZW50UGxheWJhY2tUYXJnZXRJc1dpcmVsZXNz KCkpKTsKLQorICAgIEFTU0VSVChtX3BsYXllcik7CiAgICAgY29uZmlndXJlTWVkaWFDb250cm9s cygpOwogICAgIHNjaGVkdWxlRXZlbnQoZXZlbnROYW1lcygpLndlYmtpdGN1cnJlbnRwbGF5YmFj a3RhcmdldGlzd2lyZWxlc3NjaGFuZ2VkRXZlbnQpOworICAgIG1fbWVkaWFTZXNzaW9uLT5pc1Bs YXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXRDaGFuZ2VkKG1fcGxheWVyLT5pc0N1cnJlbnRQ bGF5YmFja1RhcmdldFdpcmVsZXNzKCkpOwogICAgIHVwZGF0ZU1lZGlhU3RhdGUoVXBkYXRlTWVk aWFTdGF0ZTo6QXN5bmNocm9ub3VzbHkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5jcHAKaW5kZXggZDk4MGY0ZDU3 MmI1N2JiYTE1MjBiNzY5ZDg2Njc2MTczZTllZDY0MS4uZWFlODI3M2NiZDJhYzM2MTg3MDNjZDk4 ZTAyNjE0Mzc1MGMxMGNkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk aW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uLmNwcApAQCAtMjU1LDYgKzI1NSwxNSBAQCBib29s IFBsYXRmb3JtTWVkaWFTZXNzaW9uOjppc0hpZGRlbigpIGNvbnN0CiAgICAgcmV0dXJuIG1fY2xp ZW50LmVsZW1lbnRJc0hpZGRlbigpOwogfQogCit2b2lkIFBsYXRmb3JtTWVkaWFTZXNzaW9uOjpp c1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXRDaGFuZ2VkKGJvb2wgaXNXaXJlbGVzcykK K3sKKyAgICBpZiAoaXNXaXJlbGVzcyA9PSBtX2lzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1Rh cmdldCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9pc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJh Y2tUYXJnZXQgPSBpc1dpcmVsZXNzOworICAgIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6 c2hhcmVkTWFuYWdlcigpLnNlc3Npb25Jc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXRD aGFuZ2VkKCp0aGlzKTsKK30KKwogUGxhdGZvcm1NZWRpYVNlc3Npb246OkRpc3BsYXlUeXBlIFBs YXRmb3JtTWVkaWFTZXNzaW9uOjpkaXNwbGF5VHlwZSgpIGNvbnN0CiB7CiAgICAgcmV0dXJuIG1f Y2xpZW50LmRpc3BsYXlUeXBlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v YXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb24uaAppbmRleCA4MjBlYWRmYmE1MGRmZGFmYWExMjA1 MDg3YTU0MWM3NTI1M2NhNTUwLi41YTNjZjNjMjZiYjc0ZGViMjQzODFhNGY0NWE3NzkzNzk3OTY4 YmJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1l ZGlhU2Vzc2lvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3Jt TWVkaWFTZXNzaW9uLmgKQEAgLTEyNSw3ICsxMjUsOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0hp ZGRlbigpIGNvbnN0OwogCiAgICAgdmlydHVhbCBib29sIGNhblBsYXlUb1dpcmVsZXNzUGxheWJh Y2tUYXJnZXQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQotICAgIHZpcnR1YWwgYm9vbCBpc1Bs YXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQor ICAgIHZpcnR1YWwgYm9vbCBpc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJhY2tUYXJnZXQoKSBjb25z dCB7IHJldHVybiBtX2lzUGxheWluZ1RvV2lyZWxlc3NQbGF5YmFja1RhcmdldDsgfQorICAgIHZv aWQgaXNQbGF5aW5nVG9XaXJlbGVzc1BsYXliYWNrVGFyZ2V0Q2hhbmdlZChib29sKTsKIAogI2lm IEVOQUJMRShXSVJFTEVTU19QTEFZQkFDS19UQVJHRVQpCiAgICAgLy8gTWVkaWFQbGF5YmFja1Rh cmdldENsaWVudApAQCAtMTUxLDYgKzE1Miw3IEBAIHByaXZhdGU6CiAgICAgU3RhdGUgbV9zdGF0 ZVRvUmVzdG9yZTsKICAgICBpbnQgbV9pbnRlcnJ1cHRpb25Db3VudCB7IDAgfTsKICAgICBib29s IG1fbm90aWZ5aW5nQ2xpZW50OworICAgIGJvb2wgbV9pc1BsYXlpbmdUb1dpcmVsZXNzUGxheWJh Y2tUYXJnZXQgeyBmYWxzZSB9OwogCiAgICAgZnJpZW5kIGNsYXNzIFBsYXRmb3JtTWVkaWFTZXNz aW9uTWFuYWdlcjsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp by9QbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYXVkaW8vUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyLmNwcAppbmRleCAyMjU2NDYxYTc0 YTI1NTdmN2NhY2U0YWNjOTljOTdhOGI0YjRkYTAzLi4xYTU4Y2I1ZTUyNmVkMjAyZDcxYTBjMDJl NjA2N2E0NTQ5MzhjZGFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp by9QbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlci5jcHAKQEAgLTI3NSw2ICsy NzUsMTIgQEAgYm9vbCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNlc3Npb25DYW5Mb2Fk TWVkaWEoY29uc3QgUGxhdGZvcm1NZWRpYVNlc3Npb24KIHZvaWQgUGxhdGZvcm1NZWRpYVNlc3Np b25NYW5hZ2VyOjphcHBsaWNhdGlvbldpbGxFbnRlckJhY2tncm91bmQoKSBjb25zdAogewogICAg IExPRyhNZWRpYSwgIlBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6YXBwbGljYXRpb25XaWxs RW50ZXJCYWNrZ3JvdW5kIik7CisKKyAgICBpZiAobV9pc0FwcGxpY2F0aW9uSW5CYWNrZ3JvdW5k KQorICAgICAgICByZXR1cm47CisKKyAgICBtX2lzQXBwbGljYXRpb25JbkJhY2tncm91bmQgPSB0 cnVlOworICAgIAogICAgIFZlY3RvcjxQbGF0Zm9ybU1lZGlhU2Vzc2lvbio+IHNlc3Npb25zID0g bV9zZXNzaW9uczsKICAgICBmb3IgKGF1dG8qIHNlc3Npb24gOiBzZXNzaW9ucykgewogICAgICAg ICBpZiAobV9yZXN0cmljdGlvbnNbc2Vzc2lvbi0+bWVkaWFUeXBlKCldICYgQmFja2dyb3VuZFBy b2Nlc3NQbGF5YmFja1Jlc3RyaWN0ZWQpCkBAIC0yOTksNiArMzA1LDEyIEBAIHZvaWQgUGxhdGZv cm1NZWRpYVNlc3Npb25NYW5hZ2VyOjphcHBsaWNhdGlvbkRpZEVudGVyQmFja2dyb3VuZChib29s IGlzU3VzcGVuZGVkCiB2b2lkIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6YXBwbGljYXRp b25XaWxsRW50ZXJGb3JlZ3JvdW5kKCkgY29uc3QKIHsKICAgICBMT0coTWVkaWEsICJQbGF0Zm9y bU1lZGlhU2Vzc2lvbk1hbmFnZXI6OmFwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZCIpOwor CisgICAgaWYgKCFtX2lzQXBwbGljYXRpb25JbkJhY2tncm91bmQpCisgICAgICAgIHJldHVybjsK KworICAgIG1faXNBcHBsaWNhdGlvbkluQmFja2dyb3VuZCA9IGZhbHNlOworCiAgICAgVmVjdG9y PFBsYXRmb3JtTWVkaWFTZXNzaW9uKj4gc2Vzc2lvbnMgPSBtX3Nlc3Npb25zOwogICAgIGZvciAo YXV0byogc2Vzc2lvbiA6IHNlc3Npb25zKSB7CiAgICAgICAgIGlmIChtX3Jlc3RyaWN0aW9uc1tz ZXNzaW9uLT5tZWRpYVR5cGUoKV0gJiBCYWNrZ3JvdW5kUHJvY2Vzc1BsYXliYWNrUmVzdHJpY3Rl ZCkKQEAgLTMwNiw2ICszMTgsMTUgQEAgdm9pZCBQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6 OmFwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZCgpIGNvbnN0CiAgICAgfQogfQogCit2b2lk IFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2Vzc2lvbklzUGxheWluZ1RvV2lyZWxlc3NQ bGF5YmFja1RhcmdldENoYW5nZWQoUGxhdGZvcm1NZWRpYVNlc3Npb24mIHNlc3Npb24pCit7Cisg ICAgaWYgKCFtX2lzQXBwbGljYXRpb25JbkJhY2tncm91bmQgfHwgIShtX3Jlc3RyaWN0aW9uc1tz ZXNzaW9uLm1lZGlhVHlwZSgpXSAmIEJhY2tncm91bmRQcm9jZXNzUGxheWJhY2tSZXN0cmljdGVk KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKHNlc3Npb24uc3RhdGUoKSAhPSBQbGF0Zm9y bU1lZGlhU2Vzc2lvbjo6SW50ZXJydXB0ZWQgJiYgc2Vzc2lvbi5zaG91bGREb0ludGVycnVwdGlv bihQbGF0Zm9ybU1lZGlhU2Vzc2lvbjo6RW50ZXJpbmdCYWNrZ3JvdW5kKSkKKyAgICAgICAgc2Vz c2lvbi5kb0ludGVycnVwdGlvbigpOworfQorCiAjaWYgIVBMQVRGT1JNKENPQ09BKQogdm9pZCBQ bGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnVwZGF0ZVNlc3Npb25TdGF0ZSgpCiB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9QbGF0Zm9ybU1lZGlhU2Vzc2lv bk1hbmFnZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFT ZXNzaW9uTWFuYWdlci5oCmluZGV4IDU5YzI1ZjY2ZDJhNjRkNzY5Mzc0NTM1NjlhYzUwYzI5NGFk MWE1MTYuLjFmNzYwM2FiZGMwYTJmMjUyY2ZhYjBjZmFlNTEzNmRkMTI0ZDNkZDQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFTZXNzaW9uTWFu YWdlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL1BsYXRmb3JtTWVkaWFT ZXNzaW9uTWFuYWdlci5oCkBAIC04OCw2ICs4OCw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldEN1 cnJlbnRTZXNzaW9uKFBsYXRmb3JtTWVkaWFTZXNzaW9uJik7CiAgICAgUGxhdGZvcm1NZWRpYVNl c3Npb24qIGN1cnJlbnRTZXNzaW9uKCk7CiAKKyAgICB2b2lkIHNlc3Npb25Jc1BsYXlpbmdUb1dp cmVsZXNzUGxheWJhY2tUYXJnZXRDaGFuZ2VkKFBsYXRmb3JtTWVkaWFTZXNzaW9uJik7CisKIHBy b3RlY3RlZDoKICAgICBmcmllbmQgY2xhc3MgUGxhdGZvcm1NZWRpYVNlc3Npb247CiAgICAgZXhw bGljaXQgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyKCk7CkBAIC0xMjYsNiArMTI4LDcgQEAg cHJpdmF0ZToKICNlbmRpZgogCiAgICAgYm9vbCBtX2ludGVycnVwdGVkIHsgZmFsc2UgfTsKKyAg ICBtdXRhYmxlIGJvb2wgbV9pc0FwcGxpY2F0aW9uSW5CYWNrZ3JvdW5kIHsgZmFsc2UgfTsKIH07 CiAKIH0K