Commit 169a306c authored May 25, 2023 by Aurélien Pomini

Move onKeyguardGoingAway outside ActivityManager lock

The other events of WallpaperManagerInternal (onDisplayReady,
onScreenTurningOn, onScreenTurnedOn) are also called outside lock,
and only grab the WallpaperManagerService lock.

We now do the same with onKeyguardGoingAway. This does not create new
race issues: the event sent to the engine is anyway async.

This CL fixes a deadlock: see the associated bug.

Bug: 282786193
Test: treehugger
Change-Id: I8c15fec587c6124ee5aadac46b8a0e1b93507921

parent 4422c68b

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -3558,11 +3558,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		mRootWindowContainer.forAllDisplays(displayContent -> {
		mKeyguardController.keyguardGoingAway(displayContent.getDisplayId(), flags);
		});
		}
		WallpaperManagerInternal wallpaperManagerInternal = getWallpaperManagerInternal();
		if (wallpaperManagerInternal != null) {
		wallpaperManagerInternal.onKeyguardGoingAway();
		}
		}
		} finally {
		Binder.restoreCallingIdentity(token);
		}