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

2023-06-21 05:29:19 +00:00
parent b2edecaa19 322c9daeeb
commit 004bbcdb14
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/nfc/NfcAdapter.java
+++ b/core/java/android/nfc/NfcAdapter.java
@@ -711,6 +711,7 @@ public final class NfcAdapter {
                /* Stale sService pointer */
                if (sIsInitialized) sIsInitialized = false;
            }
+            return null;
        }
        /* Try to initialize the service */
        NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);