Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac6d602a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "nfc(api): Restore behavior from Android T" into udc-dev am: 004bbcdb am: 872042dd am: 7b1e88ff

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



Change-Id: I7d36ca715ac2b6fef09ddac5ac10184a320c9323
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4fb4ccb8 7b1e88ff

core/java/android/nfc/NfcAdapter.java

+1 −0
Original line number Diff line number Diff line
@@ -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);