diff options
| author | Kweku Adams <kwekua@google.com> | 2019-04-26 16:28:54 -0700 |
|---|---|---|
| committer | Kweku Adams <kwekua@google.com> | 2019-07-12 17:42:17 -0700 |
| commit | 304ee7b830e6aa4b597ab1dd7cf7211eb45c30c6 (patch) | |
| tree | 3eb826c6f34a67f16bed24767982a6fb8ee2c6f8 /tools/aapt2/diff/Diff.cpp | |
| parent | 3f8cdda0497f8dc4fbba56892777327f9bee9273 (diff) | |
Fixing deadlock in OomAdjProfiler.
During dumping, the ActivityManager lock is held. If a CPU time update
was scheduled before a dump but the background thread was working on a
task that required the ActivityManager lock, OomAdjProfiler would wait
indefinitely for the update in the dump() method because the AM lock is
already taken in the main thread. Removing the wait and updating the CPU
time in the main thread during dumping only should avoid the potential
deadlock.
Bug: 130635979
Test: adb shell dumpsys activity
Change-Id: Ibafe79b46babe16f589ec28d525174f9a01f00b8
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions