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

am: fd57d549cf Change-Id: Ibff8d87533d075f0af95ab98d44f67fd4405a951
2016-07-15 21:50:46 +00:00
parent d4584a8fb5 fd57d549cf
commit 3e3f0f1ba8
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/content/pm/ShortcutInfo.java
+++ b/core/java/android/content/pm/ShortcutInfo.java
@@ -652,7 +652,7 @@ public final class ShortcutInfo implements Parcelable {
    /** @hide */
    public static IllegalArgumentException getInvalidIconException() {
        return new IllegalArgumentException("Unsupported icon type:"
-                +" only bitmap, resource and content URI are supported");
+                +" only the bitmap and resource types are supported");
    }

    /**