diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/nfc/cardemulation/ApduServiceInfo.java | 3 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/core/java/android/nfc/cardemulation/ApduServiceInfo.java b/core/java/android/nfc/cardemulation/ApduServiceInfo.java index ffa7d7e..3f7e3ef 100644 --- a/core/java/android/nfc/cardemulation/ApduServiceInfo.java +++ b/core/java/android/nfc/cardemulation/ApduServiceInfo.java @@ -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); diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 130123f..cbc6c5c 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -643,6 +643,23 @@ public final class 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> * In some cases, a matching Activity may not exist, so ensure you |