diff options
| author | Yoshiaki Naka <yoshiaki.naka@sony.com> | 2018-03-12 13:47:35 +0900 |
|---|---|---|
| committer | Ruchi Kandoi <kandoiruchi@google.com> | 2018-03-12 12:27:59 -0700 |
| commit | 1fbd76148b61a489d99a3838c765839c69243543 (patch) | |
| tree | d36e45dda51c2dd9659527be4812aab4146c1b28 | |
| parent | 176b23b2a724fb8157e196ab4ff17a7fe71ab55b (diff) | |
| download | SecureElement-1fbd76148b61a489d99a3838c765839c69243543.tar.gz | |
Access to the default applet shall be blocked by the DUT
OP-011 "access to the default applet is blocked by the DUT" is mandatory
requirement according to GSMA NFC Handset Test Book.
Bug: 73331557
Test: Confirmed that OMAPI TC 6.4.7 ID3b passed with this change.
Change-Id: I0447e2763ec48a3149d2868edf8f3dd6986cb055
| -rw-r--r-- | src/com/android/se/SecureElementService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/se/SecureElementService.java b/src/com/android/se/SecureElementService.java index fd2c168..45b0df4 100644 --- a/src/com/android/se/SecureElementService.java +++ b/src/com/android/se/SecureElementService.java @@ -299,6 +299,9 @@ public final class SecureElementService extends Service { throw new IllegalStateException("Session is closed"); } else if (listener == null) { throw new NullPointerException("listener must not be null"); + } else if (((aid == null) || (aid.length == 0)) && mReader.getTerminal().getName() + .startsWith(SecureElementService.UICC_TERMINAL)) { + return null; } else if ((p2 != 0x00) && (p2 != 0x04) && (p2 != 0x08) && (p2 != (byte) 0x0C)) { throw new UnsupportedOperationException("p2 not supported: " |