Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Nfc adapter randomly returns null on devices having Nfc" into rvc-qpr-dev

Browse Source
This commit is contained in:
Alisher Alikhodjaev
2021-01-11 23:08:40 +00:00
committed by Android (Google) Code Review
parent 5290b8d590 23abf11a3a
commit aadceeb17a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/nfc/NfcAdapter.java
View File

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