Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix WallpaperManagerInternal NPE" into udc-dev am: 8977208b9d am: ec0bc133e8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23048820

Change-Id: I923a657aff140924733ff1d0c45a67e94eae0ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aurélien Pomini
2023-05-05 17:47:28 +00:00
committed by Automerger Merge Worker
parent 48a28a810d ec0bc133e8
commit f61b29ace9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

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