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

Author: Nick Pelly

core/java/android/nfc/NfcAdapter.java

@@ -360,6 +360,10 @@ public static NfcAdapter getDefaultAdapter(Context context) {
         /* 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();
     }