diff options
| author | Michael Wright <michaelwr@android.com> | 2014-04-30 19:06:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-30 19:06:40 +0000 |
| commit | 809c369892ddbae908dc47e6a1032a768e9004cb (patch) | |
| tree | 60a5852d52a5465520acfaad83975b4b57d0c177 /core | |
| parent | 91ff3c18dbb61ed0087f741dd2bdf911ecf42fef (diff) | |
| parent | 54c3529b4d3f86488799caa0e62a1f3929a79a39 (diff) | |
| download | frameworks_base-809c369892ddbae908dc47e6a1032a768e9004cb.zip frameworks_base-809c369892ddbae908dc47e6a1032a768e9004cb.tar.gz frameworks_base-809c369892ddbae908dc47e6a1032a768e9004cb.tar.bz2 | |
am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"
* commit '54c3529b4d3f86488799caa0e62a1f3929a79a39':
WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/WallpaperManager.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index f291e82..62f7147 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -664,6 +664,10 @@ public class WallpaperManager { * not "image/*" */ public Intent getCropAndSetWallpaperIntent(Uri imageUri) { + if (imageUri == null) { + throw new IllegalArgumentException("Image URI must not be null"); + } + if (!ContentResolver.SCHEME_CONTENT.equals(imageUri.getScheme())) { throw new IllegalArgumentException("Image URI must be of the " + ContentResolver.SCHEME_CONTENT + " scheme type"); |