diff options
| author | Martijn Coenen <maco@google.com> | 2012-03-29 14:18:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-29 14:18:29 -0700 |
| commit | 020b17588c85e9a55539ccbb20081754272c724b (patch) | |
| tree | b9d32b18b7af317bed63175955d9c39715831e3c /src/com/android/nfc | |
| parent | 788afc415ce874e47a696e572565761c8ec0b7f5 (diff) | |
| parent | bfaee054834ade31c52002f00553c63701f1c0b0 (diff) | |
| download | packages_apps_nfc-020b17588c85e9a55539ccbb20081754272c724b.zip packages_apps_nfc-020b17588c85e9a55539ccbb20081754272c724b.tar.gz packages_apps_nfc-020b17588c85e9a55539ccbb20081754272c724b.tar.bz2 | |
Merge "Fix NPE when there's NDEF data we can't dispatch."
Diffstat (limited to 'src/com/android/nfc')
| -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 1c7f912..5e754a0 100644 --- a/src/com/android/nfc/NfcDispatcher.java +++ b/src/com/android/nfc/NfcDispatcher.java @@ -235,7 +235,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"); |