Commit Graph

1478 Commits

Author SHA1 Message Date
Julien Desprez bedcba1885 Move lmkd_tests to 'presubmit' group
Doesn't need to be in 'presubmit-large' as it's a small and quick test.

Change-Id: I7a6b78cf3174993361f50d8d7adfdf86c9d20e28
Test: presubmit
Bug: 270214959
2023-03-01 21:42:30 +00:00
Automerger Merge Worker 31180bc115 Merge "[automerger skipped] Merge Android 13 QPR1 am: 60ab38d24a -s ours" into stage-aosp-master am: 7079c57280 -s ours am: 70559e12d9 -s ours
am skip reason: Merged-In Ib4665d3df62f58e36686ca134f9ae07836fd6945 with SHA-1 779a550826 is already in history

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

Change-Id: Ifb083de77f91ac9fbc6cf8582de6e0414276448c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 13:51:05 +00:00
Xin Li 2413ec7e46 [automerger skipped] Merge Android 13 QPR1 am: 60ab38d24a -s ours am: 83c6e6de68 -s ours am: b2710a1935 -s ours
am skip reason: Merged-In Ib4665d3df62f58e36686ca134f9ae07836fd6945 with SHA-1 779a550826 is already in history

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

Change-Id: I7f252acc244dc53f3d4a0f8ba282178ad3c4db82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 13:48:11 +00:00
Xin Li 01daa66ac6 [automerger skipped] Merge Android 13 QPR1 am: 60ab38d24a -s ours am: cbd81e2bf5 -s ours am: f5c6fd6fe0 -s ours
am skip reason: Merged-In Ib4665d3df62f58e36686ca134f9ae07836fd6945 with SHA-1 779a550826 is already in history

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

Change-Id: I08a7a0c553ee72e3ec6d617062c4e3a9de7ea46c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 11:57:18 +00:00
Automerger Merge Worker 70559e12d9 Merge "[automerger skipped] Merge Android 13 QPR1 am: 60ab38d24a -s ours" into stage-aosp-master am: 7079c57280 -s ours
am skip reason: Merged-In Ib4665d3df62f58e36686ca134f9ae07836fd6945 with SHA-1 779a550826 is already in history

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

Change-Id: I549e8528915d96b31385634273ac5d56fa901c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 02:00:37 +00:00
Xin Li b2710a1935 [automerger skipped] Merge Android 13 QPR1 am: 60ab38d24a -s ours am: 83c6e6de68 -s ours
am skip reason: Merged-In Ib4665d3df62f58e36686ca134f9ae07836fd6945 with SHA-1 779a550826 is already in history

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

Change-Id: I6729e72a0a01daa1391e683b440beb8813b3884f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 01:57:44 +00:00
Xin Li f5c6fd6fe0 [automerger skipped] Merge Android 13 QPR1 am: 60ab38d24a -s ours am: cbd81e2bf5 -s ours
am skip reason: Merged-In Ib4665d3df62f58e36686ca134f9ae07836fd6945 with SHA-1 779a550826 is already in history

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

Change-Id: I4e6fa10f733b695f4fb35a43f5373f9dcb93fc15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10 00:25:05 +00:00
Automerger Merge Worker 7079c57280 Merge "[automerger skipped] Merge Android 13 QPR1 am: 60ab38d24a -s ours" into stage-aosp-master 2022-12-09 23:32:17 +00:00
Xin Li 83c6e6de68 [automerger skipped] Merge Android 13 QPR1 am: 60ab38d24a -s ours
am skip reason: Merged-In Ib4665d3df62f58e36686ca134f9ae07836fd6945 with SHA-1 779a550826 is already in history

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

Change-Id: I6584c43f73918c030d8c04b42c3cfc5b1e8b9e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:19:43 +00:00
Xin Li cbd81e2bf5 [automerger skipped] Merge Android 13 QPR1 am: 60ab38d24a -s ours
am skip reason: Merged-In Ib4665d3df62f58e36686ca134f9ae07836fd6945 with SHA-1 779a550826 is already in history

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

Change-Id: Ibed362db6eebbfe38d39dde837c9343bf7db7e83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09 23:14:59 +00:00
Xin Li 60ab38d24a Merge Android 13 QPR1
Bug: 261731544
Merged-In: Ib4665d3df62f58e36686ca134f9ae07836fd6945
Change-Id: Idf7e8e4ebefb65d3358e51220fa8ec24e371ddc9
2022-12-09 10:31:11 -08:00
Suren Baghdasaryan 876392ffc9 [automerger skipped] lmkd: prevent the main thread from reaping synchronously am: 0431b65e6c -s ours am: ed70ba8879 -s ours
am skip reason: Merged-In I351c01229152946969e646b538a2494656c0cc85 with SHA-1 1c96a31917 is already in history

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

Change-Id: Ib8b6e64067a8043268bed1a77edad779a1854534
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 08:34:53 +00:00
Suren Baghdasaryan ed70ba8879 [automerger skipped] lmkd: prevent the main thread from reaping synchronously am: 0431b65e6c -s ours
am skip reason: Merged-In I351c01229152946969e646b538a2494656c0cc85 with SHA-1 1c96a31917 is already in history

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

Change-Id: I7c10a08aaaf2b25242e5c724284cd685a4c542a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01 07:31:54 +00:00
Suren Baghdasaryan 0431b65e6c lmkd: prevent the main thread from reaping synchronously
lmkd main thread is running at RT priority to prevent it from being
blocked by other processes. However when all reaper threads are busy,
lmkd will kill and reap the memory of the target process from the
context of the main thread and that can cause two issues:
1. lmkd main thread gets blocked for considerable duration.
2. lmkd main and reaper threads might monopolize CPUs.
To prevent these issues, when all reaper threads are busy, lmkd will
send a SIGKILL but will not synchronously reap the memory of the target
process.

Bug: 238495258
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I351c01229152946969e646b538a2494656c0cc85
Merged-In: I351c01229152946969e646b538a2494656c0cc85
2022-11-28 15:29:14 +08:00
Suren Baghdasaryan 3d6e93b425 [automerger skipped] lmkd/tests: handle the case when process exits before reaping starts am: 2300230ea4 -s ours am: fcd8755e53 -s ours
am skip reason: Merged-In Ica5b28fa52a5f42a771fb9516112e58b66291068 with SHA-1 0cb4aae3e6 is already in history

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

Change-Id: Ieee10dfe08780271064f251cf6348d37bd5223d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 22:36:28 +00:00
Suren Baghdasaryan 8ae523d48a [automerger skipped] lmkd: set priority of the kill target from the reaper thread am: 683da9812c -s ours am: 3243c6d24a -s ours
am skip reason: Merged-In Ib4665d3df62f58e36686ca134f9ae07836fd6945 with SHA-1 779a550826 is already in history

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

Change-Id: I70d0888372ba49259c0efc7a36d49dfc18258904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 22:36:27 +00:00
Suren Baghdasaryan ce4e38211a [automerger skipped] lmkd: remove priority setting for the kill target am: 2fa5b7af73 -s ours am: 29fdfcc93e -s ours
am skip reason: Merged-In I5defc6baa4ff1425d9835371b47a64e375ebac10 with SHA-1 67c467d4ec is already in history

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

Change-Id: I8dae30665db2b6087a5bed2527f32ca86f5d96da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 22:36:25 +00:00
Suren Baghdasaryan fcd8755e53 [automerger skipped] lmkd/tests: handle the case when process exits before reaping starts am: 2300230ea4 -s ours
am skip reason: Merged-In Ica5b28fa52a5f42a771fb9516112e58b66291068 with SHA-1 0cb4aae3e6 is already in history

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

Change-Id: Ibde562306f47c99dcaaad7f6ec5b65b489c0b728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 21:19:53 +00:00
Suren Baghdasaryan 3243c6d24a [automerger skipped] lmkd: set priority of the kill target from the reaper thread am: 683da9812c -s ours
am skip reason: Merged-In Ib4665d3df62f58e36686ca134f9ae07836fd6945 with SHA-1 779a550826 is already in history

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

Change-Id: I2774cc3a764d302151daa333cc578a9a1219cd65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 21:19:52 +00:00
Suren Baghdasaryan 29fdfcc93e [automerger skipped] lmkd: remove priority setting for the kill target am: 2fa5b7af73 -s ours
am skip reason: Merged-In I5defc6baa4ff1425d9835371b47a64e375ebac10 with SHA-1 67c467d4ec is already in history

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

Change-Id: I809c3c66ff904f99733589e76a08ffb6e10d84c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 21:19:50 +00:00
Suren Baghdasaryan 2300230ea4 lmkd/tests: handle the case when process exits before reaping starts
Current test will fail in the case when the target process exits before
process_mrelease is called. However this is possible and should not be
treated as an invalid case. Add special handling of this case in the
test.

Bug: 254880957
Test: run lmkd_tests until this case happens
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ica5b28fa52a5f42a771fb9516112e58b66291068
Merged-In: Ica5b28fa52a5f42a771fb9516112e58b66291068
2022-10-26 23:55:56 +00:00
Suren Baghdasaryan 683da9812c lmkd: set priority of the kill target from the reaper thread
Not boosting kill target's priority can cause priority inversion. Boost
its priority from the reaper thread right after sending a SIGKILL to
prevent priority inversion. Also, using normal priority to the victim
processes. Thus, they won't take too much CPU resource which preempt
UI or important processes.

Bug: 238495258
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I789ec402f038a1b48d25f62f859be69bbddfad16
Merged-In: Ib4665d3df62f58e36686ca134f9ae07836fd6945
2022-10-26 23:55:36 +00:00
Suren Baghdasaryan 2fa5b7af73 lmkd: remove priority setting for the kill target
Setting cpusets and priorities for the kill target involves fs operations
which can block on kernel internal locks. Doing that from lmkd main thread
context has the danger of blocking lmkd. With the introduction of the
reaper threads the time for the target to exit is not as critical since
its memory is freed by the reaper thread.
To prevent lmkd from being blocked, move setting cpuset for the kill
target into the reaper thread and remove priority setting logic with
heavy use of procfs reads.

Bug: 238495258
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I5defc6baa4ff1425d9835371b47a64e375ebac10
Merged-In: I5defc6baa4ff1425d9835371b47a64e375ebac10
2022-10-26 22:23:02 +00:00
Suren Baghdasaryan abb91800f5 Revert "Revert "lmkd: set priority of the kill target from the reaper thread"" am: 779a550826 am: 88ca1a4963 am: 16d8624851
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2267891

Change-Id: I529316c2d684a76bce6609c1cc46786da4a61e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 17:29:55 +00:00
Suren Baghdasaryan 880c893b5e lmkd/tests: handle the case when process exits before reaping starts am: 0cb4aae3e6 am: c7a3bf51b6 am: 79e4121e12
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2267890

Change-Id: Ie31ffd75a776c880261e061b4be7cd2492916cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 17:29:53 +00:00
Suren Baghdasaryan 16d8624851 Revert "Revert "lmkd: set priority of the kill target from the reaper thread"" am: 779a550826 am: 88ca1a4963
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2267891

Change-Id: If0ee4a06bd0c626734b92de78451da113eacce4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 16:50:22 +00:00
Suren Baghdasaryan 79e4121e12 lmkd/tests: handle the case when process exits before reaping starts am: 0cb4aae3e6 am: c7a3bf51b6
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2267890

Change-Id: I7c07d4de37bed137a1e1201ba5197c5577069087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 16:50:20 +00:00
Suren Baghdasaryan 88ca1a4963 Revert "Revert "lmkd: set priority of the kill target from the reaper thread"" am: 779a550826
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2267891

Change-Id: I74dfbb7a46342fb3b7242f0d410a436cd788f62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 16:14:25 +00:00
Suren Baghdasaryan c7a3bf51b6 lmkd/tests: handle the case when process exits before reaping starts am: 0cb4aae3e6
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2267890

Change-Id: Ib225b60564bb0dd9518bcd9c8a202fc5d2c96b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 16:14:23 +00:00
Suren Baghdasaryan 779a550826 Revert "Revert "lmkd: set priority of the kill target from the reaper thread""
This reverts commit c5e4185a02.

Bug: 238495258
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ib4665d3df62f58e36686ca134f9ae07836fd6945
2022-10-24 20:25:30 +00:00
Suren Baghdasaryan 0cb4aae3e6 lmkd/tests: handle the case when process exits before reaping starts
Current test will fail in the case when the target process exits before
process_mrelease is called. However this is possible and should not be
treated as an invalid case. Add special handling of this case in the
test.

Bug: 254880957
Test: run lmkd_tests until this case happens
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ica5b28fa52a5f42a771fb9516112e58b66291068
2022-10-24 20:24:41 +00:00
Suren Baghdasaryan aff31f011f Revert "lmkd: set priority of the kill target from the reaper thread" am: c5e4185a02 am: b4e51e775a am: 97399d18c5
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2264594

Change-Id: I6ed5b62d32dc7669e6c7de97cdc04ad9f66ec203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 23:43:13 +00:00
Suren Baghdasaryan 97399d18c5 Revert "lmkd: set priority of the kill target from the reaper thread" am: c5e4185a02 am: b4e51e775a
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2264594

Change-Id: I5ac7530104675e28b1174796de2969d27bc38a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 23:11:21 +00:00
Suren Baghdasaryan b4e51e775a Revert "lmkd: set priority of the kill target from the reaper thread" am: c5e4185a02
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2264594

Change-Id: Ia78dfbca2c98f36b5a3da1bbcb92cf4f9369af25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 22:42:51 +00:00
Suren Baghdasaryan c5e4185a02 Revert "lmkd: set priority of the kill target from the reaper thread"
This reverts commit 208d1af144.

Reason for revert: Seems to cause a test breakage at b/254880957

Change-Id: Icf497abf3e35ffe632a11629c8a067581269b035
2022-10-21 20:54:18 +00:00
Suren Baghdasaryan 05ceae6599 lmkd: set priority of the kill target from the reaper thread am: 208d1af144 am: 3083f8688a am: 754e604c75
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2256321

Change-Id: I8ff96740014b6d71fbcc4d792630e84bb65e5080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 17:08:38 +00:00
Suren Baghdasaryan 754e604c75 lmkd: set priority of the kill target from the reaper thread am: 208d1af144 am: 3083f8688a
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2256321

Change-Id: I158d6e506ca59d3a8385054b5781d17f47db73c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 16:34:20 +00:00
Suren Baghdasaryan 3083f8688a lmkd: set priority of the kill target from the reaper thread am: 208d1af144
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2256321

Change-Id: I15bcb8c145b564fb418834763bc81a07889d3bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 16:06:14 +00:00
Suren Baghdasaryan 208d1af144 lmkd: set priority of the kill target from the reaper thread
Not boosting kill target's priority can cause priority inversion. Boost
its priority from the reaper thread right after sending a SIGKILL to
prevent priority inversion. Also, using normal priority to the victim
processes. Thus, they won't take too much CPU resource which preempt
UI or important processes.

Bug: 238495258
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I789ec402f038a1b48d25f62f859be69bbddfad16
2022-10-21 02:47:18 +00:00
Suren Baghdasaryan 77a7c78570 lmkd: prevent the main thread from reaping synchronously am: 1c96a31917 am: 1c14dfd364 am: 56bc0d0292
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2256322

Change-Id: Ie46ce5d52634b0bcd37c85290d98511c00514947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 02:03:10 +00:00
Suren Baghdasaryan 56bc0d0292 lmkd: prevent the main thread from reaping synchronously am: 1c96a31917 am: 1c14dfd364
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2256322

Change-Id: I3b48731d19ffb4f7c09b71b24eb0757675b73d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:29:37 +00:00
Suren Baghdasaryan 1c14dfd364 lmkd: prevent the main thread from reaping synchronously am: 1c96a31917
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2256322

Change-Id: Idc81fd8c0e9f9e0a097cddea6682e22a4ce4ea8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 00:58:07 +00:00
Suren Baghdasaryan 1c96a31917 lmkd: prevent the main thread from reaping synchronously
lmkd main thread is running at RT priority to prevent it from being
blocked by other processes. However when all reaper threads are busy,
lmkd will kill and reap the memory of the target process from the
context of the main thread and that can cause two issues:
1. lmkd main thread gets blocked for considerable duration.
2. lmkd main and reaper threads might monopolize CPUs.
To prevent these issues, when all reaper threads are busy, lmkd will
send a SIGKILL but will not synchronously reap the memory of the target
process.

Bug: 238495258
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I351c01229152946969e646b538a2494656c0cc85
2022-10-18 21:44:24 +00:00
Xin Li 7977c5f424 [automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: dda11a6d3d -s ours am: 13dc2010de -s ours
am skip reason: Merged-In I0c7776aea1518c17f0a29904a44b7fe8f33980ca with SHA-1 a3802f16cf is already in history

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

Change-Id: Ifd91643e4b7123c1a83baa2dc7c0e564efb36017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 20:13:34 +00:00
Xin Li 5e5729c447 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: d53b1adb0f -s ours am: 50dc1c4777 -s ours
am skip reason: Merged-In I0c7776aea1518c17f0a29904a44b7fe8f33980ca with SHA-1 a3802f16cf is already in history

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

Change-Id: I7610d030d1c545d29bff36c14540a3ba128b6962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 20:10:11 +00:00
Xin Li 13dc2010de [automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: dda11a6d3d -s ours
am skip reason: Merged-In I0c7776aea1518c17f0a29904a44b7fe8f33980ca with SHA-1 a3802f16cf is already in history

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

Change-Id: If0768c955272951bf3f5bebe71edd464674ca1b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:59:35 +00:00
Xin Li 50dc1c4777 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: d53b1adb0f -s ours
am skip reason: Merged-In I0c7776aea1518c17f0a29904a44b7fe8f33980ca with SHA-1 a3802f16cf is already in history

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

Change-Id: I4a026922ff88214816c4ff5b2a3a966f70cac187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:56:13 +00:00
Xin Li dda11a6d3d Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master 2022-10-11 17:39:53 +00:00
Suren Baghdasaryan 7882afb254 lmkd: remove priority setting for the kill target am: 67c467d4ec am: 7f8da1ec36 am: 14811ac9c0
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2241693

Change-Id: I9a56144d36393c0bc5e6df6bff5ae99551917637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 00:42:24 +00:00
Suren Baghdasaryan 14811ac9c0 lmkd: remove priority setting for the kill target am: 67c467d4ec am: 7f8da1ec36
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2241693

Change-Id: I0274d5765611ccadea2451ea367271e0bd3f6a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 00:09:28 +00:00