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

Commit 79b0d29a authored by George Chang's avatar George Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix getSelectionModeForCategory" into sc-dev am: 9cf0e7bb 

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

Change-Id: Ia8d25094fbb87468a53cdcba151750c557a0c085
parents 009492eb 9cf0e7bb

core/java/android/nfc/INfcCardEmulation.aidl

+1 −0
Original line number Diff line number Diff line
@@ -40,4 +40,5 @@ interface INfcCardEmulation 
    boolean unsetPreferredService();

    boolean supportsAidPrefixRegistration();

    ApduServiceInfo getPreferredPaymentService(int userHandle);

    boolean isDefaultPaymentRegistered();

}

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

+17 −3
Original line number Diff line number Diff line
@@ -294,9 +294,23 @@ public final class CardEmulation { 
     */

    public int getSelectionModeForCategory(String category) {

        if (CATEGORY_PAYMENT.equals(category)) {

            String defaultComponent = Settings.Secure.getString(mContext.getContentResolver(),

                    Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT);

            if (defaultComponent != null) {

            boolean paymentRegistered = false;

            try {

                paymentRegistered = sService.isDefaultPaymentRegistered();

            } catch (RemoteException e) {

                recoverService();

                if (sService == null) {

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

                    return SELECTION_MODE_ALWAYS_ASK;

                }

                try {

                    paymentRegistered = sService.isDefaultPaymentRegistered();

                } catch (RemoteException ee) {

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

                    return SELECTION_MODE_ALWAYS_ASK;

                }

            }

            if (paymentRegistered) {

                return SELECTION_MODE_PREFER_DEFAULT;

            } else {

                return SELECTION_MODE_ALWAYS_ASK;