diff options
| author | Martijn Coenen <maco@google.com> | 2013-09-18 17:56:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-18 17:56:03 +0000 |
| commit | 807fd0443564850bc69f229a282cbba990e1b656 (patch) | |
| tree | 74dd0c07fd085e701db2f54c93973bc3332ffe24 /core/java/android/nfc | |
| parent | d73d34c873dbf409af3cf6ecbf27cb2be3953b4f (diff) | |
| parent | fca357877307f307934457165a91a1b11e0b6853 (diff) | |
| download | frameworks_base-807fd0443564850bc69f229a282cbba990e1b656.zip frameworks_base-807fd0443564850bc69f229a282cbba990e1b656.tar.gz frameworks_base-807fd0443564850bc69f229a282cbba990e1b656.tar.bz2 | |
Merge "Validate AID format and length." into klp-dev
Diffstat (limited to 'core/java/android/nfc')
| -rw-r--r-- | core/java/android/nfc/cardemulation/ApduServiceInfo.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/nfc/cardemulation/ApduServiceInfo.java b/core/java/android/nfc/cardemulation/ApduServiceInfo.java index 40a3612..d0feaa3 100644 --- a/core/java/android/nfc/cardemulation/ApduServiceInfo.java +++ b/core/java/android/nfc/cardemulation/ApduServiceInfo.java @@ -255,6 +255,10 @@ public final class ApduServiceInfo implements Parcelable { return mRequiresDeviceUnlock; } + public String getDescription() { + return mDescription; + } + public CharSequence loadLabel(PackageManager pm) { return mService.loadLabel(pm); } @@ -287,6 +291,11 @@ public final class ApduServiceInfo implements Parcelable { Log.e(TAG, "AID " + aid + " is not correctly formatted."); return false; } + // Minimum AID length is 5 bytes, 10 hex chars + if (aidLength < 10) { + Log.e(TAG, "AID " + aid + " is shorter than 5 bytes."); + return false; + } return true; } |