Merge "Move onKeyguardGoingAway outside ActivityManager lock" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
741afeca21
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user