| commit | f61798c69d2da2314cdd5dcde1f48709c10c52de | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Wed Jun 21 00:28:25 2023 +0000 |
| committer | Roshan Pius <rpius@google.com> | Tue Aug 22 13:35:43 2023 -0700 |
| tree | 02a82464b832061e66eeddad6402579e706682ea | |
| parent | 798b1fe4e85744fabe949451b5eb38f581bfd844 [diff] |
nfc(api): Restore behavior from Android T When Nfc service is not ready, dont fetch NfcManager to avoid getting into a state where the app keeps getting a bad NfcManager. Restoring the fix from aosp/1498599. Bug: 286025476 Test: Manual tests Merged-In: I4aaa0a87c38eaddccc566c18b75cd1acedc29d75 Change-Id: I4aaa0a87c38eaddccc566c18b75cd1acedc29d75
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index 7d0cf9c..36199e5 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java
@@ -712,6 +712,7 @@ /* Stale sService pointer */ if (sIsInitialized) sIsInitialized = false; } + return null; } /* Try to initialize the service */ NfcManager manager = (NfcManager) context.getSystemService(Context.NFC_SERVICE);