Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6a0277b authored by Nick Pelly's avatar Nick Pelly Committed by Android Git Automerger
Browse files

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

* commit '63b7360e':
  Fix NPE on devices that don't have NFC.
parents 19a57bde 63b7360e

core/java/android/nfc/NfcAdapter.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -360,6 +360,10 @@ public final class NfcAdapter { 
        /* use getSystemService() instead of just instantiating to take

        /* use getSystemService() instead of just instantiating to take

         * advantage of the context's cached NfcManager & NfcAdapter */

         * advantage of the context's cached NfcManager & NfcAdapter */

        NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);

        NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);

        if (manager == null) {

            // NFC not available

            return null;

        }

        return manager.getDefaultAdapter();

        return manager.getDefaultAdapter();

    }

    }