diff options
| author | Martijn Coenen <maco@google.com> | 2012-09-06 16:36:33 +0200 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2012-09-06 16:36:33 +0200 |
| commit | 5f90b8ac1de415b3081525936b094e9a326c659e (patch) | |
| tree | 85d8e16b0a7e473dce07e1cbf71d46667ac06913 | |
| parent | 1af0b4a0de3b77443b68875346176afed6619bb0 (diff) | |
| download | android_packages_apps_Tag-5f90b8ac1de415b3081525936b094e9a326c659e.tar.gz android_packages_apps_Tag-5f90b8ac1de415b3081525936b094e9a326c659e.tar.bz2 android_packages_apps_Tag-5f90b8ac1de415b3081525936b094e9a326c659e.zip | |
Fix Tags app NPE.cm-10.1-M2cm-10.1-M1mr1.1-staging
mimeType parser can return null on some types.
Change-Id: I8bd8d9674686bcbdec47410d5f6700c6483a53db
| -rw-r--r-- | src/com/android/apps/tag/record/ImageRecord.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/apps/tag/record/ImageRecord.java b/src/com/android/apps/tag/record/ImageRecord.java index 34af2ee..95eb329 100644 --- a/src/com/android/apps/tag/record/ImageRecord.java +++ b/src/com/android/apps/tag/record/ImageRecord.java @@ -52,6 +52,9 @@ public class ImageRecord extends ParsedNdefRecord { public static ImageRecord parse(NdefRecord record) { String mimeType = record.toMimeType(); + if (mimeType == null) { + throw new IllegalArgumentException("not a valid image file"); + } Preconditions.checkArgument(mimeType.startsWith("image/")); // Try to ensure it's a legal, valid image |