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

Commit e39b9544 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "nfc(api): Restore behavior from Android T (follow-up)" into main am: 34b915e1 

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



Change-Id: I4e2d52276a631c9a25aff452bc85f6e67aea8fac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a85cf171 34b915e1

core/java/android/nfc/NfcAdapter.java

+19 −11
Original line number Diff line number Diff line
@@ -600,6 +600,17 @@ public final class NfcAdapter { 
        return offHostSE;

    }



    private static void retrieveServiceRegisterer() {

        if (sServiceRegisterer == null) {

            NfcServiceManager manager = NfcFrameworkInitializer.getNfcServiceManager();

            if (manager == null) {

                Log.e(TAG, "NfcServiceManager is null");

                throw new UnsupportedOperationException();

            }

            sServiceRegisterer = manager.getNfcManagerServiceRegisterer();

        }

    }



    /**

     * Returns the NfcAdapter for application context,

     * or throws if NFC is not available.
@@ -627,12 +638,7 @@ public final class NfcAdapter { 
                Log.v(TAG, "this device does not have NFC support");

                throw new UnsupportedOperationException();

            }

            NfcServiceManager manager = NfcFrameworkInitializer.getNfcServiceManager();

            if (manager == null) {

                Log.e(TAG, "NfcServiceManager is null");

                throw new UnsupportedOperationException();

            }

            sServiceRegisterer = manager.getNfcManagerServiceRegisterer();

            retrieveServiceRegisterer();

            sService = getServiceInterface();

            if (sService == null) {

                Log.e(TAG, "could not retrieve NFC service");
@@ -706,12 +712,14 @@ public final class NfcAdapter { 
            throw new IllegalArgumentException(

                    "context not associated with any application (using a mock context?)");

        }



        if (sIsInitialized && sServiceRegisterer.tryGet() == null) {

        retrieveServiceRegisterer();

        if (sServiceRegisterer.tryGet() == null) {

            if (sIsInitialized) {

                synchronized (NfcAdapter.class) {

                    /* Stale sService pointer */

                    if (sIsInitialized) sIsInitialized = false;

                }

            }

            return null;

        }

        /* Try to initialize the service */