Commit Graph

982 Commits

Author SHA1 Message Date
Martin Liu ff1290ee03 [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe am: 62f4f4262e am: 8087e1104c -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 3185c2d096 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: Iea4f1212460c052817dbfdeba770fc2d60dd3c7a
2020-06-02 21:23:15 +00:00
Martin Liu a8465ae999 [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe -s ours am: 08d786c5bd -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 dfc73bc2fe is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: I01c65d9d30e12efd461b7dba263dc4194924c611
2020-06-02 21:12:09 +00:00
Martin Liu f9db70b71b [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe am: 62f4f4262e -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 3185c2d096 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: Ib5b7c1a7267883095bba6f2f5dae064037b4f962
2020-06-02 21:11:19 +00:00
Martin Liu 8087e1104c lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe am: 62f4f4262e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: I3213442a2628581dedb0ccf753c70643d55acce0
2020-06-02 21:11:17 +00:00
Martin Liu f6dc513ad7 lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: I4fc231e488289620dd00a37d1f19de9460a15af8
2020-06-02 21:01:39 +00:00
Martin Liu 08d786c5bd [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 3185c2d096 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: Ied978dbd309a8876ed7a090120927b6818a70b80
2020-06-02 20:55:41 +00:00
Martin Liu 62f4f4262e lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: Iee2254c3047d939a82bbaf7de9e350ea1df4ea20
2020-06-02 20:55:29 +00:00
Martin Liu 8c1d793f38 lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: 3185c2d096 am: ff6ad5cd06 am: 3a2aeaba0e am: 6f4f82ffef am: 57974b3394
Original change: undetermined

Change-Id: I4e3eaa73a8ae26c337692d4a02d048bc84e5616b
2020-06-02 18:22:01 +00:00
Martin Liu 57974b3394 lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: 3185c2d096 am: ff6ad5cd06 am: 3a2aeaba0e am: 6f4f82ffef
Original change: undetermined

Change-Id: I50f3861733a5e0386c460eac46f8c20ca653d35d
2020-06-02 18:06:32 +00:00
Martin Liu 6f4f82ffef lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: 3185c2d096 am: ff6ad5cd06 am: 3a2aeaba0e
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1321895

Change-Id: I7349628a326f0f8e6672462e604c0bf3e81c496c
2020-06-02 17:52:48 +00:00
Martin Liu 3a2aeaba0e lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: 3185c2d096 am: ff6ad5cd06
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1321895

Change-Id: I1533fc059bb1683e5bf9441a7b30e5e24e6f1f83
2020-06-02 17:27:00 +00:00
Martin Liu ff6ad5cd06 lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: 3185c2d096
Original change: undetermined

Change-Id: I1cb82bf5ff5da1dd29876354a54b2dd963088b37
2020-06-02 17:09:23 +00:00
Martin Liu dfc73bc2fe lmkd: Fix do not kill perceptible apps due to low swap if above min wmark
Fix code logic to obey our intetion of not killing perceptible apps
due to low swap if above min wmark.

Bug: 155709603
Test: boot
Signed-off-by: Martin Liu <liumartin@google.com>
Merged-In: Ifc09c2a1fe7e21faa096988f471644f63951d81c
Change-Id: Ifc09c2a1fe7e21faa096988f471644f63951d81c
2020-06-02 23:47:01 +08:00
Martin Liu 3185c2d096 lmkd: Fix do not kill perceptible apps due to low swap if above min wmark
Fix code logic to obey our intetion of not killing perceptible apps
due to low swap if above min wmark.

Bug: 155709603
Test: boot
Signed-off-by: Martin Liu <liumartin@google.com>
Merged-In: Ifc09c2a1fe7e21faa096988f471644f63951d81c
Change-Id: Ifc09c2a1fe7e21faa096988f471644f63951d81c
2020-06-02 23:43:49 +08:00
Automerger Merge Worker 1fcf17fdbc Merge "[automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 -s ours am: 5b4b3716e4 -s ours" into rvc-d1-dev-plus-aosp am: 3e6ee0722c -s ours am: 49260e5a62 -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 7afa463978 is in history

Change-Id: I1b005fde459a343c969687d362762552df01a0a4
2020-05-21 01:13:57 +00:00
Automerger Merge Worker e673628202 Merge "[automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a am: 0a55215fbe -s ours" into rvc-qpr-dev-plus-aosp am: f2ed66473c -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 7afa463978 is in history

Change-Id: I6d2dad57529d372a44f458dd943dd92a79f6ca71
2020-05-21 01:13:18 +00:00
Suren Baghdasaryan 12a610746a [automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a -s ours am: 4afbef0f6c -s ours am: 7ebdd10ae6 -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 48135c4cba is in history

Change-Id: I0d08e176645605fdbd67a957f46c0ca09782cf88
2020-05-21 01:12:46 +00:00
Automerger Merge Worker 49260e5a62 Merge "[automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 -s ours am: 5b4b3716e4 -s ours" into rvc-d1-dev-plus-aosp am: 3e6ee0722c -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 7afa463978 is in history

Change-Id: Ic3a7b5b625680827593e81ff0971141f697f42a1
2020-05-21 00:46:28 +00:00
Automerger Merge Worker f2ed66473c Merge "[automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a am: 0a55215fbe -s ours" into rvc-qpr-dev-plus-aosp 2020-05-21 00:46:14 +00:00
Suren Baghdasaryan 008e891d43 [automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a am: 0a55215fbe -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 48135c4cba is in history

Change-Id: I4dfc6fb05c99c903dbf0a303e6c146289f9530b9
2020-05-21 00:46:06 +00:00
Suren Baghdasaryan 7ebdd10ae6 [automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a -s ours am: 4afbef0f6c -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 48135c4cba is in history

Change-Id: Ibee74a42a7d9b5be5f288ba627f0914b21afe420
2020-05-21 00:46:03 +00:00
Automerger Merge Worker 3e6ee0722c Merge "[automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 -s ours am: 5b4b3716e4 -s ours" into rvc-d1-dev-plus-aosp 2020-05-21 00:36:14 +00:00
Suren Baghdasaryan c08f3f09b7 [automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 -s ours am: 5b4b3716e4 -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 48135c4cba is in history

Change-Id: I991c035d1cf12e59b5975450b399a85d0af239ab
2020-05-21 00:36:10 +00:00
Suren Baghdasaryan 4afbef0f6c [automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 48135c4cba is in history

Change-Id: I742875df19599c98274531e9d986f3a827529da5
2020-05-21 00:36:08 +00:00
Suren Baghdasaryan 0a55215fbe lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a
Change-Id: I546012e24b96df68eb303e3c940d2b8fc596c62b
2020-05-21 00:35:46 +00:00
Suren Baghdasaryan b286ce5376 lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978
Change-Id: I871c772f96666925014c61649c1d7a529cae9028
2020-05-21 00:10:05 +00:00
Suren Baghdasaryan 747c846a5a lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978
Change-Id: Ib75f23cdd2fc21a32c8e2f6c303ad59ca531b026
2020-05-21 00:09:51 +00:00
Suren Baghdasaryan 5b4b3716e4 [automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 48135c4cba is in history

Change-Id: Ia2bbfb9829b21d0214279edc7c245b5437d31593
2020-05-21 00:09:43 +00:00
Suren Baghdasaryan c21b5cca26 lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 48135c4cba am: d6d8a3dc55 am: c9e47704a9 am: 5d843e85e4 am: 442b9d0f39
Change-Id: I3bd2b0c20ee9251eac8e1d48c4b20a84f85a3461
2020-05-20 22:16:44 +00:00
Suren Baghdasaryan e194c4504a [automerger skipped] lmkd: Set the default free swap threshold to 10% for all devices am: fb1f592602 am: 5132481e15 -s ours am: 16657a940d -s ours am: 7263dd1a1c -s ours am: 1907d65f3a -s ours
am skip reason: Change-Id I443486763c034ed0603ea52b81c060c3969af9a5 with SHA-1 c2b228e498 is in history

Change-Id: Ic82d75428cc38eb863e8b2b15ea5d4f1c23674aa
2020-05-20 22:16:43 +00:00
Suren Baghdasaryan cfb366e404 [automerger skipped] lmkd: Fix min_score_adj to exclude killing foreground processes am: 5c039b53d8 am: d9ba0c99ae -s ours am: e58fd35c27 -s ours am: 6e7368e80c -s ours am: 70b93485e3 -s ours
am skip reason: Change-Id If187654b8001ce843ec6085ccd2042d75a986dae with SHA-1 0e589f61ba is in history

Change-Id: Ic874f8294af7d6dab1fb3beabf12a387303f0787
2020-05-20 22:16:41 +00:00
Suren Baghdasaryan 442b9d0f39 lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 48135c4cba am: d6d8a3dc55 am: c9e47704a9 am: 5d843e85e4
Change-Id: Iee45beb3b537d8485a387946d6f66ec34750fdfa
2020-05-20 21:54:49 +00:00
Suren Baghdasaryan 1907d65f3a [automerger skipped] lmkd: Set the default free swap threshold to 10% for all devices am: fb1f592602 am: 5132481e15 -s ours am: 16657a940d -s ours am: 7263dd1a1c -s ours
am skip reason: Change-Id I443486763c034ed0603ea52b81c060c3969af9a5 with SHA-1 c2b228e498 is in history

Change-Id: I094b6de4d5d04b24e7ae6c8a6ee6fca511fe15a7
2020-05-20 21:54:48 +00:00
Suren Baghdasaryan 70b93485e3 [automerger skipped] lmkd: Fix min_score_adj to exclude killing foreground processes am: 5c039b53d8 am: d9ba0c99ae -s ours am: e58fd35c27 -s ours am: 6e7368e80c -s ours
am skip reason: Change-Id If187654b8001ce843ec6085ccd2042d75a986dae with SHA-1 0e589f61ba is in history

Change-Id: I75e2dbd29d1854038c930e6692edc7d95e8149ec
2020-05-20 21:54:46 +00:00
Suren Baghdasaryan 5d843e85e4 lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 48135c4cba am: d6d8a3dc55 am: c9e47704a9
Change-Id: Ie06f0ad716299660380a13fedfc878194afcc32f
2020-05-20 21:38:13 +00:00
Suren Baghdasaryan 7263dd1a1c [automerger skipped] lmkd: Set the default free swap threshold to 10% for all devices am: fb1f592602 am: 5132481e15 -s ours am: 16657a940d -s ours
am skip reason: Change-Id I443486763c034ed0603ea52b81c060c3969af9a5 with SHA-1 c2b228e498 is in history

Change-Id: I16423e56f3e6fb693b5fa285b03a94763fe90990
2020-05-20 21:38:13 +00:00
Suren Baghdasaryan 6e7368e80c [automerger skipped] lmkd: Fix min_score_adj to exclude killing foreground processes am: 5c039b53d8 am: d9ba0c99ae -s ours am: e58fd35c27 -s ours
am skip reason: Change-Id If187654b8001ce843ec6085ccd2042d75a986dae with SHA-1 0e589f61ba is in history

Change-Id: I465380f7a63d085ab082582d6a0cf2a3a2527e77
2020-05-20 21:38:12 +00:00
Suren Baghdasaryan c9e47704a9 lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 48135c4cba am: d6d8a3dc55
Change-Id: I8d6a9376c361279c9833b19afdaac5a83d8a9f2a
2020-05-20 21:25:29 +00:00
Suren Baghdasaryan 16657a940d [automerger skipped] lmkd: Set the default free swap threshold to 10% for all devices am: fb1f592602 am: 5132481e15 -s ours
am skip reason: Change-Id I443486763c034ed0603ea52b81c060c3969af9a5 with SHA-1 c2b228e498 is in history

Change-Id: I320b9b413fddfcc2ddd5dfbe2a3683dc5e5abae9
2020-05-20 21:25:27 +00:00
Suren Baghdasaryan e58fd35c27 [automerger skipped] lmkd: Fix min_score_adj to exclude killing foreground processes am: 5c039b53d8 am: d9ba0c99ae -s ours
am skip reason: Change-Id If187654b8001ce843ec6085ccd2042d75a986dae with SHA-1 0e589f61ba is in history

Change-Id: I007c16b6a8bc5de7a906b8ab4424d42212f5b3ce
2020-05-20 21:25:25 +00:00
Suren Baghdasaryan d6d8a3dc55 lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 48135c4cba
Change-Id: I3ba7b9a0cab86a185cfc3c6d9f23d5ad677a0251
2020-05-20 20:59:14 +00:00
Suren Baghdasaryan 5132481e15 lmkd: Set the default free swap threshold to 10% for all devices am: fb1f592602
Change-Id: I52ada975e99ccf8d26091afbc8953ee40c491fd5
2020-05-20 20:59:13 +00:00
Suren Baghdasaryan d9ba0c99ae lmkd: Fix min_score_adj to exclude killing foreground processes am: 5c039b53d8
Change-Id: Iebe3f5c02c882cc47e5fb25cd14bff4ee9667482
2020-05-20 20:59:11 +00:00
Suren Baghdasaryan 7afa463978 lmkd: Do not kill perceptible apps due to low swap if above min wmark
Prevent kills of perceptible apps due to swap shortages unless system
free memory is below the min watermark. This prevents kills of important
apps when the system is recovering from the memory pressure.

Bug: 155709603
Test: memory stress test with multiple foreground apps
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Merged-In: I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1
Change-Id: I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1
2020-05-20 20:48:06 +00:00
Suren Baghdasaryan a911264fb8 lmkd: Set the default free swap threshold to 10% for all devices am: c2b228e498 am: deee65f222 am: 181ec2d13d am: b2dabba6a7
Change-Id: Iac1b3677b5b0bf12233abc7ed4b80569155d2c8b
2020-05-20 19:51:54 +00:00
Suren Baghdasaryan a5800bf298 lmkd: Fix min_score_adj to exclude killing foreground processes am: 0e589f61ba am: 025396b2c2 am: 95b5673a5d am: e26720e460
Change-Id: I2eb7274d93d6e30dfc962d9caa86807a65f01296
2020-05-20 19:51:38 +00:00
Suren Baghdasaryan 105df16e00 lmkd: Set the default free swap threshold to 10% for all devices am: c2b228e498 am: b0027daa8a am: 7f2ddf5ff0 am: e7f5cc3236
Change-Id: I99a4fad73858e15f8b5351cc28e4c7c6bcfe13c1
2020-05-20 19:51:10 +00:00
Automerger Merge Worker 2ed2feb714 Merge "lmkd: Fix min_score_adj to exclude killing foreground processes am: 0e589f61ba am: 3125ebc794 am: 4ad5bad680" into rvc-qpr-dev-plus-aosp am: c06ec0dda1
Change-Id: I3ac5179d9ab96ec2e5a672a8dd6173d030ce1afc
2020-05-20 19:49:57 +00:00
Suren Baghdasaryan 3b7b7a0ec3 lmkd: Set the default free swap threshold to 10% for all devices am: c2b228e498 am: b0027daa8a am: 10be4c368e am: 4b3f883545
Change-Id: I9955023d1a42aa36a9ba97a96efe1b075d6e4cdc
2020-05-20 19:48:53 +00:00
Suren Baghdasaryan cebee34f2d lmkd: Fix min_score_adj to exclude killing foreground processes am: 0e589f61ba am: 3125ebc794 am: 0b210fe185 am: 0a6313b062
Change-Id: I8860644e9ab3f873a15dc05f8a132d3b8c957646
2020-05-20 19:45:39 +00:00