146439 2015-06-29 16:26:37 -0700 Web page doesn't update its loading state when web process becomes suspended if there are pending network requests (XHR). 2015-07-01 16:19:03 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 yongjun_zhang webkit-unassigned andersca ap barraclough cdumez commit-queue ddkilzer mitz sam thorton oldest_to_newest 1105554 0 yongjun_zhang 2015-06-29 16:26:37 -0700 When a web page starts a XHR request after the page is finished loading, we should take a background activity token and hold it until the request is cancelled or finished. Otherwise the WebContent process could be suspended since its activity token could drop to 0 after this point. 1105562 1 yongjun_zhang 2015-06-29 16:45:09 -0700 <rdar://problem/18846532> 1105564 2 255795 yongjun_zhang 2015-06-29 16:52:58 -0700 Created attachment 255795 Patch. 1105592 3 yongjun_zhang 2015-06-29 18:07:08 -0700 Hmm, this fix could have the side effect of holding the web process too long if there is a long lasting XHR request. I need to work on a better fix. 1105604 4 yongjun_zhang 2015-06-29 18:50:16 -0700 Update the title to reflect the real problem. 1105623 5 255810 yongjun_zhang 2015-06-29 20:34:37 -0700 Created attachment 255810 Patch v2. 1105868 6 255810 simon.fraser 2015-06-30 15:37:30 -0700 Comment on attachment 255810 Patch v2. View in context: https://bugs.webkit.org/attachment.cgi?id=255810&action=review > Source/WebKit2/UIProcess/WebPageProxy.h:821 > + void processWillBecomeForground(); "processWillBecomeForground" -> processWillBecomeForeground 1106116 7 255810 mitz 2015-07-01 11:17:25 -0700 Comment on attachment 255810 Patch v2. I don’t know which state transitions are possible. Is it a concern that the outcomes of the following transitions are different? Foreground -> Suspended -> Background Foreground -> Background Is it a concern that this transition will fail to restore the state? Foreground -> Suspended -> Background -> Suspended -> Foreground (because on the second entry into Suspended, m_hasNetworkRequestsOnSuspended will change to false) 1106132 8 yongjun_zhang 2015-07-01 11:52:20 -0700 (In reply to comment #7) > Comment on attachment 255810 [details] > Patch v2. > > I don’t know which state transitions are possible. Is it a concern that the > outcomes of the following transitions are different? > Foreground -> Suspended -> Background > Foreground -> Background I could be wrong, but based on code inspection and my own test, I didn't find a scenario where the web process could go from Suspended to Background. > > Is it a concern that this transition will fail to restore the state? > Foreground -> Suspended -> Background -> Suspended -> Foreground > (because on the second entry into Suspended, m_hasNetworkRequestsOnSuspended > will change to false) Again, this ties to whether Suspended -> Background transition is possible. Thanks for the review! I will fix the typo on commit. 1106191 9 255956 yongjun_zhang 2015-07-01 15:22:25 -0700 Created attachment 255956 Patch for landing. 1106223 10 255956 commit-queue 2015-07-01 16:18:56 -0700 Comment on attachment 255956 Patch for landing. Clearing flags on attachment: 255956 Committed r186200: <http://trac.webkit.org/changeset/186200> 1106224 11 commit-queue 2015-07-01 16:19:03 -0700 All reviewed patches have been landed. Closing bug. 255795 2015-06-29 16:52:58 -0700 2015-06-29 20:34:37 -0700 Patch. xhr_background_token.patch text/plain 2577 yongjun_zhang Y29tbWl0IGVkZDExNWZhZDBkY2EyMjQyNTNkMjVmNTVlNDFjNjg0ZDk0MDQxNjAKQXV0aG9yOiBZ b25nanVuIFpoYW5nIDx5b25nanVuX3poYW5nQGFwcGxlLmNvbT4KRGF0ZTogICBNb24gSnVuIDI5 IDExOjQ1OjE4IDIwMTUgLTA3MDAKCiAgICBOZWVkIHRvIHRha2UgYSBiYWNrZ3JvdW5kIGFjdGl2 aXR5IHRva2VuIHdoZW4gV2ViS2l0IGlzIGxvYWRpbmcgWEhSIHJlcXVlc3RzIGFmdGVyIHRoZSBw YWdlIGlzIGxvYWRlZC4KICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNDY0MzkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWEwMjEyMC4uMDRiOTc0OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE5IEBACisyMDE1LTA2LTI5ICBZb25nanVuIFpoYW5nICA8eW9uZ2p1bl96aGFuZ0Bh cHBsZS5jb20+CisKKyAgICAgICAgTmVlZCB0byB0YWtlIGEgYmFja2dyb3VuZCBhY3Rpdml0eSB0 b2tlbiB3aGVuIFdlYktpdCBpcyBsb2FkaW5nIFhIUiByZXF1ZXN0cyBhZnRlciB0aGUgcGFnZSBp cyBsb2FkZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNDY0MzkKKworICAgICAgICBXaGVuIGEgd2ViIHBhZ2Ugc3RhcnRzIGEgWEhSIHJlcXVlc3Qg YWZ0ZXIgdGhlIHBhZ2UgaXMgZmluaXNoZWQgbG9hZGluZywgd2Ugc2hvdWxkIHRha2UgYSBiYWNr Z3JvdW5kIGFjdGl2aXR5CisgICAgICAgIHRva2VuIGFuZCBob2xkIGl0IHVudGlsIHRoZSByZXF1 ZXN0IGlzIGNhbmNlbGxlZCBvciBmaW5pc2hlZC4gT3RoZXJ3aXNlIHRoZSBXZWJDb250ZW50IHBy b2Nlc3MgY291bGQgYmUgc3VzcGVuZGVkCisgICAgICAgIHNpbmNlIGl0cyBhY3Rpdml0eSB0b2tl biBjb3VsZCBkcm9wIHRvIDAgYWZ0ZXIgdGhpcyBwb2ludC4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9u U3RhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tOgor ICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6OmRpZENoYW5nZU5ldHdvcmtSZXF1ZXN0 c0luUHJvZ3Jlc3MpOiBUYWtlIGEgYmFja2dyb3VuZCBhY3Rpdml0eSB0b2tlbiBpZiB0aGVyZSBp cworICAgICAgICAgICAgbmV0d29yayByZXF1ZXN0LCBvdGhlcndpc2UgcmVsZWFzZSB0aGUgdG9r ZW4uCisKIDIwMTUtMDYtMjkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+ CiAKICAgICAgICAgRml4IHRoZSBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAppbmRleCA5ZWQxY2U5Li5hOGQzOTBmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oCkBAIC0x ODYsNiArMTg2LDcgQEAgcHJpdmF0ZToKIAogI2lmIFBMQVRGT1JNKElPUykKICAgICBQcm9jZXNz VGhyb3R0bGVyOjpCYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbiBtX2FjdGl2aXR5VG9rZW47CisgICAg UHJvY2Vzc1Rocm90dGxlcjo6QmFja2dyb3VuZEFjdGl2aXR5VG9rZW4gbV9uZXR3b3JrQWN0aXZp dHlUb2tlbjsKICNlbmRpZgogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9D b2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KaW5kZXggYTkxZjA1MC4uY2QyMTY4YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCkBAIC04 MzgsNiArODM4LDEyIEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjp3aWxsQ2hhbmdlTmV0d29ya1Jl cXVlc3RzSW5Qcm9ncmVzcygpCiAKIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpkaWRDaGFuZ2VOZXR3 b3JrUmVxdWVzdHNJblByb2dyZXNzKCkKIHsKKyNpZiBQTEFURk9STShJT1MpCisgICAgaWYgKG1f d2ViVmlldy0+X3BhZ2UtPnBhZ2VMb2FkU3RhdGUoKS5uZXR3b3JrUmVxdWVzdHNJblByb2dyZXNz KCkpCisgICAgICAgIG1fbmV0d29ya0FjdGl2aXR5VG9rZW4gPSBtX3dlYlZpZXctPl9wYWdlLT5w cm9jZXNzKCkudGhyb3R0bGVyKCkuYmFja2dyb3VuZEFjdGl2aXR5VG9rZW4oKTsKKyAgICBlbHNl CisgICAgICAgIG1fbmV0d29ya0FjdGl2aXR5VG9rZW4gPSBudWxscHRyOworI2VuZGlmCiAgICAg W21fd2ViVmlldyBkaWRDaGFuZ2VWYWx1ZUZvcktleTpAIl9uZXR3b3JrUmVxdWVzdHNJblByb2dy ZXNzIl07CiB9CiAK 255810 2015-06-29 20:34:37 -0700 2015-07-01 15:22:25 -0700 Patch v2. process_suspend.patch text/plain 6521 yongjun_zhang Y29tbWl0IDdiNDNlMzMyNDQ0MmI1MjM4N2RkZDI0NzgyMjI2ZDhmMDZmMmY0NGEKQXV0aG9yOiBZ b25nanVuIFpoYW5nIDx5b25nanVuX3poYW5nQGFwcGxlLmNvbT4KRGF0ZTogICBNb24gSnVuIDI5 IDExOjQ1OjE4IDIwMTUgLTA3MDAKCiAgICBXZWIgcGFnZSBkb2Vzbid0IHVwZGF0ZSBpdHMgbG9h ZGluZyBzdGF0ZSB3aGVuIHdlYiBwcm9jZXNzIGJlY29tZXMgc3VzcGVuZGVkIGlmIHRoZXJlIGFy ZSBwZW5kaW5nIG5ldHdvcmsgcmVxdWVzdHMgKFhIUikuCiAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2NDM5CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGVhMDIxMjAuLjllMWYx ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxNS0wNi0yOSAgWW9uZ2p1biBaaGFu ZyAgPHlvbmdqdW5femhhbmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBwYWdlIGRvZXNuJ3Qg dXBkYXRlIGl0cyBsb2FkaW5nIHN0YXRlIHdoZW4gd2ViIHByb2Nlc3MgYmVjb21lcyBzdXNwZW5k ZWQgaWYgdGhlcmUgYXJlIHBlbmRpbmcgbmV0d29yayByZXF1ZXN0cyAoWEhSKS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjQzOQorCisgICAgICAg IFdoZW4gd2ViIHBhZ2UgaXMgbG9hZGluZywgd2UgaG9sZCBhIGJhY2tncm91bmQgYWN0aXZpdHkg dG9rZW4gaW4gTmF2aWdhdGlvblN0YXRlIGFuZCB3ZSByZWxlYXNlIHRoZSB0b2tlbiB3aGVuIHRo ZSBwYWdlIGRvbmUKKyAgICAgICAgbG9hZGluZy4gQSB3ZWIgcGFnZSBjYW4gc3RhcnQgbG9hZGlu ZyBzdWJyZXNvdXJjZXMgKGxpa2UgWEhSKSBhZnRlciB0aGUgcGFnZSBpcyBsb2FkZWQsIGFuZCBX ZWJQYWdlUHJveHkgd2lsbCB1cGRhdGUgaXRzCisgICAgICAgIF9uZXR3b3JrUmVxdWVzdHNJblBy b2dyZXNzIHN0YXRlIHdoaWNoIHdpbGwgbm90aWZ5IHRoZSBjbGllbnQgdGhlcmUgaXMgbmV0d29y ayBhY3R2aXR5IG9uLWdvaW5nLiBTaW5jZSB3ZSBkb24ndCBob2xkCisgICAgICAgIHRoZSBiYWNr Z3JvdW5kIGFjdGl2aXR5IHRva2VuIGFmdGVyIHBhZ2UgaXMgbG9hZGVkLCB0aGUgV2ViQ29udGVu dCBwcm9jZXNzIGNvdWxkIGJlY29tZSBzdXNwZW5kZWQgd2l0aG91dCBub3RpZnlpbmcgdGhlIGNs aWVudAorICAgICAgICBhbmQgdGhlIGNsaWVudCB3aWxsIGxvc2UgdHJhY2sgb2YgdGhlIGxvYWRp bmcgc3RhdGUuCisKKyAgICAgICAgVGhlIGZpcnN0IHRob3VnaHQgd2FzIHRvIGhvbGQgYW5vdGhl ciBiYWNrZ3JvdW5kIGFjdGl2aXR5IHdoZW4gX25ldHdvcmtSZXF1ZXN0c0luUHJvZ3Jlc3MgZmxh ZyBpcyBzZXQgaW4gTmF2aWdhdGlvblN0YXRlLgorICAgICAgICBIb3dldmVyLCB0aGlzIGNvdWxk IHJlc3VsdCBpbiBzaWRlLWVmZmVjdCB0aGF0IGEgV2ViQ29udGVudCBwcm9jZXNzIGNhbiBzdGF5 IGFjdGl2ZSBmb3IgdG9vIGxvbmcgaWYgdGhlcmUgaXMgYSBsb25nIGxhc3RpbmcKKyAgICAgICAg WEhSIHJlc3F1ZXN0LgorICAgICAgICAKKyAgICAgICAgVGhpcyBwYXRjaCBmaXggdGhpcyBieSBu b3RpZnlpbmcgdGhlIGNsaWVudCB0aGF0IG5ldHdvcmsgYWN0aXZpdHkgaXMgc3RvcHBlZCB3aGVu IFdlYkNvbnRlbnQgcHJvY2VzcyBpcyBnb2luZyB0byBiZSBzdXNwZW5kZWQuCisgICAgICAgIFdl IGFsc28gY2FjaGUgdGhlIG5ldHdvcmtSZXF1ZXN0c0luUHJvZ3Jlc3Mgc3RhdGUgZm9yIHN1c3Bl bmRlZCBwcm9jZXNzLCBzbyB0aGF0IHdoZW4gaXQgYmVjb21lcyBmb3JlZ3JvdW5kLCB3ZSBjYW4g dGVsbAorICAgICAgICB0aGUgY2xpZW50IHRoZSBjb3JyZWN0IHN0YXRlIG9mIG5ldHdvcmsgYWN0 aXZpdHkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpXZWJQYWdlUHJveHkpOiBJbml0aWFsaXplIG1faGFzTmV0d29ya1JlcXVlc3RzT25TdXNw ZW5kZWQuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cHJvY2Vzc1dpbGxCZWNvbWVT dXNwZW5kZWQpOiBJZiB0aGVyZSBpcyBwZW5kaW5nIHJlcXVlc3RzIG9uIHN1c3BlbmQsIGNhY2hl IHRoZSBuZXR3b3JrIGFjdGl2aXR5IHN0YXRlCisgICAgICAgICAgICBhbmQgbm90aWZ5IHRoZSBj bGllbnQuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cHJvY2Vzc1dpbGxCZWNvbWVG b3Jncm91bmQpOiBSZXN0b3JlIHRoZSBuZXR3b3JrIGFjdGl2aXR5IHN0YXRlIHdoZW4gdGhlIHBy b2Nlc3MgYmVjb21lcyBmb3JlZ3JvdW5kLiAKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpyZXNldFN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6IEFkZCBh IGRhdGEgbWVtYmVyIG1faGFzTmV0d29ya1JlcXVlc3RzT25TdXNwZW5kZWQgdG8gY2FjaGUgdGhl IG5ldHdvcmsgYWN0aXZpdHkgc3RhdGUgb24gcHJvY2VzcworICAgICAgICAgICAgc3VzcGVuZC4K KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzc1Byb3h5OjpkaWRTZXRBc3NlcnRpb25TdGF0ZSk6CisKIDIwMTUtMDYtMjkg IFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IHRo ZSBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXgg OTgzNTkwNS4uYWRlOGYwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKQEAgLTMwMyw2ICszMDMsNyBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdl Q2xpZW50JiBwYWdlQ2xpZW50LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVpbgogICAgICwg bV9keW5hbWljVmlld3BvcnRTaXplVXBkYXRlV2FpdGluZ0ZvckxheWVyVHJlZUNvbW1pdChmYWxz ZSkKICAgICAsIG1fZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZUxheWVyVHJlZVRyYW5zYWN0aW9u SUQoMCkKICAgICAsIG1fbGF5ZXJUcmVlVHJhbnNhY3Rpb25JZEF0TGFzdFRvdWNoU3RhcnQoMCkK KyAgICAsIG1faGFzTmV0d29ya1JlcXVlc3RzT25TdXNwZW5kZWQoZmFsc2UpCiAjZW5kaWYKICAg ICAsIG1fZ2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXIoKnRoaXMpCiAgICAgLCBt X25vdGlmaWNhdGlvblBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcigqdGhpcykKQEAgLTQ4MjksNiAr NDgzMCwyNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vzc0RpZENyYXNoKCkKICAgICAgICAg bV9sb2FkZXJDbGllbnQtPnByb2Nlc3NEaWRDcmFzaCgqdGhpcyk7CiB9CiAKKyNpZiBQTEFURk9S TShJT1MpCit2b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vzc1dpbGxCZWNvbWVTdXNwZW5kZWQoKQor eworICAgIEFTU0VSVChtX2lzVmFsaWQpOworCisgICAgbV9oYXNOZXR3b3JrUmVxdWVzdHNPblN1 c3BlbmRlZCA9IG1fcGFnZUxvYWRTdGF0ZS5uZXR3b3JrUmVxdWVzdHNJblByb2dyZXNzKCk7Cisg ICAgaWYgKG1faGFzTmV0d29ya1JlcXVlc3RzT25TdXNwZW5kZWQpCisgICAgICAgIHNldE5ldHdv cmtSZXF1ZXN0c0luUHJvZ3Jlc3MoZmFsc2UpOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6cHJv Y2Vzc1dpbGxCZWNvbWVGb3Jncm91bmQoKQoreworICAgIEFTU0VSVChtX2lzVmFsaWQpOworCisg ICAgaWYgKG1faGFzTmV0d29ya1JlcXVlc3RzT25TdXNwZW5kZWQpIHsKKyAgICAgICAgc2V0TmV0 d29ya1JlcXVlc3RzSW5Qcm9ncmVzcyh0cnVlKTsKKyAgICAgICAgbV9oYXNOZXR3b3JrUmVxdWVz dHNPblN1c3BlbmRlZCA9IGZhbHNlOworICAgIH0KK30KKyNlbmRpZgorCiB2b2lkIFdlYlBhZ2VQ cm94eTo6cmVzZXRTdGF0ZShSZXNldFN0YXRlUmVhc29uIHJlc2V0U3RhdGVSZWFzb24pCiB7CiAg ICAgbV9tYWluRnJhbWUgPSBudWxscHRyOwpAQCAtNDg5OCw2ICs0OTIwLDcgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OnJlc2V0U3RhdGUoUmVzZXRTdGF0ZVJlYXNvbiByZXNldFN0YXRlUmVhc29uKQog ICAgIG1fZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZVdhaXRpbmdGb3JMYXllclRyZWVDb21taXQg PSBmYWxzZTsKICAgICBtX2R5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGVMYXllclRyZWVUcmFuc2Fj dGlvbklEID0gMDsKICAgICBtX2xheWVyVHJlZVRyYW5zYWN0aW9uSWRBdExhc3RUb3VjaFN0YXJ0 ID0gMDsKKyAgICBtX2hhc05ldHdvcmtSZXF1ZXN0c09uU3VzcGVuZGVkID0gZmFsc2U7CiAjZW5k aWYKIAogI2lmIEVOQUJMRShXSVJFTEVTU19QTEFZQkFDS19UQVJHRVQpICYmICFQTEFURk9STShJ T1MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5kZXggMDI2YTUyMC4u ZmExZmZjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtODE2 LDYgKzgxNiwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBpbnRlcmFjdGlvbk9jY3VycmVkV2hpbGVQ cm9jZXNzVW5yZXNwb25zaXZlKCk7CiAgICAgdm9pZCBwcm9jZXNzRGlkQmVjb21lUmVzcG9uc2l2 ZSgpOwogICAgIHZvaWQgcHJvY2Vzc0RpZENyYXNoKCk7CisjaWYgUExBVEZPUk0oSU9TKQorICAg IHZvaWQgcHJvY2Vzc1dpbGxCZWNvbWVTdXNwZW5kZWQoKTsKKyAgICB2b2lkIHByb2Nlc3NXaWxs QmVjb21lRm9yZ3JvdW5kKCk7CisjZW5kaWYKIAogICAgIHZpcnR1YWwgdm9pZCBlbnRlckFjY2Vs ZXJhdGVkQ29tcG9zaXRpbmdNb2RlKGNvbnN0IExheWVyVHJlZUNvbnRleHQmKTsKICAgICB2aXJ0 dWFsIHZvaWQgZXhpdEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCk7CkBAIC0xNTMyLDYgKzE1 MzYsNyBAQCBwcml2YXRlOgogICAgIHVpbnQ2NF90IG1fZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0 ZUxheWVyVHJlZVRyYW5zYWN0aW9uSUQ7CiAgICAgdWludDY0X3QgbV9sYXllclRyZWVUcmFuc2Fj dGlvbklkQXRMYXN0VG91Y2hTdGFydDsKICAgICB1aW50NjRfdCBtX2N1cnJlbnREeW5hbWljVmll d3BvcnRTaXplVXBkYXRlSUQgeyAwIH07CisgICAgYm9vbCBtX2hhc05ldHdvcmtSZXF1ZXN0c09u U3VzcGVuZGVkOwogI2VuZGlmCiAKICNpZiBFTkFCTEUoVklCUkFUSU9OKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBmZTRmODgwLi45OGE4Yzg0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcApAQCAt OTIxLDYgKzkyMSw4IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRTZXRBc3NlcnRpb25TdGF0 ZShBc3NlcnRpb25TdGF0ZSBzdGF0ZSkKICAgICBjYXNlIEFzc2VydGlvblN0YXRlOjpTdXNwZW5k ZWQ6CiAgICAgICAgIG1fZm9yZWdyb3VuZFRva2VuRm9yTmV0d29ya1Byb2Nlc3MgPSBudWxscHRy OwogICAgICAgICBtX2JhY2tncm91bmRUb2tlbkZvck5ldHdvcmtQcm9jZXNzID0gbnVsbHB0cjsK KyAgICAgICAgZm9yIChhdXRvJiBwYWdlIDogbV9wYWdlTWFwLnZhbHVlcygpKQorICAgICAgICAg ICAgcGFnZS0+cHJvY2Vzc1dpbGxCZWNvbWVTdXNwZW5kZWQoKTsKICAgICAgICAgYnJlYWs7CiAK ICAgICBjYXNlIEFzc2VydGlvblN0YXRlOjpCYWNrZ3JvdW5kOgpAQCAtOTMzLDYgKzkzNSw4IEBA IHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRTZXRBc3NlcnRpb25TdGF0ZShBc3NlcnRpb25TdGF0 ZSBzdGF0ZSkKICAgICAgICAgaWYgKHByb2Nlc3NQb29sKCkudXNlc05ldHdvcmtQcm9jZXNzKCkp CiAgICAgICAgICAgICBtX2ZvcmVncm91bmRUb2tlbkZvck5ldHdvcmtQcm9jZXNzID0gcHJvY2Vz c1Bvb2woKS5lbnN1cmVOZXR3b3JrUHJvY2VzcygpLnRocm90dGxlcigpLmZvcmVncm91bmRBY3Rp dml0eVRva2VuKCk7CiAgICAgICAgIG1fYmFja2dyb3VuZFRva2VuRm9yTmV0d29ya1Byb2Nlc3Mg PSBudWxscHRyOworICAgICAgICBmb3IgKGF1dG8mIHBhZ2UgOiBtX3BhZ2VNYXAudmFsdWVzKCkp CisgICAgICAgICAgICBwYWdlLT5wcm9jZXNzV2lsbEJlY29tZUZvcmdyb3VuZCgpOwogICAgICAg ICBicmVhazsKICAgICB9CiAjZWxzZQo= 255956 2015-07-01 15:22:25 -0700 2015-07-01 16:18:56 -0700 Patch for landing. update_network_state_on_suspend.patch text/plain 6569 yongjun_zhang Y29tbWl0IGUwYzUxN2I5NDEwYThkNmRkNjI1MDc2YjA2Y2EwOWU1MTI0OWQwYWYKQXV0aG9yOiBZ b25nanVuIFpoYW5nIDx5b25nanVuX3poYW5nQGFwcGxlLmNvbT4KRGF0ZTogICBNb24gSnVuIDI5 IDExOjQ1OjE4IDIwMTUgLTA3MDAKCiAgICBXZWIgcGFnZSBkb2Vzbid0IHVwZGF0ZSBpdHMgbG9h ZGluZyBzdGF0ZSB3aGVuIHdlYiBwcm9jZXNzIGJlY29tZXMgc3VzcGVuZGVkIGlmIHRoZXJlIGFy ZSBwZW5kaW5nIG5ldHdvcmsgcmVxdWVzdHMgKFhIUikuCiAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2NDM5CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDc3NjQwY2IuLmFlM2Fl MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxNS0wNi0yOSAgWW9uZ2p1biBaaGFu ZyAgPHlvbmdqdW5femhhbmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBwYWdlIGRvZXNuJ3Qg dXBkYXRlIGl0cyBsb2FkaW5nIHN0YXRlIHdoZW4gd2ViIHByb2Nlc3MgYmVjb21lcyBzdXNwZW5k ZWQgaWYgdGhlcmUgYXJlIHBlbmRpbmcgbmV0d29yayByZXF1ZXN0cyAoWEhSKS4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjQzOQorCisgICAgICAg IFdoZW4gd2ViIHBhZ2UgaXMgbG9hZGluZywgd2UgaG9sZCBhIGJhY2tncm91bmQgYWN0aXZpdHkg dG9rZW4gaW4gTmF2aWdhdGlvblN0YXRlIGFuZCB3ZSByZWxlYXNlIHRoZSB0b2tlbiB3aGVuIHRo ZSBwYWdlIGRvbmUKKyAgICAgICAgbG9hZGluZy4gQSB3ZWIgcGFnZSBjYW4gc3RhcnQgbG9hZGlu ZyBzdWJyZXNvdXJjZXMgKGxpa2UgWEhSKSBhZnRlciB0aGUgcGFnZSBpcyBsb2FkZWQsIGFuZCBX ZWJQYWdlUHJveHkgd2lsbCB1cGRhdGUgaXRzCisgICAgICAgIF9uZXR3b3JrUmVxdWVzdHNJblBy b2dyZXNzIHN0YXRlIHdoaWNoIHdpbGwgbm90aWZ5IHRoZSBjbGllbnQgdGhlcmUgaXMgbmV0d29y ayBhY3R2aXR5IG9uLWdvaW5nLiBTaW5jZSB3ZSBkb24ndCBob2xkCisgICAgICAgIHRoZSBiYWNr Z3JvdW5kIGFjdGl2aXR5IHRva2VuIGFmdGVyIHBhZ2UgaXMgbG9hZGVkLCB0aGUgV2ViQ29udGVu dCBwcm9jZXNzIGNvdWxkIGJlY29tZSBzdXNwZW5kZWQgd2l0aG91dCBub3RpZnlpbmcgdGhlIGNs aWVudAorICAgICAgICBhbmQgdGhlIGNsaWVudCB3aWxsIGxvc2UgdHJhY2sgb2YgdGhlIGxvYWRp bmcgc3RhdGUuCisKKyAgICAgICAgVGhlIGZpcnN0IHRob3VnaHQgd2FzIHRvIGhvbGQgYW5vdGhl ciBiYWNrZ3JvdW5kIGFjdGl2aXR5IHdoZW4gX25ldHdvcmtSZXF1ZXN0c0luUHJvZ3Jlc3MgZmxh ZyBpcyBzZXQgaW4gTmF2aWdhdGlvblN0YXRlLgorICAgICAgICBIb3dldmVyLCB0aGlzIGNvdWxk IHJlc3VsdCBpbiBzaWRlLWVmZmVjdCB0aGF0IGEgV2ViQ29udGVudCBwcm9jZXNzIGNhbiBzdGF5 IGFjdGl2ZSBmb3IgdG9vIGxvbmcgaWYgdGhlcmUgaXMgYSBsb25nIGxhc3RpbmcKKyAgICAgICAg WEhSIHJlc3F1ZXN0LgorICAgICAgICAKKyAgICAgICAgVGhpcyBwYXRjaCBmaXggdGhpcyBieSBu b3RpZnlpbmcgdGhlIGNsaWVudCB0aGF0IG5ldHdvcmsgYWN0aXZpdHkgaXMgc3RvcHBlZCB3aGVu IFdlYkNvbnRlbnQgcHJvY2VzcyBpcyBnb2luZyB0byBiZSBzdXNwZW5kZWQuCisgICAgICAgIFdl IGFsc28gY2FjaGUgdGhlIG5ldHdvcmtSZXF1ZXN0c0luUHJvZ3Jlc3Mgc3RhdGUgZm9yIHN1c3Bl bmRlZCBwcm9jZXNzLCBzbyB0aGF0IHdoZW4gaXQgYmVjb21lcyBmb3JlZ3JvdW5kLCB3ZSBjYW4g dGVsbAorICAgICAgICB0aGUgY2xpZW50IHRoZSBjb3JyZWN0IHN0YXRlIG9mIG5ldHdvcmsgYWN0 aXZpdHkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KKworICAgICAgICAq IFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OldlYlBhZ2VQcm94eSk6IEluaXRpYWxpemUgbV9oYXNOZXR3b3JrUmVxdWVzdHNPblN1c3Bl bmRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpwcm9jZXNzV2lsbEJlY29tZVN1 c3BlbmRlZCk6IElmIHRoZXJlIGlzIHBlbmRpbmcgcmVxdWVzdHMgb24gc3VzcGVuZCwgY2FjaGUg dGhlIG5ldHdvcmsgYWN0aXZpdHkgc3RhdGUKKyAgICAgICAgICAgIGFuZCBub3RpZnkgdGhlIGNs aWVudC4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpwcm9jZXNzV2lsbEJlY29tZUZv cmdyb3VuZCk6IFJlc3RvcmUgdGhlIG5ldHdvcmsgYWN0aXZpdHkgc3RhdGUgd2hlbiB0aGUgcHJv Y2VzcyBiZWNvbWVzIGZvcmVncm91bmQuIAorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OnJlc2V0U3RhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDogQWRkIGEg ZGF0YSBtZW1iZXIgbV9oYXNOZXR3b3JrUmVxdWVzdHNPblN1c3BlbmRlZCB0byBjYWNoZSB0aGUg bmV0d29yayBhY3Rpdml0eSBzdGF0ZSBvbiBwcm9jZXNzCisgICAgICAgICAgICBzdXNwZW5kLgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJQcm9jZXNzUHJveHk6OmRpZFNldEFzc2VydGlvblN0YXRlKToKKwogMjAxNS0wNy0wMSAg QmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CiAKICAgICAgICAgVGhpcyBpcyBhIHF1aWNr IGZvbGxvdy1vbiB0byBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC8xODYxMzIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggYTBjNzgzMy4uYmQx M2EzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTMw Myw2ICszMDMsNyBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdlQ2xpZW50JiBwYWdl Q2xpZW50LCBXZWJQcm9jZXNzUHJveHkmIHByb2Nlc3MsIHVpbgogICAgICwgbV9keW5hbWljVmll d3BvcnRTaXplVXBkYXRlV2FpdGluZ0ZvckxheWVyVHJlZUNvbW1pdChmYWxzZSkKICAgICAsIG1f ZHluYW1pY1ZpZXdwb3J0U2l6ZVVwZGF0ZUxheWVyVHJlZVRyYW5zYWN0aW9uSUQoMCkKICAgICAs IG1fbGF5ZXJUcmVlVHJhbnNhY3Rpb25JZEF0TGFzdFRvdWNoU3RhcnQoMCkKKyAgICAsIG1faGFz TmV0d29ya1JlcXVlc3RzT25TdXNwZW5kZWQoZmFsc2UpCiAjZW5kaWYKICAgICAsIG1fZ2VvbG9j YXRpb25QZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXIoKnRoaXMpCiAgICAgLCBtX25vdGlmaWNhdGlv blBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcigqdGhpcykKQEAgLTQ4MzQsNiArNDgzNSwyNyBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vzc0RpZENyYXNoKCkKICAgICAgICAgbV9sb2FkZXJDbGll bnQtPnByb2Nlc3NEaWRDcmFzaCgqdGhpcyk7CiB9CiAKKyNpZiBQTEFURk9STShJT1MpCit2b2lk IFdlYlBhZ2VQcm94eTo6cHJvY2Vzc1dpbGxCZWNvbWVTdXNwZW5kZWQoKQoreworICAgIEFTU0VS VChtX2lzVmFsaWQpOworCisgICAgbV9oYXNOZXR3b3JrUmVxdWVzdHNPblN1c3BlbmRlZCA9IG1f cGFnZUxvYWRTdGF0ZS5uZXR3b3JrUmVxdWVzdHNJblByb2dyZXNzKCk7CisgICAgaWYgKG1faGFz TmV0d29ya1JlcXVlc3RzT25TdXNwZW5kZWQpCisgICAgICAgIHNldE5ldHdvcmtSZXF1ZXN0c0lu UHJvZ3Jlc3MoZmFsc2UpOworfQorCit2b2lkIFdlYlBhZ2VQcm94eTo6cHJvY2Vzc1dpbGxCZWNv bWVGb3JlZ3JvdW5kKCkKK3sKKyAgICBBU1NFUlQobV9pc1ZhbGlkKTsKKworICAgIGlmIChtX2hh c05ldHdvcmtSZXF1ZXN0c09uU3VzcGVuZGVkKSB7CisgICAgICAgIHNldE5ldHdvcmtSZXF1ZXN0 c0luUHJvZ3Jlc3ModHJ1ZSk7CisgICAgICAgIG1faGFzTmV0d29ya1JlcXVlc3RzT25TdXNwZW5k ZWQgPSBmYWxzZTsKKyAgICB9Cit9CisjZW5kaWYKKwogdm9pZCBXZWJQYWdlUHJveHk6OnJlc2V0 U3RhdGUoUmVzZXRTdGF0ZVJlYXNvbiByZXNldFN0YXRlUmVhc29uKQogewogICAgIG1fbWFpbkZy YW1lID0gbnVsbHB0cjsKQEAgLTQ5MDMsNiArNDkyNSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpy ZXNldFN0YXRlKFJlc2V0U3RhdGVSZWFzb24gcmVzZXRTdGF0ZVJlYXNvbikKICAgICBtX2R5bmFt aWNWaWV3cG9ydFNpemVVcGRhdGVXYWl0aW5nRm9yTGF5ZXJUcmVlQ29tbWl0ID0gZmFsc2U7CiAg ICAgbV9keW5hbWljVmlld3BvcnRTaXplVXBkYXRlTGF5ZXJUcmVlVHJhbnNhY3Rpb25JRCA9IDA7 CiAgICAgbV9sYXllclRyZWVUcmFuc2FjdGlvbklkQXRMYXN0VG91Y2hTdGFydCA9IDA7CisgICAg bV9oYXNOZXR3b3JrUmVxdWVzdHNPblN1c3BlbmRlZCA9IGZhbHNlOwogI2VuZGlmCiAKICNpZiBF TkFCTEUoV0lSRUxFU1NfUExBWUJBQ0tfVEFSR0VUKSAmJiAhUExBVEZPUk0oSU9TKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDU1YjYwYjkuLjA3NmZkZmYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTgxNiw2ICs4MTYsMTAg QEAgcHVibGljOgogICAgIHZvaWQgaW50ZXJhY3Rpb25PY2N1cnJlZFdoaWxlUHJvY2Vzc1VucmVz cG9uc2l2ZSgpOwogICAgIHZvaWQgcHJvY2Vzc0RpZEJlY29tZVJlc3BvbnNpdmUoKTsKICAgICB2 b2lkIHByb2Nlc3NEaWRDcmFzaCgpOworI2lmIFBMQVRGT1JNKElPUykKKyAgICB2b2lkIHByb2Nl c3NXaWxsQmVjb21lU3VzcGVuZGVkKCk7CisgICAgdm9pZCBwcm9jZXNzV2lsbEJlY29tZUZvcmVn cm91bmQoKTsKKyNlbmRpZgogCiAgICAgdmlydHVhbCB2b2lkIGVudGVyQWNjZWxlcmF0ZWRDb21w b3NpdGluZ01vZGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYpOwogICAgIHZpcnR1YWwgdm9pZCBl eGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKTsKQEAgLTE1MzIsNiArMTUzNiw3IEBAIHBy aXZhdGU6CiAgICAgdWludDY0X3QgbV9keW5hbWljVmlld3BvcnRTaXplVXBkYXRlTGF5ZXJUcmVl VHJhbnNhY3Rpb25JRDsKICAgICB1aW50NjRfdCBtX2xheWVyVHJlZVRyYW5zYWN0aW9uSWRBdExh c3RUb3VjaFN0YXJ0OwogICAgIHVpbnQ2NF90IG1fY3VycmVudER5bmFtaWNWaWV3cG9ydFNpemVV cGRhdGVJRCB7IDAgfTsKKyAgICBib29sIG1faGFzTmV0d29ya1JlcXVlc3RzT25TdXNwZW5kZWQ7 CiAjZW5kaWYKIAogI2lmIEVOQUJMRShWSUJSQVRJT04pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4IGZlNGY4ODAuLjBmYjBiMDMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCkBAIC05MjEsNiArOTIx LDggQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6OmRpZFNldEFzc2VydGlvblN0YXRlKEFzc2VydGlv blN0YXRlIHN0YXRlKQogICAgIGNhc2UgQXNzZXJ0aW9uU3RhdGU6OlN1c3BlbmRlZDoKICAgICAg ICAgbV9mb3JlZ3JvdW5kVG9rZW5Gb3JOZXR3b3JrUHJvY2VzcyA9IG51bGxwdHI7CiAgICAgICAg IG1fYmFja2dyb3VuZFRva2VuRm9yTmV0d29ya1Byb2Nlc3MgPSBudWxscHRyOworICAgICAgICBm b3IgKGF1dG8mIHBhZ2UgOiBtX3BhZ2VNYXAudmFsdWVzKCkpCisgICAgICAgICAgICBwYWdlLT5w cm9jZXNzV2lsbEJlY29tZVN1c3BlbmRlZCgpOwogICAgICAgICBicmVhazsKIAogICAgIGNhc2Ug QXNzZXJ0aW9uU3RhdGU6OkJhY2tncm91bmQ6CkBAIC05MzMsNiArOTM1LDggQEAgdm9pZCBXZWJQ cm9jZXNzUHJveHk6OmRpZFNldEFzc2VydGlvblN0YXRlKEFzc2VydGlvblN0YXRlIHN0YXRlKQog ICAgICAgICBpZiAocHJvY2Vzc1Bvb2woKS51c2VzTmV0d29ya1Byb2Nlc3MoKSkKICAgICAgICAg ICAgIG1fZm9yZWdyb3VuZFRva2VuRm9yTmV0d29ya1Byb2Nlc3MgPSBwcm9jZXNzUG9vbCgpLmVu c3VyZU5ldHdvcmtQcm9jZXNzKCkudGhyb3R0bGVyKCkuZm9yZWdyb3VuZEFjdGl2aXR5VG9rZW4o KTsKICAgICAgICAgbV9iYWNrZ3JvdW5kVG9rZW5Gb3JOZXR3b3JrUHJvY2VzcyA9IG51bGxwdHI7 CisgICAgICAgIGZvciAoYXV0byYgcGFnZSA6IG1fcGFnZU1hcC52YWx1ZXMoKSkKKyAgICAgICAg ICAgIHBhZ2UtPnByb2Nlc3NXaWxsQmVjb21lRm9yZWdyb3VuZCgpOwogICAgICAgICBicmVhazsK ICAgICB9CiAjZWxzZQo=