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

Commit a2dc6fab authored by Michael Wright's avatar Michael Wright Committed by Android Git Automerger
Browse files

am 474b0749: am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL... 

am 474b0749: am 809c3698: am 54c3529b: Merge "WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent"

* commit '474b0749':
  WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
parents fae7bedc 474b0749

core/java/android/app/WallpaperManager.java

+4 −0
Original line number Diff line number Diff line
@@ -651,6 +651,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");