commit 32ac1e142c4a0f3529c49cde433ae5e22f84b1d6
author Martijn Coenen <maco@google.com> Thu Sep 06 17:09:06 2012 +0200
committer Martijn Coenen <maco@google.com> Thu Sep 06 17:13:38 2012 +0200
tree 9ff0f6759846b8870d74e0b8f05b91c3dd2c5ec6
parent 4848f42f65082340b98da2628761e59567d19d9d

Fix NPE in NdefRecord parser.

Malformed Uri tags could cause this crash.

Bug: 7116323
Change-Id: I979d1512058f351df32dbd972b6ec5c108202da5

core/java/android/nfc/NdefRecord.java

diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java
index ed1c5b3..2d9dae9 100644
--- a/core/java/android/nfc/NdefRecord.java
+++ b/core/java/android/nfc/NdefRecord.java
@@ -688,7 +688,8 @@
                         }
                     } catch (FormatException e) {  }
                 } else if (Arrays.equals(mType, RTD_URI)) {
-                    return parseWktUri().normalizeScheme();
+                    Uri wktUri = parseWktUri();
+                    return (wktUri != null ? wktUri.normalizeScheme() : null);
                 }
                 break;