Merge "Fix NPE with missing DPMI"

2020-12-02 16:02:24 +00:00
parent a85bab4c69 f7d5bc1201
commit 5bcadd3ccd
1 changed files with 3 additions and 2 deletions
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -2846,8 +2846,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
        if (!uidMatchPackage) {
            return false;   // callingPackage was faked.
        }
-        if (LocalServices.getService(DevicePolicyManagerInternal.class)
-                .isDeviceOrProfileOwnerInCallingUser(callingPackage)) {
+        final DevicePolicyManagerInternal dpmi =
+                LocalServices.getService(DevicePolicyManagerInternal.class);
+        if (dpmi != null && dpmi.isDeviceOrProfileOwnerInCallingUser(callingPackage)) {
            return true;
        }
        final int callingUserId = UserHandle.getCallingUserId();