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

Commit 35dcfebd authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge \\"Fix the allowed icon type error message\\" into nyc-mr1-dev am: fd57d549 

am: 3e3f0f1b

Change-Id: Iaa3eb26436dfa339ee7e095562344394dcd56b53
parents b933b9ac 3e3f0f1b

core/java/android/content/pm/ShortcutInfo.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -652,7 +652,7 @@ public final class ShortcutInfo implements Parcelable { 
    /** @hide */

    /** @hide */

    public static IllegalArgumentException getInvalidIconException() {

    public static IllegalArgumentException getInvalidIconException() {

        return new IllegalArgumentException("Unsupported icon type:"

        return new IllegalArgumentException("Unsupported icon type:"

                +" only bitmap, resource and content URI are supported");

                +" only the bitmap and resource types are supported");

    }

    }





    /**

    /**