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

Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"

Browse Source
This commit is contained in:
Michael Wright
2014-04-30 19:02:56 +00:00
committed by Gerrit Code Review
parent 7d3f9e9730 1c0f21ea84
commit 54c3529b4d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/WallpaperManager.java
View File

@@ -668,6 +668,10 @@ public class WallpaperManager {
* not "image/*" * not "image/*"
*/ */
public Intent getCropAndSetWallpaperIntent(Uri imageUri) { public Intent getCropAndSetWallpaperIntent(Uri imageUri) {
if (imageUri == null) {
throw new IllegalArgumentException("Image URI must not be null");
}
if (!ContentResolver.SCHEME_CONTENT.equals(imageUri.getScheme())) { if (!ContentResolver.SCHEME_CONTENT.equals(imageUri.getScheme())) {
throw new IllegalArgumentException("Image URI must be of the " throw new IllegalArgumentException("Image URI must be of the "
+ ContentResolver.SCHEME_CONTENT + " scheme type"); + ContentResolver.SCHEME_CONTENT + " scheme type");