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

Commit 7a57a3b0 authored by James Willcox's avatar James Willcox
Browse files

Use a static getter to fetch the preferred payment setting 

We need to use this from the system server before the NFC service has
started. This makes getting an instance of `CardEmulation` difficult, so
instead make it into a static method and access the setting directly
instead of via the service.

Bug: 321098555
Test: manual,NFC CTS tests
Change-Id: I92e7cfeb595a13b8d544b4a3169601748fef7101
parent e8c4c3b0

nfc/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ package android.nfc { 
package android.nfc.cardemulation {



  public final class CardEmulation {

    method @FlaggedApi("android.permission.flags.wallet_role_enabled") @Nullable @RequiresPermission(android.Manifest.permission.NFC_PREFERRED_PAYMENT_INFO) public android.nfc.cardemulation.ApduServiceInfo getPreferredPaymentService();

    method @FlaggedApi("android.permission.flags.wallet_role_enabled") @Nullable @RequiresPermission(android.Manifest.permission.NFC_PREFERRED_PAYMENT_INFO) public static android.content.ComponentName getPreferredPaymentService(@NonNull android.content.Context);

    method @FlaggedApi("android.nfc.enable_nfc_mainline") @NonNull public java.util.List<android.nfc.cardemulation.ApduServiceInfo> getServices(@NonNull String, int);

  }

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

+17 −18
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.nfc.cardemulation;



import android.Manifest;

import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -23,6 +24,7 @@ import android.annotation.RequiresPermission; 
import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;

import android.annotation.UserHandleAware;

import android.annotation.UserIdInt;

import android.app.Activity;

import android.content.ComponentName;
@@ -1090,31 +1092,28 @@ public final class CardEmulation { 
    }



    /**

     * Returns the {@link Settings.Secure#NFC_PAYMENT_DEFAULT_COMPONENT} for the given user.

     * Returns the value of {@link Settings.Secure#NFC_PAYMENT_DEFAULT_COMPONENT}.

     *

     * @param context A context

     * @return A ComponentName for the setting value, or null.

     *

     * @hide

     */

    @SystemApi

    @UserHandleAware

    @RequiresPermission(android.Manifest.permission.NFC_PREFERRED_PAYMENT_INFO)

    @SuppressWarnings("AndroidFrameworkClientSidePermissionCheck")

    @FlaggedApi(android.permission.flags.Flags.FLAG_WALLET_ROLE_ENABLED)

    @Nullable

    public ApduServiceInfo getPreferredPaymentService() {

        try {

            return sService.getPreferredPaymentService(mContext.getUser().getIdentifier());

        } catch (RemoteException e) {

            // Try one more time

            recoverService();

            if (sService == null) {

                Log.e(TAG, "Failed to recover CardEmulationService.");

                return null;

            }

            try {

                return sService.getPreferredPaymentService(mContext.getUser().getIdentifier());

            } catch (RemoteException ee) {

                Log.e(TAG, "Failed to reach CardEmulationService.");

    public static ComponentName getPreferredPaymentService(@NonNull Context context) {

        context.checkCallingOrSelfPermission(Manifest.permission.NFC_PREFERRED_PAYMENT_INFO);

        String defaultPaymentComponent = Settings.Secure.getString(context.getContentResolver(),

                Constants.SETTINGS_SECURE_NFC_PAYMENT_DEFAULT_COMPONENT);



        if (defaultPaymentComponent == null) {

            return null;

        }

        }

    }



        return ComponentName.unflattenFromString(defaultPaymentComponent);

    }

}