Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NFC: always upper-case parsed AIDs." into klp-dev

Browse Source
This commit is contained in:
Martijn Coenen
2013-08-09 20:47:49 +00:00
committed by Android (Google) Code Review
parent be11c364e7 62c196abd2
commit 4bcc8ee682
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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";

3
core/java/android/nfc/cardemulation/ApduServiceInfo.java
View File

@@ -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);

17
core/java/android/provider/Settings.java
View File

@@ -643,6 +643,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>