diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-16 16:46:27 -0800 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-11-16 16:49:01 -0800 |
| commit | a5193b24c1c944331f329eca1d4f85df3a024b1d (patch) | |
| tree | 4e78f10df1d77d8313fe95e32e2632bfdcbb975e /core/java/android/nfc | |
| parent | 7dc81e06e4d0554683595e8d2e318837548e249a (diff) | |
| download | frameworks_base-a5193b24c1c944331f329eca1d4f85df3a024b1d.zip frameworks_base-a5193b24c1c944331f329eca1d4f85df3a024b1d.tar.gz frameworks_base-a5193b24c1c944331f329eca1d4f85df3a024b1d.tar.bz2 | |
Fix NPE on devices that don't have NFC.
We should return null instead of NPE.
Bug: 5622939
Change-Id: I802f4a99ea9f5e73453d5ea30da4e1d9fa279b9c
Diffstat (limited to 'core/java/android/nfc')
| -rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index a9f1685..2857ac5 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -360,6 +360,10 @@ public final class NfcAdapter { /* use getSystemService() instead of just instantiating to take * advantage of the context's cached NfcManager & NfcAdapter */ NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE); + if (manager == null) { + // NFC not available + return null; + } return manager.getDefaultAdapter(); } |