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

Commit 62c196ab authored by Martijn Coenen's avatar Martijn Coenen
Browse files

NFC: always upper-case parsed AIDs. 

Also added activity intent action for Tap&Pay settings.

Change-Id: I5648e1ded3b79a3363899d1cab8aec55842b3e22
parent 7a605df3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -20716,6 +20716,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";

    field public static final java.lang.String ACTION_NETWORK_OPERATOR_SETTINGS = "android.settings.NETWORK_OPERATOR_SETTINGS";

    field public static final java.lang.String ACTION_NFCSHARING_SETTINGS = "android.settings.NFCSHARING_SETTINGS";

    field public static final java.lang.String ACTION_NFC_PAYMENT_SETTINGS = "android.settings.NFC_PAYMENT_SETTINGS";

    field public static final java.lang.String ACTION_NFC_SETTINGS = "android.settings.NFC_SETTINGS";

    field public static final java.lang.String ACTION_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS";

    field public static final java.lang.String ACTION_QUICK_LAUNCH_SETTINGS = "android.settings.QUICK_LAUNCH_SETTINGS";

core/java/android/nfc/cardemulation/ApduServiceInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -188,7 +188,8 @@ public final class ApduServiceInfo implements Parcelable { 
                        currentGroup != null) {

                    final TypedArray a = res.obtainAttributes(attrs,

                            com.android.internal.R.styleable.AidFilter);

                    String aid = a.getString(com.android.internal.R.styleable.AidFilter_name);

                    String aid = a.getString(com.android.internal.R.styleable.AidFilter_name).

                            toUpperCase();

                    if (isValidAid(aid) && !currentGroup.aids.contains(aid)) {

                        currentGroup.aids.add(aid);

                        mAids.add(aid);

core/java/android/provider/Settings.java

+17 −0
Original line number Diff line number Diff line
@@ -642,6 +642,23 @@ public final class Settings { 
    public static final String ACTION_NFCSHARING_SETTINGS =

        "android.settings.NFCSHARING_SETTINGS";



    /**

     * Activity Action: Show NFC Tap & Pay settings

     * <p>

     * This shows UI that allows the user to configure Tap&Pay

     * settings.

     * <p>

     * In some cases, a matching Activity may not exist, so ensure you

     * safeguard against this.

     * <p>

     * Input: Nothing.

     * <p>

     * Output: Nothing

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_NFC_PAYMENT_SETTINGS =

        "android.settings.NFC_PAYMENT_SETTINGS";



    /**

     * Activity Action: Show Daydream settings.

     * <p>