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

Commit be8e9ff7 authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am bb595190: am 89c5a118: Merge "Don\'t crash attempting restore of... 

am bb595190: am 89c5a118: Merge "Don\'t crash attempting restore of uninstalled live wallpaper" into klp-dev

* commit 'bb595190':
  Don't crash attempting restore of uninstalled live wallpaper
parents 0033539a bb595190

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