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

Merge "Validate AID format and length." into klp-dev

Browse Source
This commit is contained in:
Martijn Coenen
2013-09-18 17:56:02 +00:00
committed by Android (Google) Code Review
parent d73d34c873 fca3578773
commit 807fd04435
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,6 +255,10 @@ public final class ApduServiceInfo implements Parcelable {
return mRequiresDeviceUnlock; return mRequiresDeviceUnlock;
} }
public String getDescription() {
return mDescription;
}
public CharSequence loadLabel(PackageManager pm) { public CharSequence loadLabel(PackageManager pm) {
return mService.loadLabel(pm); return mService.loadLabel(pm);
} }
@@ -287,6 +291,11 @@ public final class ApduServiceInfo implements Parcelable {
Log.e(TAG, "AID " + aid + " is not correctly formatted."); Log.e(TAG, "AID " + aid + " is not correctly formatted.");
return false; 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; return true;
} }