Push Tag/NdefTag implementation details into the service.

Tag/NdefTag objects should just be simple data objects. Push the mapping of
internal tag type to public rawTarget/ndefTarget into Nfc Service.

This gives an oppurtunity to clean up some Tag/NdefTag API methods. Most
significantly, adding createMockTag() and createMockNdefTag() to help with
application testing.

There will probably be some more tweaking of the types/targets in
Tag/NdefTag to come, this commit makes that a lot easier.

Also:
- Introduce getActivationBytes() and getPollBytes(). These are just stubs
for NFC service to implement, we have feedback these are really important
to help identify NFC tags.
- Based on outside advice, remove 3B_PRIME (roll into 3B) and TOPAZ (roll
into 3A).

Change-Id: I3e6789c047f6ee5c298bf76c65e0885cf3c15d97
Signed-off-by: Nick Pelly <npelly@google.com>

1 files changed, 64 insertions, 22 deletions

diff --git a/api/current.xml b/api/current.xml
index 8aba74a..c91c2b5 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -100172,6 +100172,29 @@
 >
 <implements name="android.os.Parcelable">
 </implements>
+<method name="createMockNdefTag"
+ return="android.nfc.NdefTag"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="id" type="byte[]">
+</parameter>
+<parameter name="rawTargets" type="java.lang.String[]">
+</parameter>
+<parameter name="pollBytes" type="byte[]">
+</parameter>
+<parameter name="activationBytes" type="byte[]">
+</parameter>
+<parameter name="ndefTargets" type="java.lang.String[]">
+</parameter>
+<parameter name="messages" type="android.nfc.NdefMessage[][]">
+</parameter>
+</method>
 <method name="getNdefMessages"
  return="android.nfc.NdefMessage[]"
  abstract="false"
@@ -100641,6 +100664,25 @@
 >
 <implements name="android.os.Parcelable">
 </implements>
+<method name="createMockTag"
+ return="android.nfc.Tag"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="id" type="byte[]">
+</parameter>
+<parameter name="rawTargets" type="java.lang.String[]">
+</parameter>
+<parameter name="pollBytes" type="byte[]">
+</parameter>
+<parameter name="activationBytes" type="byte[]">
+</parameter>
+</method>
 <method name="describeContents"
  return="int"
  abstract="false"
@@ -100652,6 +100694,17 @@
  visibility="public"
 >
 </method>
+<method name="getActivationBytes"
+ return="byte[]"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getId"
  return="byte[]"
  abstract="false"
@@ -100663,6 +100716,17 @@
  visibility="public"
 >
 </method>
+<method name="getPollBytes"
+ return="byte[]"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getRawTargets"
  return="java.lang.String[]"
  abstract="false"
@@ -100721,17 +100785,6 @@
  visibility="public"
 >
 </field>
-<field name="TARGET_ISO_14443_3B_PRIME"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;iso14443_3b&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="TARGET_ISO_14443_4"
  type="java.lang.String"
  transient="false"
@@ -100776,17 +100829,6 @@
  visibility="public"
 >
 </field>
-<field name="TARGET_TOPAZ"
- type="java.lang.String"
- transient="false"
- volatile="false"
- value="&quot;topaz&quot;"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 </class>
 </package>
 <package name="android.opengl"