commit 63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba
author Nick Pelly <npelly@google.com> Thu Nov 17 12:48:48 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 17 12:48:48 2011 -0800
tree 9c68bf2192767170cd91fb34eab3217c6e2ebf0b
parent 1733a3de8c4f98ba4df08ab79d1fef6d2684d2c2
parent a5193b24c1c944331f329eca1d4f85df3a024b1d

Merge "Fix NPE on devices that don't have NFC." into ics-mr1

core/java/android/nfc/NfcAdapter.java

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 @@
         /* 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();
     }