am 32ac1e14: Fix NPE in NdefRecord parser.

* commit '32ac1e142c4a0f3529c49cde433ae5e22f84b1d6': Fix NPE in NdefRecord parser.
2012-09-06 09:13:43 -07:00
parent 03f9eaf9b9 32ac1e142c
commit 67ad3e98e3
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/nfc/NdefRecord.java
+++ b/core/java/android/nfc/NdefRecord.java
@@ -688,7 +688,8 @@ public final class NdefRecord implements Parcelable {
                        }
                    } catch (FormatException e) {  }
                } else if (Arrays.equals(mType, RTD_URI)) {
-                    return parseWktUri().normalizeScheme();
+                    Uri wktUri = parseWktUri();
+                    return (wktUri != null ? wktUri.normalizeScheme() : null);
                }
                break;