commit ffe4fca9300f471c3f745e6dc437b13f10ccd9e2
author Unsuk Jung <unsuk@google.com> Fri Nov 07 21:45:39 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 07 21:45:39 2014 +0000
tree 2e2b2e0b9a8f885275a9f39b06b3b542f9f98e9f
parent 0edd3a1a2c02a910cb9810fee84562eeb72add7e
parent 2755b55beb0e4dd4c2883c20ec543c0569543222

am 2755b55b: Merge "Revert "CTS Verifier: hide AID prefix reader test if no support"" into lmp-dev

* commit '2755b55beb0e4dd4c2883c20ec543c0569543222':
  Revert "CTS Verifier: hide AID prefix reader test if no support"

apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/HceReaderTestActivity.java

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 8beacd3..f628fb7 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 @@
                     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,
+                    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_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_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_other_conflicting_prefix_aids_reader,
+                    SimpleReaderActivity.class.getName(),
+                    ConflictingNonPaymentPrefixEmulatorActivity.buildReaderIntent(this), null));
         }
 
         setTestListAdapter(adapter);