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

Merge "nfc(api): Restore behavior from Android T" into udc-dev am: 004bbcdb14

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23755172

Change-Id: I9cb7c8263cff901c221bdea06d866be550234a4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-06-21 06:07:05 +00:00
committed by Automerger Merge Worker
parent ee92c6c122 004bbcdb14
commit afaa294324
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -711,6 +711,7 @@ public final class NfcAdapter {
/* Stale sService pointer */ /* Stale sService pointer */
if (sIsInitialized) sIsInitialized = false; if (sIsInitialized) sIsInitialized = false;
} }
return null;
} }
/* Try to initialize the service */ /* Try to initialize the service */
NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE); NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);