Merge "Move onKeyguardGoingAway outside ActivityManager lock" into udc-dev (741afeca) · Commits · e / os / android_frameworks_base

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

+4 −4

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