Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32ac1e14 authored by Martijn Coenen's avatar Martijn Coenen
Browse files

Fix NPE in NdefRecord parser. 

Malformed Uri tags could cause this crash.

Bug: 7116323
Change-Id: I979d1512058f351df32dbd972b6ec5c108202da5
parent 4848f42f

core/java/android/nfc/NdefRecord.java

+2 −1
Original line number Diff line number Diff line
@@ -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;