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

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

Browse Source 
* commit '89c5a1180830934db485ff9c189143deab653310':
  Don't crash attempting restore of uninstalled live wallpaper
This commit is contained in:
Christopher Tate
2013-09-08 13:08:24 -07:00
committed by Android Git Automerger
parent ab98aec612 89c5a11808
commit bb59519024
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/WallpaperManagerService.java
View File

@@ -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