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

Commit 4215d4a2 authored by Daniel Chapin's avatar Daniel Chapin Committed by Gerrit Code Review
Browse files

Merge changes from topic "revert-2264526-QTJABPYRJT" 

* changes:
  Revert "Get PackageManager from Context"
  Revert "Use waitForService() istead of getService()"
parents d5441ca5 db37a06c

core/java/android/nfc/NfcAdapter.java

+83 −36
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.app.PendingIntent; 
import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.IntentFilter;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.net.Uri;

import android.nfc.tech.MifareClassic;
@@ -524,6 +525,66 @@ public final class NfcAdapter { 
        public boolean onUnlockAttempted(Tag tag);

    }



    /**

     * Helper to check if this device has FEATURE_NFC_BEAM, but without using

     * a context.

     * Equivalent to

     * context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC_BEAM)

     */

    private static boolean hasBeamFeature() {

        IPackageManager pm = ActivityThread.getPackageManager();

        if (pm == null) {

            Log.e(TAG, "Cannot get package manager, assuming no Android Beam feature");

            return false;

        }

        try {

            return pm.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM, 0);

        } catch (RemoteException e) {

            Log.e(TAG, "Package manager query failed, assuming no Android Beam feature", e);

            return false;

        }

    }



    /**

     * Helper to check if this device has FEATURE_NFC, but without using

     * a context.

     * Equivalent to

     * context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC)

     */

    private static boolean hasNfcFeature() {

        IPackageManager pm = ActivityThread.getPackageManager();

        if (pm == null) {

            Log.e(TAG, "Cannot get package manager, assuming no NFC feature");

            return false;

        }

        try {

            return pm.hasSystemFeature(PackageManager.FEATURE_NFC, 0);

        } catch (RemoteException e) {

            Log.e(TAG, "Package manager query failed, assuming no NFC feature", e);

            return false;

        }

    }



    /**

     * Helper to check if this device is NFC HCE capable, by checking for

     * FEATURE_NFC_HOST_CARD_EMULATION and/or FEATURE_NFC_HOST_CARD_EMULATION_NFCF,

     * but without using a context.

     */

    private static boolean hasNfcHceFeature() {

        IPackageManager pm = ActivityThread.getPackageManager();

        if (pm == null) {

            Log.e(TAG, "Cannot get package manager, assuming no NFC feature");

            return false;

        }

        try {

            return pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION, 0)

                || pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION_NFCF, 0);

        } catch (RemoteException e) {

            Log.e(TAG, "Package manager query failed, assuming no NFC feature", e);

            return false;

        }

    }



    /**

     * Return list of Secure Elements which support off host card emulation.

     *
@@ -533,22 +594,24 @@ public final class NfcAdapter { 
     * @hide

     */

    public @NonNull List<String> getSupportedOffHostSecureElements() {

        if (mContext == null) {

            throw new UnsupportedOperationException("You need a context on NfcAdapter to use the "

                    + " getSupportedOffHostSecureElements APIs");

        }

        List<String> offHostSE = new ArrayList<String>();

        PackageManager pm = mContext.getPackageManager();

        IPackageManager pm = ActivityThread.getPackageManager();

        if (pm == null) {

            Log.e(TAG, "Cannot get package manager, assuming no off-host CE feature");

            return offHostSE;

        }

        if (pm.hasSystemFeature(PackageManager.FEATURE_NFC_OFF_HOST_CARD_EMULATION_UICC)) {

        try {

            if (pm.hasSystemFeature(PackageManager.FEATURE_NFC_OFF_HOST_CARD_EMULATION_UICC, 0)) {

                offHostSE.add("SIM");

            }

        if (pm.hasSystemFeature(PackageManager.FEATURE_NFC_OFF_HOST_CARD_EMULATION_ESE)) {

            if (pm.hasSystemFeature(PackageManager.FEATURE_NFC_OFF_HOST_CARD_EMULATION_ESE, 0)) {

                offHostSE.add("eSE");

            }

        } catch (RemoteException e) {

            Log.e(TAG, "Package manager query failed, assuming no off-host CE feature", e);

            offHostSE.clear();

            return offHostSE;

        }

        return offHostSE;

    }
@@ -559,19 +622,10 @@ public final class NfcAdapter { 
     */

    @UnsupportedAppUsage

    public static synchronized NfcAdapter getNfcAdapter(Context context) {

        if (context == null) {

            if (sNullContextNfcAdapter == null) {

                sNullContextNfcAdapter = new NfcAdapter(null);

            }

            return sNullContextNfcAdapter;

        }

        if (!sIsInitialized) {

            PackageManager pm = context.getPackageManager();

            sHasNfcFeature = pm.hasSystemFeature(PackageManager.FEATURE_NFC);

            sHasBeamFeature = pm.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM);

            boolean hasHceFeature =

                    pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)

                    || pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION_NFCF);

            sHasNfcFeature = hasNfcFeature();

            sHasBeamFeature = hasBeamFeature();

            boolean hasHceFeature = hasNfcHceFeature();

            /* is this device meant to have NFC */

            if (!sHasNfcFeature && !hasHceFeature) {

                Log.v(TAG, "this device does not have NFC support");
@@ -607,6 +661,12 @@ public final class NfcAdapter { 


            sIsInitialized = true;

        }

        if (context == null) {

            if (sNullContextNfcAdapter == null) {

                sNullContextNfcAdapter = new NfcAdapter(null);

            }

            return sNullContextNfcAdapter;

        }

        NfcAdapter adapter = sNfcAdapters.get(context);

        if (adapter == null) {

            adapter = new NfcAdapter(context);
@@ -617,12 +677,8 @@ public final class NfcAdapter { 


    /** get handle to NFC service interface */

    private static INfcAdapter getServiceInterface() {

        if (!sHasNfcFeature) {

            /* NFC is not supported */

            return null;

        }

        /* get a handle to NFC service */

        IBinder b = ServiceManager.waitForService("nfc");

        IBinder b = ServiceManager.getService("nfc");

        if (b == null) {

            return null;

        }
@@ -652,15 +708,6 @@ public final class NfcAdapter { 
                    "context not associated with any application (using a mock context?)");

        }



        synchronized (NfcAdapter.class) {

            if (!sIsInitialized) {

                PackageManager pm = context.getPackageManager();

                sHasNfcFeature = pm.hasSystemFeature(PackageManager.FEATURE_NFC);

            }

            if (!sHasNfcFeature) {

                return null;

            }

        }

        if (getServiceInterface() == null) {

            // NFC is not available

            return null;

core/java/android/nfc/cardemulation/CardEmulation.java

+10 −3
Original line number Diff line number Diff line
@@ -22,9 +22,11 @@ import android.annotation.RequiresPermission; 
import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.app.Activity;

import android.app.ActivityThread;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.nfc.INfcCardEmulation;

import android.nfc.NfcAdapter;
@@ -156,15 +158,20 @@ public final class CardEmulation { 
            throw new UnsupportedOperationException();

        }

        if (!sIsInitialized) {

            PackageManager pm = context.getPackageManager();

            IPackageManager pm = ActivityThread.getPackageManager();

            if (pm == null) {

                Log.e(TAG, "Cannot get PackageManager");

                throw new UnsupportedOperationException();

            }

            if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {

            try {

                if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION, 0)) {

                    Log.e(TAG, "This device does not support card emulation");

                    throw new UnsupportedOperationException();

                }

            } catch (RemoteException e) {

                Log.e(TAG, "PackageManager query failed.");

                throw new UnsupportedOperationException();

            }

            sIsInitialized = true;

        }

        CardEmulation manager = sCardEmus.get(context);

core/java/android/nfc/cardemulation/NfcFCardEmulation.java

+10 −3
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ 
package android.nfc.cardemulation;



import android.app.Activity;

import android.app.ActivityThread;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.nfc.INfcFCardEmulation;

import android.nfc.NfcAdapter;
@@ -68,15 +70,20 @@ public final class NfcFCardEmulation { 
            throw new UnsupportedOperationException();

        }

        if (!sIsInitialized) {

            PackageManager pm = context.getPackageManager();

            IPackageManager pm = ActivityThread.getPackageManager();

            if (pm == null) {

                Log.e(TAG, "Cannot get PackageManager");

                throw new UnsupportedOperationException();

            }

            if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION_NFCF)) {

            try {

                if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION_NFCF, 0)) {

                    Log.e(TAG, "This device does not support NFC-F card emulation");

                    throw new UnsupportedOperationException();

                }

            } catch (RemoteException e) {

                Log.e(TAG, "PackageManager query failed.");

                throw new UnsupportedOperationException();

            }

            sIsInitialized = true;

        }

        NfcFCardEmulation manager = sCardEmus.get(context);