39380dcf3a399e8309286d985389380feb7c598f - platform_frameworks_base

commit	39380dcf3a399e8309286d985389380feb7c598f	[log] [tgz]
author	Riddle Hsu <riddlehsu@google.com>	Fri Sep 11 01:00:49 2020 +0800
committer	Riddle Hsu <riddlehsu@google.com>	Fri Sep 25 21:40:12 2020 +0800
tree	901daa18813670cec41716a026ebe87ba44bd01b
parent	697f2d91fdcd6f9bb898c3d867bb8cd2d2ea367e [diff]

Remove WM lock from WPC#computeOomAdjFromActivities

Since the result of computeOomAdjFromActivities depends on task
layer rank and activity state. It can be calculated once the states
are changed before oom-adjustment calculation. So when activity
manager asks the result from any reason, it can get the computed
states without entering heavy WM lock.

Also remove lock in WPC#hasVisibleActivities because its returned
result is also computed in computeOomAdjFromActivities.

Bug: 159104503
Test: WindowProcessControllerTests#testComputeOomAdjFromActivities
Change-Id: I797c81a5ebe447802cc02ac37736a0464108836f

services/core/java/com/android/server/am/ProcessRecord.java[diff]
services/core/java/com/android/server/wm/ActivityRecord.java[diff]
services/core/java/com/android/server/wm/RootWindowContainer.java[diff]
services/core/java/com/android/server/wm/WindowProcessController.java[diff]
services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java[diff]
services/tests/wmtests/src/com/android/server/wm/WindowProcessControllerTests.java[diff]

6 files changed