Nfc adapter randomly returns null on devices having Nfc

Try to get NfcAdapter from NfcManager only when nfc service interface is
ready.

Bug: 173184157
Test: manaul test
Change-Id: Ifcb0f60e23f01cafd8b6b5f6bc8522773ece23a6
This commit is contained in:
Jack Yu
2020-11-13 18:34:42 +08:00
parent cb2a677767
commit 3217255a4d

View File

@@ -678,6 +678,12 @@ public final class NfcAdapter {
throw new IllegalArgumentException(
"context not associated with any application (using a mock context?)");
}
if (getServiceInterface() == null) {
// NFC is not available
return null;
}
/* use getSystemService() for consistency */
NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);
if (manager == null) {