commit 909522048f7ce7af54e1476175c8e8d1df808a04
author Christopher Tate <ctate@google.com> Sun Sep 08 13:01:28 2013 -0700
committer Christopher Tate <ctate@google.com> Sun Sep 08 13:01:28 2013 -0700
tree af47f0b3524526d0d7cd8e10f6cb94b480ecf2c3
parent 23e2bba4e17662e941c2c6672f66249aff4a0470

Don't crash attempting restore of uninstalled live wallpaper

Bug 10658041

Change-Id: I08b38cc81fbb89907a4ffe5b6f94e9a507226011

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

diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java
index d677f24..162add4 100644
--- a/services/java/com/android/server/WallpaperManagerService.java
+++ b/services/java/com/android/server/WallpaperManagerService.java
@@ -821,6 +821,11 @@
             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