Merge "DO NOT MERGE: CDD(8.1) Annotations for section 7.4." into oreo-cts-dev
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/LlcpVersionActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/LlcpVersionActivity.java
index ce5a3d4..7682078 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/LlcpVersionActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/LlcpVersionActivity.java
@@ -19,6 +19,8 @@
import com.android.cts.verifier.PassFailButtons;
import com.android.cts.verifier.R;
+import com.android.compatibility.common.util.CddTest;
+
import android.app.AlertDialog;
import android.app.Dialog;
import android.nfc.NdefMessage;
@@ -35,6 +37,7 @@
/**
* Test activity that sends a particular NDEF Push message to another NFC device.
*/
+@CddTest(requirement="7.4.4/C-1-3")
public class LlcpVersionActivity extends PassFailButtons.Activity implements
NfcAdapter.CreateNdefMessageCallback {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushReceiverActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushReceiverActivity.java
index 0697be2..3644ccb 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushReceiverActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushReceiverActivity.java
@@ -20,6 +20,8 @@
import com.android.cts.verifier.R;
import com.android.cts.verifier.nfc.tech.NfcUtils;
+import com.android.compatibility.common.util.CddTest;
+
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.PendingIntent;
@@ -34,6 +36,7 @@
/**
* Test activity that waits to receive a particular NDEF Push message from another NFC device.
*/
+@CddTest(requirement="7.4.4/C-1-4,C-1-5")
public class NdefPushReceiverActivity extends PassFailButtons.Activity {
private static final int NFC_NOT_ENABLED_DIALOG_ID = 1;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushSenderActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushSenderActivity.java
index 2f77895..3e32ad6 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushSenderActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/NdefPushSenderActivity.java
@@ -19,6 +19,8 @@
import com.android.cts.verifier.PassFailButtons;
import com.android.cts.verifier.R;
+import com.android.compatibility.common.util.CddTest;
+
import android.app.Dialog;
import android.nfc.NdefMessage;
import android.nfc.NdefRecord;
@@ -33,6 +35,7 @@
/**
* Test activity that sends a particular NDEF Push message to another NFC device.
*/
+@CddTest(requirement="7.4.4/C-1-4,C-1-5,C-1-10")
public class NdefPushSenderActivity extends PassFailButtons.Activity implements
NfcAdapter.CreateNdefMessageCallback {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/DualNonPaymentEmulatorActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/DualNonPaymentEmulatorActivity.java
index 0a9362a..877ae4a 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/DualNonPaymentEmulatorActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/DualNonPaymentEmulatorActivity.java
@@ -5,9 +5,12 @@
import android.content.Intent;
import android.os.Bundle;
+import com.android.compatibility.common.util.CddTest;
+
import com.android.cts.verifier.R;
import com.android.cts.verifier.nfc.NfcDialogs;
+@CddTest(requirement="7.4.4/C-2-2")
public class DualNonPaymentEmulatorActivity extends BaseEmulatorActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/DualPaymentEmulatorActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/DualPaymentEmulatorActivity.java
index c17fc2e..626a79f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/DualPaymentEmulatorActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/DualPaymentEmulatorActivity.java
@@ -7,9 +7,12 @@
import android.nfc.cardemulation.CardEmulation;
import android.os.Bundle;
+import com.android.compatibility.common.util.CddTest;
+
import com.android.cts.verifier.R;
import com.android.cts.verifier.nfc.NfcDialogs;
+@CddTest(requirement="7.4.4/C-2-2")
@TargetApi(19)
public class DualPaymentEmulatorActivity extends BaseEmulatorActivity {
final static int STATE_IDLE = 0;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/ForegroundPaymentEmulatorActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/ForegroundPaymentEmulatorActivity.java
index 27cb061..325713c5 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/ForegroundPaymentEmulatorActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/ForegroundPaymentEmulatorActivity.java
@@ -8,9 +8,12 @@
import android.os.Bundle;
import android.util.Log;
+import com.android.compatibility.common.util.CddTest;
+
import com.android.cts.verifier.R;
import com.android.cts.verifier.nfc.NfcDialogs;
+@CddTest(requirement="7.4.4/C-2-2")
@TargetApi(19)
public class ForegroundPaymentEmulatorActivity extends BaseEmulatorActivity {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/HceEmulatorTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/HceEmulatorTestActivity.java
index b30bb73..aad5f27 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/HceEmulatorTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/HceEmulatorTestActivity.java
@@ -21,6 +21,8 @@
import com.android.cts.verifier.R;
import com.android.cts.verifier.TestListAdapter.TestListItem;
+import com.android.compatibility.common.util.CddTest;
+
import android.content.Intent;
import android.content.pm.PackageManager;
import android.nfc.NfcAdapter;
@@ -29,6 +31,7 @@
import android.os.Bundle;
/** Activity that lists all the NFC HCE emulator tests. */
+@CddTest(requirement="7.4.4/C-2-2")
public class HceEmulatorTestActivity extends PassFailButtons.TestListActivity {
@Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/ProtocolParamsReaderActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/ProtocolParamsReaderActivity.java
index d3504ff..b7072f5 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/ProtocolParamsReaderActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/ProtocolParamsReaderActivity.java
@@ -9,11 +9,14 @@
import android.os.Bundle;
import android.widget.TextView;
+import com.android.compatibility.common.util.CddTest;
+
import com.android.cts.verifier.PassFailButtons;
import com.android.cts.verifier.R;
import java.io.IOException;
+@CddTest(requirement="7.4.4/C-2-2,C-2-2")
@TargetApi(19)
public class ProtocolParamsReaderActivity extends PassFailButtons.Activity implements ReaderCallback {
public static final String TAG = "ProtocolParamsReaderActivity";
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/SingleNonPaymentEmulatorActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/SingleNonPaymentEmulatorActivity.java
index 694199b..988499f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/SingleNonPaymentEmulatorActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/SingleNonPaymentEmulatorActivity.java
@@ -5,9 +5,12 @@
import android.content.Intent;
import android.os.Bundle;
+import com.android.compatibility.common.util.CddTest;
+
import com.android.cts.verifier.R;
import com.android.cts.verifier.nfc.NfcDialogs;
+@CddTest(requirement="7.4.4/C-2-2")
public class SingleNonPaymentEmulatorActivity extends BaseEmulatorActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/SinglePaymentEmulatorActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/SinglePaymentEmulatorActivity.java
index 0f1fba0..deab6a0 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/SinglePaymentEmulatorActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/SinglePaymentEmulatorActivity.java
@@ -8,6 +8,9 @@
import com.android.cts.verifier.R;
import com.android.cts.verifier.nfc.NfcDialogs;
+import com.android.compatibility.common.util.CddTest;
+
+@CddTest(requirement="7.4.4/C-2-2")
@TargetApi(19)
public class SinglePaymentEmulatorActivity extends BaseEmulatorActivity {
@Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/TapTestEmulatorActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/TapTestEmulatorActivity.java
index 2eea89c..665fba24 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/TapTestEmulatorActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hce/TapTestEmulatorActivity.java
@@ -7,9 +7,12 @@
import android.os.Bundle;
import android.widget.TextView;
+import com.android.compatibility.common.util.CddTest;
+
import com.android.cts.verifier.R;
import com.android.cts.verifier.nfc.NfcDialogs;
+@CddTest(requirement="7.4.4/C-2-2")
@TargetApi(19)
public class TapTestEmulatorActivity extends BaseEmulatorActivity {
TextView mTextView;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hcef/HceFEmulatorActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hcef/HceFEmulatorActivity.java
index 7118ae3..fc2bfc6 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hcef/HceFEmulatorActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hcef/HceFEmulatorActivity.java
@@ -24,9 +24,12 @@
import android.nfc.cardemulation.NfcFCardEmulation;
import android.os.Bundle;
+import com.android.compatibility.common.util.CddTest;
+
import com.android.cts.verifier.PassFailButtons;
import com.android.cts.verifier.R;
+@CddTest(requirement="7.4.4/C-3-2")
public class HceFEmulatorActivity extends PassFailButtons.Activity{
static String ACTION_TEST_SUCCESS = "success";
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hcef/HceFReaderActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hcef/HceFReaderActivity.java
index 9b0d669..351e79b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hcef/HceFReaderActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/hcef/HceFReaderActivity.java
@@ -26,11 +26,14 @@
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
+import com.android.compatibility.common.util.CddTest;
+
import com.android.cts.verifier.PassFailButtons;
import com.android.cts.verifier.R;
import java.io.IOException;
+@CddTest(requirement="7.4.4/C-3-2")
@TargetApi(24)
public class HceFReaderActivity extends PassFailButtons.Activity implements ReaderCallback,
OnItemSelectedListener {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/tech/MifareUltralightTagTester.java b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/tech/MifareUltralightTagTester.java
index 038d276..818051f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/nfc/tech/MifareUltralightTagTester.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/nfc/tech/MifareUltralightTagTester.java
@@ -19,6 +19,8 @@
import android.nfc.Tag;
import android.nfc.tech.MifareUltralight;
+import com.android.compatibility.common.util.CddTest;
+
import java.io.IOException;
import java.util.Arrays;
import java.util.Random;
@@ -27,6 +29,7 @@
* {@link TagTester} for MIFARE Ultralight tags. It writes random bytes to the
* tag's first user page and verifies that it matches when scanned later.
*/
+@CddTest(requirement="7.4.4/C-4-1")
public class MifareUltralightTagTester implements TagTester {
private static final int USER_PAGE_OFFSET = 5;