153919 2016-02-05 09:25:57 -0800 tests fail if display sleeps while run-webkit-tests is running 2017-02-14 16:13:11 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Mac All RESOLVED FIXED P2 Normal --- 1 darin aakash_jain aakash_jain ap commit-queue jbedard lforschler simon.fraser oldest_to_newest 1162403 0 darin 2016-02-05 09:25:57 -0800 For a while I’ve been suffering a problem where I see tests fail if the display sleeps while run-webkit-tests runs. While I don’t understand the underlying cause, I see a really simple way to work around this by invoking the OS X command line tool named caffeinate. 1162404 1 darin 2016-02-05 09:26:56 -0800 This is a practical problem for me because my home iMac is in a public place where I don’t want the distracting light when I’m not using it, so display sleep is set super-fast, 1 minute I think. 1162405 2 darin 2016-02-05 09:27:51 -0800 Ideally we’d fix the tests so they don’t fail when the display is asleep but I don’t have the slightest idea why they fail so it’s much more practical to do the workaround. Testing it now to be sure it actually works. 1162406 3 ap 2016-02-05 09:29:15 -0800 We can easily prevent display sleep from LayoutTestHelper as well. Is preventing display sleep during layout tests an acceptable behavior for you? 1162411 4 darin 2016-02-05 09:37:16 -0800 Yes, it would be better then the failing tests. Most of the time my computer is not running tests. And then perhaps some day we could figure out how to run tests while the display is asleep. 1162412 5 ap 2016-02-05 09:40:59 -0800 Yes, agreed. I think that using IOPMAssertionCreateWithDescription would probably be more robust that using caffeinate. 1162416 6 darin 2016-02-05 09:44:58 -0800 I’m not sure what you mean by "robust" but I really don’t prefer one over the other. Just want to make sure that wherever we put the code we explain why we are doing it. Despite the fact that this is assigned to me, if someone else wants to tackle it, please feel free to grab the bug. I have a patch to address this, but currently it’s wrong and I don’t know when I will have time to make it right. 1162425 7 aakash_jain 2016-02-05 10:31:59 -0800 I'll work on it. 1162540 8 ap 2016-02-05 17:00:09 -0800 > I’m not sure what you mean by "robust" If we were to spawn the caffeinate process, we would at least need to add it to Tools/BuildSlaveSupport/kill-old-processes, and might need special handling elsewhere. The reason is that when buildbot kills run-webkit-tests, that doesn't happen very cleanly. I'm not sure if that's an issue with buildbot, with our scripts, or even with process group leader support in Darwin. By adding this functionality to LayoutTestHelper, we avoid creating new special cases. 1162559 9 270785 aakash_jain 2016-02-05 19:02:47 -0800 Created attachment 270785 Proposed patch 1162575 10 270785 commit-queue 2016-02-05 23:01:00 -0800 Comment on attachment 270785 Proposed patch Clearing flags on attachment: 270785 Committed r196212: <http://trac.webkit.org/changeset/196212> 1162576 11 commit-queue 2016-02-05 23:01:02 -0800 All reviewed patches have been landed. Closing bug. 1162612 12 darin 2016-02-06 08:23:32 -0800 Thanks. I’ll give this a try and see if it solves my problem at home. 1197075 13 darin 2016-05-27 08:30:00 -0700 I have been having the same old problem even with this code checked in. But when I instead do "caffeinate run-webkit-tests" from the command line, it solves the problem just as it always did. Maybe LayoutTestHelper is used only for WebKit 1 testing? 1197076 14 darin 2016-05-27 08:30:35 -0700 I’m going to reopen this bug because the problem is not fixed. 1197230 15 aakash_jain 2016-05-27 15:02:52 -0700 I am not able to reproduce it. I tried running run-webkit-tests both for wk1 and wk2 (on mac). In another terminal window I did "pmset -g assertions .” to check the flags and in both cases I found that LayoutTestHelper is correctly setting the flags. [buildbot]$ pmset -g assertions . | grep -i webkit pid 90229(LayoutTestHelper): [0x000a751700058f5b] 00:00:01 PreventUserIdleDisplaySleep named: "WebKit LayoutTestHelper" Details: WebKit layout-test helper tool is preventing sleep. 1197246 16 darin 2016-05-27 15:33:35 -0700 To test this, did you set a Mac’s Energy Saver setting to turn the display off after 1 minute? We can see from our first unsuccessful attempt that it’s hard to know if we fixed this by just looking at the flag; we’ll need to test our solution by actually reproducing the problem I was seeing. In my testing run-webkit-tests with caffeinate works, and without caffeinate hundreds of tests fail. I am not disputing that the tool sets that flag on your computer. Maybe the flag isn’t set successfully on my computer (I will check tonight)? Maybe we need one of these other flags too? PreventSystemSleep PreventUserIdleSystemSleep 1197250 17 aakash_jain 2016-05-27 15:48:27 -0700 ok. I was trying on a lab's bot machine. I will try it on my local machine by configuring the Mac’s Energy Saver setting and checking tests results. 1197339 18 aakash_jain 2016-05-28 00:04:51 -0700 I am trying to reproduce this on my laptop, but not able to reproduce it yet. In both wk1 and wk2, I notice that "PreventUserIdleDisplaySleep" flag is being set properly by "WebKit LayoutTestHelper". Also my laptop's display doesn't turn off while tests are running. If I stop the tests, my laptop display turns off after a minute or two. I will debug it further. Meanwhile it would be great if you can check if the flag is being set on your computer or not. 1197341 19 aakash_jain 2016-05-28 00:28:26 -0700 I checked caffeinate, it sets another flag "PreventUserIdleSystemSleep" (same as the one you mentioned above), while we were setting "PreventUserIdleDisplaySleep" flag. Since caffeinate works for you, setting this flag should also work. I'll upload a patch soon for you to try. 1197343 20 280028 aakash_jain 2016-05-28 00:38:01 -0700 Created attachment 280028 Proposed patch Please give it a try. 1197387 21 280028 darin 2016-05-28 09:56:30 -0700 Comment on attachment 280028 Proposed patch I think we want to prevent both, right? Well I will try this as you posted it. 1197397 22 280028 darin 2016-05-28 10:52:49 -0700 Comment on attachment 280028 Proposed patch This patch didn’t work. The tests all still timed out. 1197398 23 darin 2016-05-28 10:54:54 -0700 Sorry, I meant to say "many tests timed out". Not all. New info coming soon. 1197400 24 darin 2016-05-28 10:55:44 -0700 There may have been something wrong with my experiment. I will try again. 1197402 25 280028 darin 2016-05-28 11:05:51 -0700 Comment on attachment 280028 Proposed patch My mistake. This seems to be working fine. 1197405 26 280028 commit-queue 2016-05-28 11:26:40 -0700 Comment on attachment 280028 Proposed patch Clearing flags on attachment: 280028 Committed r201489: <http://trac.webkit.org/changeset/201489> 1197406 27 commit-queue 2016-05-28 11:26:44 -0700 All reviewed patches have been landed. Closing bug. 1197500 28 darin 2016-05-29 10:54:23 -0700 Sorry for the mixed message. Many tests are still timing out. This is still not fixed. 1197510 29 aakash_jain 2016-05-29 12:32:02 -0700 Is the display getting turned off or not? Is the behavior different than when executed with caffeinate? 1197803 30 darin 2016-05-31 09:46:13 -0700 I think the display does get turned off. And I don’t think caffeinate solves the problem either. I don’t think we are going to get this problem solved indirectly with me repeatedly testing different changes. I think the person who wants to this needs to reproduce the problem. I’ll be happy to test once we have a fix that works for someone else who has reproduced it and sees it fixed. 1197829 31 aakash_jain 2016-05-31 10:55:38 -0700 ok. I was assuming that caffeinate solves the problem properly, so I was just trying to replicate the behavior. I will reproduce it properly and fix the underlying cause. I am at a conference currently, but should be able to work on it soon. 1199489 32 darin 2016-06-05 21:06:28 -0700 OK, I just tried this experiment: % caffeinate -dis run-webkit-tests When I did that, all the tests passed. 1199559 33 darin 2016-06-06 08:40:59 -0700 This also worked: % caffeinate -di run-webkit-tests Next time I will try just "caffeinate -d". 1199625 34 aakash_jain 2016-06-06 11:00:21 -0700 That indicates that we need both the flags "PreventUserIdleSystemSleep" and "PreventUserIdleDisplaySleep". "-d" flag sets PreventUserIdleDisplaySleep, "-i" flag sets PreventUserIdleSystemSleep. I think running "caffeinate -d", should be equivalent to running just "caffeinate", which you have already tried. I am trying to reproduce the issue today to confirm it. Sorry for the delay, I was out last week. 1199639 35 darin 2016-06-06 11:25:30 -0700 I’ll keep trying different combinations. 1199853 36 280663 aakash_jain 2016-06-06 19:50:48 -0700 Created attachment 280663 Updated patch We need both the flags (to make sure that neither display nor system goes to sleep). I was able to reproduce the issue. Settings these flags fixed the issue for me. This is equivalent of "caffeinate -di". Can you please try the patch? 1200492 37 280663 ap 2016-06-08 10:38:31 -0700 Comment on attachment 280663 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=280663&action=review r=me, definitely worth landing since you confirmed that this fixes the problem for you. > Tools/DumpRenderTree/mac/LayoutTestHelper.m:199 > -static void releaseDisplaySleepAssertion() > +static void releaseSleepAssertion() Since there are two assertions here, the function name should be releaseSleepAssertions. > Tools/DumpRenderTree/mac/LayoutTestHelper.m:245 > -void addDisplaySleepAssertion() > +void addSleepAssertion() Ditto. 1200512 38 280817 aakash_jain 2016-06-08 11:37:27 -0700 Created attachment 280817 Updated patch Incorporated above review comments. 1200534 39 280817 commit-queue 2016-06-08 12:16:24 -0700 Comment on attachment 280817 Updated patch Clearing flags on attachment: 280817 Committed r201821: <http://trac.webkit.org/changeset/201821> 1200535 40 commit-queue 2016-06-08 12:16:29 -0700 All reviewed patches have been landed. Closing bug. 270785 2016-02-05 19:02:47 -0800 2016-02-05 23:01:00 -0800 Proposed patch patch_DisplaySleepAssertion text/plain 2922 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5NjIwOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDE2LTAyLTA1ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICB0ZXN0cyBmYWlsIGlmIGRpc3BsYXkgc2xlZXBzIHdoaWxlIHJ1bi13ZWJr aXQtdGVzdHMgaXMgcnVubmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTUzOTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdEhlbHBlci5tOgorICAg ICAgICAoYWRkRGlzcGxheVNsZWVwQXNzZXJ0aW9uKTogQWRkIHRoZSBhc3NlcnRpb24gc28gdGhh dCB0aGUgZGlzcGxheSBkb2Vzbid0IHR1cm4gb2ZmLgorICAgICAgICAocmVsZWFzZURpc3BsYXlT bGVlcEFzc2VydGlvbik6IFJlbGVhc2UgdGhlIERpc3BsYXlTbGVlcCBBc3NlcnRpb24uCisgICAg ICAgIChzaW1wbGVTaWduYWxIYW5kbGVyKTogUmVsZWFzZSB0aGUgRGlzcGxheVNsZWVwQXNzZXJ0 aW9uIGluIGNhc2Ugb2YgYW55IGl0ZXJydXB0LgorCiAyMDE2LTAyLTA1ICBBbGV4IENocmlzdGVu c2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IGlPUyBBUEkgdGVz dHMgYWZ0ZXIgcjE5NjA4MgpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRl c3RIZWxwZXIubQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0 VGVzdEhlbHBlci5tCShyZXZpc2lvbiAxOTYyMDkpCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS9t YWMvTGF5b3V0VGVzdEhlbHBlci5tCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAK ICNpbXBvcnQgPEFwcEtpdC9BcHBLaXQuaD4KICNpbXBvcnQgPEFwcGxpY2F0aW9uU2VydmljZXMv QXBwbGljYXRpb25TZXJ2aWNlcy5oPgorI2ltcG9ydCA8SU9LaXQvcHdyX21ndC9JT1BNTGliLmg+ CiAjaW1wb3J0IDxnZXRvcHQuaD4KICNpbXBvcnQgPHNpZ25hbC5oPgogI2ltcG9ydCA8c3RkaW8u aD4KQEAgLTQ0LDYgKzQ1LDcgQEAKIC8vIHJ1bm5pbmcgbGF5b3V0IHRlc3RzLgogCiBzdGF0aWMg aW50IGluc3RhbGxDb2xvclByb2ZpbGUgPSBmYWxzZTsKK3N0YXRpYyB1aW50MzJfdCBhc3NlcnRp b25JRCA9IDA7CiAKIHN0YXRpYyBOU011dGFibGVEaWN0aW9uYXJ5ICpvcmlnaW5hbENvbG9yUHJv ZmlsZVVSTHMoKQogewpAQCAtMTkxLDEwICsxOTMsMTYgQEAgc3RhdGljIHZvaWQgcmVzdG9yZVVz ZXJDb2xvclByb2ZpbGUodm9pZAogICAgIHJlc3RvcmVEaXNwbGF5Q29sb3JQcm9maWxlcyhkaXNw bGF5cyk7CiB9CiAKK3N0YXRpYyB2b2lkIHJlbGVhc2VEaXNwbGF5U2xlZXBBc3NlcnRpb24oKQor eworICAgIElPUE1Bc3NlcnRpb25SZWxlYXNlKGFzc2VydGlvbklEKTsKK30KKwogc3RhdGljIHZv aWQgc2ltcGxlU2lnbmFsSGFuZGxlcihpbnQgc2lnKQogewogICAgIC8vIFRyeSB0byByZXN0b3Jl IHRoZSBjb2xvciBwcm9maWxlIGFuZCB0cnkgdG8gZ28gZG93biBjbGVhbmx5CiAgICAgcmVzdG9y ZVVzZXJDb2xvclByb2ZpbGUoKTsKKyAgICByZWxlYXNlRGlzcGxheVNsZWVwQXNzZXJ0aW9uKCk7 CiAgICAgZXhpdCgxMjggKyBzaWcpOwogfQogCkBAIC0yMzAsNiArMjM4LDE0IEBAIHZvaWQgbG9j a0Rvd25EaXNjcmV0ZUdyYXBoaWNzKCkKICAgICAgICAgTlNMb2coQCJJT09iamVjdFJlbGVhc2Uo KSBmYWlsZWQgaW4gJXMgd2l0aCBrZXJuUmVzdWx0ID0gJWQiLCBfX0ZVTkNUSU9OX18sIGtlcm5S ZXN1bHQpOwogfQogCit2b2lkIGFkZERpc3BsYXlTbGVlcEFzc2VydGlvbigpIAoreworICAgIENG U3RyaW5nUmVmIGFzc2VydGlvbk5hbWUgPSBDRlNUUigiV2ViS2l0IExheW91dFRlc3RIZWxwZXIi KTsKKyAgICBDRlN0cmluZ1JlZiBhc3NlcnRpb25EZXRhaWxzID0gQ0ZTVFIoIldlYktpdCBsYXlv dXQtdGVzdCBoZWxwZXIgdG9vbCBpcyBwcmV2ZW50aW5nIHNsZWVwLiIpOworICAgIElPUE1Bc3Nl cnRpb25DcmVhdGVXaXRoRGVzY3JpcHRpb24oa0lPUE1Bc3NlcnRpb25UeXBlUHJldmVudFVzZXJJ ZGxlRGlzcGxheVNsZWVwLAorICAgICAgICBhc3NlcnRpb25OYW1lLCBhc3NlcnRpb25EZXRhaWxz LCBhc3NlcnRpb25EZXRhaWxzLCBOVUxMLCAwLCBOVUxMLCAmYXNzZXJ0aW9uSUQpOworfQorCiBp bnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogewogICAgIHN0cnVjdCBvcHRpb24gb3B0 aW9uc1tdID0gewpAQCAtMjUxLDYgKzI2Nyw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBh cmd2W10pCiAgICAgc2lnbmFsKFNJR0hVUCwgc2ltcGxlU2lnbmFsSGFuZGxlcik7CiAgICAgc2ln bmFsKFNJR1RFUk0sIHNpbXBsZVNpZ25hbEhhbmRsZXIpOwogCisgICAgYWRkRGlzcGxheVNsZWVw QXNzZXJ0aW9uKCk7CiAgICAgbG9ja0Rvd25EaXNjcmV0ZUdyYXBoaWNzKCk7CiAKICAgICAvLyBT YXZlIG9mZiB0aGUgY3VycmVudCBwcm9maWxlLCBhbmQgdGhlbiBpbnN0YWxsIHRoZSBsYXlvdXQg dGVzdCBwcm9maWxlLgpAQCAtMjY1LDYgKzI4Miw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFy KiBhcmd2W10pCiAKICAgICAvLyBSZXN0b3JlIHRoZSBwcm9maWxlCiAgICAgcmVzdG9yZVVzZXJD b2xvclByb2ZpbGUoKTsKKyAgICByZWxlYXNlRGlzcGxheVNsZWVwQXNzZXJ0aW9uKCk7CiAKICAg ICByZXR1cm4gMDsKIH0K 280028 2016-05-28 00:38:01 -0700 2016-05-28 11:26:40 -0700 Proposed patch patch_display_sleep text/plain 1431 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIwMTQ4MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE2LTA1LTI4ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICB0ZXN0cyBmYWlsIGlmIGRpc3BsYXkgc2xlZXBzIHdoaWxlIHJ1bi13ZWJr aXQtdGVzdHMgaXMgcnVubmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTUzOTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdEhlbHBlci5tOgorICAg ICAgICAoYWRkRGlzcGxheVNsZWVwQXNzZXJ0aW9uKTogVXNlIFByZXZlbnRVc2VySWRsZVN5c3Rl bVNsZWVwIGZsYWcsIHNhbWUgYXMgc2V0IGJ5IGNhZmZlaW5hdGUgdG9vbC4KKwogMjAxNi0wNS0y NyAgU3Jpbml2YXNhbiBWaWpheWFyYWdoYXZhbiAgPHN2aWpheWFyYWdoYXZhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgRGlzcGxheSBmYWlsaW5nIEpTQyBzdHJlc3MgdGVzdHMgaW4gYnVpbGRib3Qg ZGFzaGJvYXJkCkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdEhlbHBl ci5tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0SGVs cGVyLm0JKHJldmlzaW9uIDIwMTQ4MCkKKysrIFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9MYXlv dXRUZXN0SGVscGVyLm0JKHdvcmtpbmcgY29weSkKQEAgLTI0NCw3ICsyNDQsNyBAQCB2b2lkIGFk ZERpc3BsYXlTbGVlcEFzc2VydGlvbigpIAogewogICAgIENGU3RyaW5nUmVmIGFzc2VydGlvbk5h bWUgPSBDRlNUUigiV2ViS2l0IExheW91dFRlc3RIZWxwZXIiKTsKICAgICBDRlN0cmluZ1JlZiBh c3NlcnRpb25EZXRhaWxzID0gQ0ZTVFIoIldlYktpdCBsYXlvdXQtdGVzdCBoZWxwZXIgdG9vbCBp cyBwcmV2ZW50aW5nIHNsZWVwLiIpOwotICAgIElPUE1Bc3NlcnRpb25DcmVhdGVXaXRoRGVzY3Jp cHRpb24oa0lPUE1Bc3NlcnRpb25UeXBlUHJldmVudFVzZXJJZGxlRGlzcGxheVNsZWVwLAorICAg IElPUE1Bc3NlcnRpb25DcmVhdGVXaXRoRGVzY3JpcHRpb24oa0lPUE1Bc3NlcnRpb25UeXBlUHJl dmVudFVzZXJJZGxlU3lzdGVtU2xlZXAsCiAgICAgICAgIGFzc2VydGlvbk5hbWUsIGFzc2VydGlv bkRldGFpbHMsIGFzc2VydGlvbkRldGFpbHMsIE5VTEwsIDAsIE5VTEwsICZhc3NlcnRpb25JRCk7 CiB9CiAK 280663 2016-06-06 19:50:48 -0700 2016-06-08 11:37:27 -0700 Updated patch patch_display_sleep1 text/plain 3359 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIwMTczNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE2LTA2LTA2ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICB0ZXN0cyBmYWlsIGlmIGRpc3BsYXkgc2xlZXBzIHdoaWxlIHJ1bi13ZWJr aXQtdGVzdHMgaXMgcnVubmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTUzOTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdEhlbHBlci5tOgorICAg ICAgICAocmVsZWFzZVNsZWVwQXNzZXJ0aW9uKTogUmVsZWFzZSBib3RoIERpc3BsYXkgc2xlZXAg YW5kIFN5c3RlbSBzbGVlcCBhc3NlcnRpb25zLgorICAgICAgICAoYWRkU2xlZXBBc3NlcnRpb24p OiBBZGQgc2xlZXAgYXNzZXJ0aW9uIGZvciBib3RoIERpc3BsYXkgc2xlZXAgYW5kIFN5c3RlbSBz bGVlcC4KKwogMjAxNi0wNi0wNiAgQ2FybG9zIEFsYmVydG8gTG9wZXogUGVyZXogIDxjbG9wZXpA aWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyMDE0NDkpIFtHVEtdIEFSTXY3IGJ1 aWxkIGZhaWxzIHdpdGggbGliaWN1ZGF0YS5zby41NTogY2Fubm90IG9wZW4gc2hhcmVkIG9iamVj dCBmaWxlIG9uIGd0a2RvYy1zY2FuZ29iaiBzdGVwLgpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRy ZWUvbWFjL0xheW91dFRlc3RIZWxwZXIubQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVy VHJlZS9tYWMvTGF5b3V0VGVzdEhlbHBlci5tCShyZXZpc2lvbiAyMDE3MzQpCisrKyBUb29scy9E dW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdEhlbHBlci5tCSh3b3JraW5nIGNvcHkpCkBAIC00 Nyw3ICs0Nyw4IEBACiAvLyBydW5uaW5nIGxheW91dCB0ZXN0cy4KIAogc3RhdGljIGludCBpbnN0 YWxsQ29sb3JQcm9maWxlID0gZmFsc2U7Ci1zdGF0aWMgdWludDMyX3QgYXNzZXJ0aW9uSUQgPSAw Oworc3RhdGljIHVpbnQzMl90IGFzc2VydGlvbklERm9yRGlzcGxheVNsZWVwID0gMDsKK3N0YXRp YyB1aW50MzJfdCBhc3NlcnRpb25JREZvclN5c3RlbVNsZWVwID0gMDsKIAogc3RhdGljIE5TTXV0 YWJsZURpY3Rpb25hcnkgKm9yaWdpbmFsQ29sb3JQcm9maWxlVVJMcygpCiB7CkBAIC0xOTUsMTYg KzE5NiwxNyBAQCBzdGF0aWMgdm9pZCByZXN0b3JlVXNlckNvbG9yUHJvZmlsZSh2b2lkCiAgICAg cmVzdG9yZURpc3BsYXlDb2xvclByb2ZpbGVzKGRpc3BsYXlzKTsKIH0KIAotc3RhdGljIHZvaWQg cmVsZWFzZURpc3BsYXlTbGVlcEFzc2VydGlvbigpCitzdGF0aWMgdm9pZCByZWxlYXNlU2xlZXBB c3NlcnRpb24oKQogewotICAgIElPUE1Bc3NlcnRpb25SZWxlYXNlKGFzc2VydGlvbklEKTsKKyAg ICBJT1BNQXNzZXJ0aW9uUmVsZWFzZShhc3NlcnRpb25JREZvckRpc3BsYXlTbGVlcCk7CisgICAg SU9QTUFzc2VydGlvblJlbGVhc2UoYXNzZXJ0aW9uSURGb3JTeXN0ZW1TbGVlcCk7CiB9CiAKIHN0 YXRpYyB2b2lkIHNpbXBsZVNpZ25hbEhhbmRsZXIoaW50IHNpZykKIHsKICAgICAvLyBUcnkgdG8g cmVzdG9yZSB0aGUgY29sb3IgcHJvZmlsZSBhbmQgdHJ5IHRvIGdvIGRvd24gY2xlYW5seQogICAg IHJlc3RvcmVVc2VyQ29sb3JQcm9maWxlKCk7Ci0gICAgcmVsZWFzZURpc3BsYXlTbGVlcEFzc2Vy dGlvbigpOworICAgIHJlbGVhc2VTbGVlcEFzc2VydGlvbigpOwogICAgIGV4aXQoMTI4ICsgc2ln KTsKIH0KIApAQCAtMjQwLDEyICsyNDIsMTQgQEAgdm9pZCBsb2NrRG93bkRpc2NyZXRlR3JhcGhp Y3MoKQogICAgICAgICBOU0xvZyhAIklPT2JqZWN0UmVsZWFzZSgpIGZhaWxlZCBpbiAlcyB3aXRo IGtlcm5SZXN1bHQgPSAlZCIsIF9fRlVOQ1RJT05fXywga2VyblJlc3VsdCk7CiB9CiAKLXZvaWQg YWRkRGlzcGxheVNsZWVwQXNzZXJ0aW9uKCkgCit2b2lkIGFkZFNsZWVwQXNzZXJ0aW9uKCkgCiB7 CiAgICAgQ0ZTdHJpbmdSZWYgYXNzZXJ0aW9uTmFtZSA9IENGU1RSKCJXZWJLaXQgTGF5b3V0VGVz dEhlbHBlciIpOwogICAgIENGU3RyaW5nUmVmIGFzc2VydGlvbkRldGFpbHMgPSBDRlNUUigiV2Vi S2l0IGxheW91dC10ZXN0IGhlbHBlciB0b29sIGlzIHByZXZlbnRpbmcgc2xlZXAuIik7CisgICAg SU9QTUFzc2VydGlvbkNyZWF0ZVdpdGhEZXNjcmlwdGlvbihrSU9QTUFzc2VydGlvblR5cGVQcmV2 ZW50VXNlcklkbGVEaXNwbGF5U2xlZXAsCisgICAgICAgIGFzc2VydGlvbk5hbWUsIGFzc2VydGlv bkRldGFpbHMsIGFzc2VydGlvbkRldGFpbHMsIE5VTEwsIDAsIE5VTEwsICZhc3NlcnRpb25JREZv ckRpc3BsYXlTbGVlcCk7CiAgICAgSU9QTUFzc2VydGlvbkNyZWF0ZVdpdGhEZXNjcmlwdGlvbihr SU9QTUFzc2VydGlvblR5cGVQcmV2ZW50VXNlcklkbGVTeXN0ZW1TbGVlcCwKLSAgICAgICAgYXNz ZXJ0aW9uTmFtZSwgYXNzZXJ0aW9uRGV0YWlscywgYXNzZXJ0aW9uRGV0YWlscywgTlVMTCwgMCwg TlVMTCwgJmFzc2VydGlvbklEKTsKKyAgICAgICAgYXNzZXJ0aW9uTmFtZSwgYXNzZXJ0aW9uRGV0 YWlscywgYXNzZXJ0aW9uRGV0YWlscywgTlVMTCwgMCwgTlVMTCwgJmFzc2VydGlvbklERm9yU3lz dGVtU2xlZXApOwogfQogCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQpAQCAtMjY5 LDcgKzI3Myw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAgc2lnbmFs KFNJR0hVUCwgc2ltcGxlU2lnbmFsSGFuZGxlcik7CiAgICAgc2lnbmFsKFNJR1RFUk0sIHNpbXBs ZVNpZ25hbEhhbmRsZXIpOwogCi0gICAgYWRkRGlzcGxheVNsZWVwQXNzZXJ0aW9uKCk7CisgICAg YWRkU2xlZXBBc3NlcnRpb24oKTsKICAgICBsb2NrRG93bkRpc2NyZXRlR3JhcGhpY3MoKTsKIAog ICAgIC8vIFNhdmUgb2ZmIHRoZSBjdXJyZW50IHByb2ZpbGUsIGFuZCB0aGVuIGluc3RhbGwgdGhl IGxheW91dCB0ZXN0IHByb2ZpbGUuCkBAIC0yODQsNyArMjg4LDcgQEAgaW50IG1haW4oaW50IGFy Z2MsIGNoYXIqIGFyZ3ZbXSkKIAogICAgIC8vIFJlc3RvcmUgdGhlIHByb2ZpbGUKICAgICByZXN0 b3JlVXNlckNvbG9yUHJvZmlsZSgpOwotICAgIHJlbGVhc2VEaXNwbGF5U2xlZXBBc3NlcnRpb24o KTsKKyAgICByZWxlYXNlU2xlZXBBc3NlcnRpb24oKTsKIAogICAgIHJldHVybiAwOwogfQo= 280817 2016-06-08 11:37:27 -0700 2016-06-08 12:16:24 -0700 Updated patch patch_display_sleep2 text/plain 3265 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIwMTgxNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE2LTA2LTA4ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICB0ZXN0cyBmYWlsIGlmIGRpc3BsYXkgc2xlZXBzIHdoaWxlIHJ1bi13ZWJr aXQtdGVzdHMgaXMgcnVubmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTUzOTE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5 YWtvdi4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0SGVscGVyLm06 CisgICAgICAgIChyZWxlYXNlU2xlZXBBc3NlcnRpb25zKTogUmVsZWFzZSBib3RoIERpc3BsYXkg c2xlZXAgYW5kIFN5c3RlbSBzbGVlcCBhc3NlcnRpb25zLgorICAgICAgICAoYWRkU2xlZXBBc3Nl cnRpb25zKTogQWRkIHNsZWVwIGFzc2VydGlvbiBmb3IgYm90aCBEaXNwbGF5IHNsZWVwIGFuZCBT eXN0ZW0gc2xlZXAuCisKIDIwMTYtMDYtMDcgIEx1Y2FzIEZvcnNjaGxlciAgPGxmb3JzY2hsZXJA YXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNjY4NTc4Mj4KSW5kZXg6IFRv b2xzL0R1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0SGVscGVyLm0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RIZWxwZXIubQkocmV2aXNpb24gMjAx ODEyKQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RIZWxwZXIubQkod29y a2luZyBjb3B5KQpAQCAtNDcsNyArNDcsOCBAQAogLy8gcnVubmluZyBsYXlvdXQgdGVzdHMuCiAK IHN0YXRpYyBpbnQgaW5zdGFsbENvbG9yUHJvZmlsZSA9IGZhbHNlOwotc3RhdGljIHVpbnQzMl90 IGFzc2VydGlvbklEID0gMDsKK3N0YXRpYyB1aW50MzJfdCBhc3NlcnRpb25JREZvckRpc3BsYXlT bGVlcCA9IDA7CitzdGF0aWMgdWludDMyX3QgYXNzZXJ0aW9uSURGb3JTeXN0ZW1TbGVlcCA9IDA7 CiAKIHN0YXRpYyBOU011dGFibGVEaWN0aW9uYXJ5ICpvcmlnaW5hbENvbG9yUHJvZmlsZVVSTHMo KQogewpAQCAtMTk1LDE2ICsxOTYsMTcgQEAgc3RhdGljIHZvaWQgcmVzdG9yZVVzZXJDb2xvclBy b2ZpbGUodm9pZAogICAgIHJlc3RvcmVEaXNwbGF5Q29sb3JQcm9maWxlcyhkaXNwbGF5cyk7CiB9 CiAKLXN0YXRpYyB2b2lkIHJlbGVhc2VEaXNwbGF5U2xlZXBBc3NlcnRpb24oKQorc3RhdGljIHZv aWQgcmVsZWFzZVNsZWVwQXNzZXJ0aW9ucygpCiB7Ci0gICAgSU9QTUFzc2VydGlvblJlbGVhc2Uo YXNzZXJ0aW9uSUQpOworICAgIElPUE1Bc3NlcnRpb25SZWxlYXNlKGFzc2VydGlvbklERm9yRGlz cGxheVNsZWVwKTsKKyAgICBJT1BNQXNzZXJ0aW9uUmVsZWFzZShhc3NlcnRpb25JREZvclN5c3Rl bVNsZWVwKTsKIH0KIAogc3RhdGljIHZvaWQgc2ltcGxlU2lnbmFsSGFuZGxlcihpbnQgc2lnKQog ewogICAgIC8vIFRyeSB0byByZXN0b3JlIHRoZSBjb2xvciBwcm9maWxlIGFuZCB0cnkgdG8gZ28g ZG93biBjbGVhbmx5CiAgICAgcmVzdG9yZVVzZXJDb2xvclByb2ZpbGUoKTsKLSAgICByZWxlYXNl RGlzcGxheVNsZWVwQXNzZXJ0aW9uKCk7CisgICAgcmVsZWFzZVNsZWVwQXNzZXJ0aW9ucygpOwog ICAgIGV4aXQoMTI4ICsgc2lnKTsKIH0KIApAQCAtMjQwLDEyICsyNDIsMTQgQEAgdm9pZCBsb2Nr RG93bkRpc2NyZXRlR3JhcGhpY3MoKQogICAgICAgICBOU0xvZyhAIklPT2JqZWN0UmVsZWFzZSgp IGZhaWxlZCBpbiAlcyB3aXRoIGtlcm5SZXN1bHQgPSAlZCIsIF9fRlVOQ1RJT05fXywga2VyblJl c3VsdCk7CiB9CiAKLXZvaWQgYWRkRGlzcGxheVNsZWVwQXNzZXJ0aW9uKCkgCit2b2lkIGFkZFNs ZWVwQXNzZXJ0aW9ucygpCiB7CiAgICAgQ0ZTdHJpbmdSZWYgYXNzZXJ0aW9uTmFtZSA9IENGU1RS KCJXZWJLaXQgTGF5b3V0VGVzdEhlbHBlciIpOwogICAgIENGU3RyaW5nUmVmIGFzc2VydGlvbkRl dGFpbHMgPSBDRlNUUigiV2ViS2l0IGxheW91dC10ZXN0IGhlbHBlciB0b29sIGlzIHByZXZlbnRp bmcgc2xlZXAuIik7CisgICAgSU9QTUFzc2VydGlvbkNyZWF0ZVdpdGhEZXNjcmlwdGlvbihrSU9Q TUFzc2VydGlvblR5cGVQcmV2ZW50VXNlcklkbGVEaXNwbGF5U2xlZXAsCisgICAgICAgIGFzc2Vy dGlvbk5hbWUsIGFzc2VydGlvbkRldGFpbHMsIGFzc2VydGlvbkRldGFpbHMsIE5VTEwsIDAsIE5V TEwsICZhc3NlcnRpb25JREZvckRpc3BsYXlTbGVlcCk7CiAgICAgSU9QTUFzc2VydGlvbkNyZWF0 ZVdpdGhEZXNjcmlwdGlvbihrSU9QTUFzc2VydGlvblR5cGVQcmV2ZW50VXNlcklkbGVTeXN0ZW1T bGVlcCwKLSAgICAgICAgYXNzZXJ0aW9uTmFtZSwgYXNzZXJ0aW9uRGV0YWlscywgYXNzZXJ0aW9u RGV0YWlscywgTlVMTCwgMCwgTlVMTCwgJmFzc2VydGlvbklEKTsKKyAgICAgICAgYXNzZXJ0aW9u TmFtZSwgYXNzZXJ0aW9uRGV0YWlscywgYXNzZXJ0aW9uRGV0YWlscywgTlVMTCwgMCwgTlVMTCwg JmFzc2VydGlvbklERm9yU3lzdGVtU2xlZXApOwogfQogCiBpbnQgbWFpbihpbnQgYXJnYywgY2hh ciogYXJndltdKQpAQCAtMjY5LDcgKzI3Myw3IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBh cmd2W10pCiAgICAgc2lnbmFsKFNJR0hVUCwgc2ltcGxlU2lnbmFsSGFuZGxlcik7CiAgICAgc2ln bmFsKFNJR1RFUk0sIHNpbXBsZVNpZ25hbEhhbmRsZXIpOwogCi0gICAgYWRkRGlzcGxheVNsZWVw QXNzZXJ0aW9uKCk7CisgICAgYWRkU2xlZXBBc3NlcnRpb25zKCk7CiAgICAgbG9ja0Rvd25EaXNj cmV0ZUdyYXBoaWNzKCk7CiAKICAgICAvLyBTYXZlIG9mZiB0aGUgY3VycmVudCBwcm9maWxlLCBh bmQgdGhlbiBpbnN0YWxsIHRoZSBsYXlvdXQgdGVzdCBwcm9maWxlLgpAQCAtMjg0LDcgKzI4OCw3 IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAKICAgICAvLyBSZXN0b3JlIHRo ZSBwcm9maWxlCiAgICAgcmVzdG9yZVVzZXJDb2xvclByb2ZpbGUoKTsKLSAgICByZWxlYXNlRGlz cGxheVNsZWVwQXNzZXJ0aW9uKCk7CisgICAgcmVsZWFzZVNsZWVwQXNzZXJ0aW9ucygpOwogCiAg ICAgcmV0dXJuIDA7CiB9Cg==