Make MifareClassic methods more consistent.

Remove method overloading for combinations of sector+block addressing.
Instead provide methods that more closly match the raw commands, and more
efficient helpers to convert between blocks and sectors.

o fix off-by-one bug in getBlockCountInSector()
o add BLOCK_SIZE
o remove DESFIRE not operating in classic emulation (SAK 0x20)
o hide isEmulated(), there is no use case, and the info is available elsewhere
o getTotalBlockCount() -> getBlockCount()
o getBlockCount(int) -> getBlockCountInSector(int)
o introduce blockToSector() and sectorToBlock()
o remove authenticateBlock()
    make it really clear that authentication is per sector, and reduce function
    explosion. blockToSector() allows you to use authenticateSector...
o explicit authenticateSectorWithKeyA() / authenticateSectorWithKeyB()
    get rid of magic boolean
o remove all (int sector, int block) parameters
    always address by absolute block. this makes the API crystal clear, and
    helps reduce function explosion
o validation of all sector and block indices
o dont & 0xff when converting to byte - its redundant
o Remove TYPE_OTHER. Mifare Classic types are well-known and stable.

Change-Id: I3c9f8254ff307f31b388b3d7592c862d5de6afa5

Author: Nick Pelly

api/current.xml

@@ -101246,7 +101246,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<method name="authenticateBlock"
+<method name="authenticateSectorWithKeyA"
  return="boolean"
  abstract="false"
  native="false"
@@ -101256,16 +101256,14 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="block" type="int">
+<parameter name="sectorIndex" type="int">
 </parameter>
 <parameter name="key" type="byte[]">
 </parameter>
-<parameter name="keyA" type="boolean">
-</parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
-<method name="authenticateSector"
+<method name="authenticateSectorWithKeyB"
  return="boolean"
  abstract="false"
  native="false"
@@ -101275,17 +101273,15 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="sector" type="int">
+<parameter name="sectorIndex" type="int">
 </parameter>
 <parameter name="key" type="byte[]">
 </parameter>
-<parameter name="keyA" type="boolean">
-</parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
-<method name="decrement"
- return="void"
+<method name="blockToSector"
+ return="int"
  abstract="false"
  native="false"
  synchronized="false"
@@ -101294,38 +101290,38 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="block" type="int">
+<parameter name="blockIndex" type="int">
 </parameter>
-<exception name="IOException" type="java.io.IOException">
-</exception>
 </method>
-<method name="get"
- return="android.nfc.tech.MifareClassic"
+<method name="decrement"
+ return="void"
  abstract="false"
  native="false"
  synchronized="false"
- static="true"
+ static="false"
  final="false"
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="tag" type="android.nfc.Tag">
+<parameter name="blockIndex" type="int">
 </parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
 </method>
-<method name="getBlockCount"
- return="int"
+<method name="get"
+ return="android.nfc.tech.MifareClassic"
  abstract="false"
  native="false"
  synchronized="false"
- static="false"
+ static="true"
  final="false"
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="sector" type="int">
+<parameter name="tag" type="android.nfc.Tag">
 </parameter>
 </method>
-<method name="getSectorCount"
+<method name="getBlockCount"
  return="int"
  abstract="false"
  native="false"
@@ -101336,7 +101332,7 @@
  visibility="public"
 >
 </method>
-<method name="getSectorSize"
+<method name="getBlockCountInSector"
  return="int"
  abstract="false"
  native="false"
@@ -101346,10 +101342,10 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="sector" type="int">
+<parameter name="sectorIndex" type="int">
 </parameter>
 </method>
-<method name="getSize"
+<method name="getSectorCount"
  return="int"
  abstract="false"
  native="false"
@@ -101360,7 +101356,7 @@
  visibility="public"
 >
 </method>
-<method name="getTotalBlockCount"
+<method name="getSize"
  return="int"
  abstract="false"
  native="false"
@@ -101392,22 +101388,11 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="block" type="int">
+<parameter name="blockIndex" type="int">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
-<method name="isEmulated"
- return="boolean"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
 <method name="readBlock"
  return="byte[]"
  abstract="false"
@@ -101418,15 +101403,13 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="sector" type="int">
-</parameter>
-<parameter name="block" type="int">
+<parameter name="blockIndex" type="int">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
-<method name="readBlock"
- return="byte[]"
+<method name="restore"
+ return="void"
  abstract="false"
  native="false"
  synchronized="false"
@@ -101435,13 +101418,13 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="block" type="int">
+<parameter name="blockIndex" type="int">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
-<method name="restore"
- return="void"
+<method name="sectorToBlock"
+ return="int"
  abstract="false"
  native="false"
  synchronized="false"
@@ -101450,10 +101433,8 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="block" type="int">
+<parameter name="sectorIndex" type="int">
 </parameter>
-<exception name="IOException" type="java.io.IOException">
-</exception>
 </method>
 <method name="transceive"
  return="byte[]"
@@ -101480,7 +101461,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="block" type="int">
+<parameter name="blockIndex" type="int">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
@@ -101495,32 +101476,24 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="block" type="int">
+<parameter name="blockIndex" type="int">
 </parameter>
 <parameter name="data" type="byte[]">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
-<method name="writeBlock"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
+<field name="BLOCK_SIZE"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16"
+ static="true"
+ final="true"
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="sector" type="int">
-</parameter>
-<parameter name="block" type="int">
-</parameter>
-<parameter name="data" type="byte[]">
-</parameter>
-<exception name="IOException" type="java.io.IOException">
-</exception>
-</method>
+</field>
 <field name="KEY_DEFAULT"
  type="byte[]"
  transient="false"
@@ -101598,7 +101571,7 @@
  visibility="public"
 >
 </field>
-<field name="SIZE_UNKNOWN"
+<field name="TYPE_CLASSIC"
  type="int"
  transient="false"
  volatile="false"
@@ -101609,11 +101582,11 @@
  visibility="public"
 >
 </field>
-<field name="TYPE_CLASSIC"
+<field name="TYPE_OTHER"
  type="int"
  transient="false"
  volatile="false"
- value="0"
+ value="-1"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -101642,17 +101615,6 @@
  visibility="public"
 >
 </field>
-<field name="TYPE_UNKNOWN"
- type="int"
- transient="false"
- volatile="false"
- value="5"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 </class>
 <class name="MifareUltralight"
  extends="android.nfc.tech.BasicTagTechnology"