commit c6a0277bca29359ec1aee123495065982d2eea7a
author Nick Pelly <npelly@google.com> Thu Nov 17 12:51:18 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 17 12:51:18 2011 -0800
tree 9c68bf2192767170cd91fb34eab3217c6e2ebf0b
parent 19a57bdedf3f9ccfa4d45cd35ef4b379853c6a81
parent 63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba

am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1

* commit '63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba':
  Fix NPE on devices that don't have NFC.

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