diff options
| author | Martijn Coenen <maco@google.com> | 2012-03-08 09:42:02 -0800 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2012-03-08 09:43:29 -0800 |
| commit | bfaee054834ade31c52002f00553c63701f1c0b0 (patch) | |
| tree | dcfda27d723ce68d3709a3e601f05eb26d11a941 /src/com | |
| parent | 51c2c8f3f8495c9521f15748495b2786cdf97744 (diff) | |
| download | packages_apps_nfc-bfaee054834ade31c52002f00553c63701f1c0b0.zip packages_apps_nfc-bfaee054834ade31c52002f00553c63701f1c0b0.tar.gz packages_apps_nfc-bfaee054834ade31c52002f00553c63701f1c0b0.tar.bz2 | |
Fix NPE when there's NDEF data we can't dispatch.
Bug: 6135087
Change-Id: Ib2161c6125b6592db8ca2d89a1959e20f54455eb
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/nfc/NfcDispatcher.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/nfc/NfcDispatcher.java b/src/com/android/nfc/NfcDispatcher.java index 2f442e6..1324017 100644 --- a/src/com/android/nfc/NfcDispatcher.java +++ b/src/com/android/nfc/NfcDispatcher.java @@ -227,7 +227,8 @@ public class NfcDispatcher { // NDEF if (message != null) { intent = dispatch.setNdefIntent(); - if (isFilterMatch(intent, overrideFilters, overrideTechLists != null)) { + if (intent != null && + isFilterMatch(intent, overrideFilters, overrideTechLists != null)) { try { overrideIntent.send(mContext, Activity.RESULT_OK, intent); if (DBG) Log.i(TAG, "matched NDEF override"); |