diff options
| author | Unsuk Jung <unsuk@google.com> | 2014-11-07 21:38:09 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-11-07 17:40:48 -0800 |
| commit | c472edb4b7573a45df97395cb3150c363672d9dc (patch) | |
| tree | 2373ef0506a4161b3ca8288d1ba3c7debb390486 | |
| parent | c1f2e70ea4c8d0d4f58067c45549c52fc5d68caf (diff) | |
| download | cts-c472edb4b7573a45df97395cb3150c363672d9dc.tar.gz | |
Revert "CTS Verifier: hide AID prefix reader test if no support"android-5.0.0_r7android-5.0.0_r6
This reverts commit 965de72e268037b53930215c8413c912a921265e.
Change-Id: Ifd9ba30820c4b9c23300b3dff60e12ac2d541262
| -rw-r--r-- | apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/HceReaderTestActivity.java | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/HceReaderTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/HceReaderTestActivity.java index 8beacd35bc8..f628fb78015 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/HceReaderTestActivity.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/HceReaderTestActivity.java @@ -101,23 +101,21 @@ public class HceReaderTestActivity extends PassFailButtons.TestListActivity { SimpleReaderActivity.class.getName(), DynamicAidEmulatorActivity.buildReaderIntent(this), null)); - if (cardEmulation.supportsAidPrefixRegistration()) { - adapter.add(TestListItem.newTest(this, R.string.nfc_hce_payment_prefix_aids_reader, - SimpleReaderActivity.class.getName(), - PrefixPaymentEmulatorActivity.buildReaderIntent(this), null)); - - adapter.add(TestListItem.newTest(this, R.string.nfc_hce_payment_prefix_aids_reader_2, - SimpleReaderActivity.class.getName(), - PrefixPaymentEmulator2Activity.buildReaderIntent(this), null)); - - adapter.add(TestListItem.newTest(this, R.string.nfc_hce_other_prefix_aids_reader, - SimpleReaderActivity.class.getName(), - DualNonPaymentPrefixEmulatorActivity.buildReaderIntent(this), null)); - - adapter.add(TestListItem.newTest(this, R.string.nfc_hce_other_conflicting_prefix_aids_reader, - SimpleReaderActivity.class.getName(), - ConflictingNonPaymentPrefixEmulatorActivity.buildReaderIntent(this), null)); - } + adapter.add(TestListItem.newTest(this, R.string.nfc_hce_payment_prefix_aids_reader, + SimpleReaderActivity.class.getName(), + PrefixPaymentEmulatorActivity.buildReaderIntent(this), null)); + + adapter.add(TestListItem.newTest(this, R.string.nfc_hce_payment_prefix_aids_reader_2, + SimpleReaderActivity.class.getName(), + PrefixPaymentEmulator2Activity.buildReaderIntent(this), null)); + + adapter.add(TestListItem.newTest(this, R.string.nfc_hce_other_prefix_aids_reader, + SimpleReaderActivity.class.getName(), + DualNonPaymentPrefixEmulatorActivity.buildReaderIntent(this), null)); + + adapter.add(TestListItem.newTest(this, R.string.nfc_hce_other_conflicting_prefix_aids_reader, + SimpleReaderActivity.class.getName(), + ConflictingNonPaymentPrefixEmulatorActivity.buildReaderIntent(this), null)); } setTestListAdapter(adapter); |