Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90952204 authored by Christopher Tate's avatar Christopher Tate
Browse files

Don't crash attempting restore of uninstalled live wallpaper 

Bug 10658041

Change-Id: I08b38cc81fbb89907a4ffe5b6f94e9a507226011
parent 23e2bba4

services/java/com/android/server/WallpaperManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -821,6 +821,11 @@ class WallpaperManagerService extends IWallpaperManager.Stub { 
            int serviceUserId = wallpaper.userId;

            ServiceInfo si = mIPackageManager.getServiceInfo(componentName,

                    PackageManager.GET_META_DATA | PackageManager.GET_PERMISSIONS, serviceUserId);

            if (si == null) {

                // The wallpaper component we're trying to use doesn't exist

                Slog.w(TAG, "Attempted wallpaper " + componentName + " is unavailable");

                return false;

            }

            if (!android.Manifest.permission.BIND_WALLPAPER.equals(si.permission)) {

                String msg = "Selected service does not require "

                        + android.Manifest.permission.BIND_WALLPAPER