diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-07-15 21:43:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-15 21:43:03 +0000 |
| commit | fd57d549cf535c803ecde5bef3438121a75d2ec2 (patch) | |
| tree | b7e9700bd85f7f5eea340e36e3b6acfdf6992719 /core/java/android | |
| parent | 9a0e444c22dbac37ba5be28eef1e7f3b40aabbb6 (diff) | |
| parent | a97256b793a9ad9d6958645f098cff0b6e8918b1 (diff) | |
Merge "Fix the allowed icon type error message" into nyc-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/pm/ShortcutInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/pm/ShortcutInfo.java b/core/java/android/content/pm/ShortcutInfo.java index 8ea77d6428a8..f66e1f4a206b 100644 --- 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"); } /** |