Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5289b91c: Implement ndef formatting.

Browse Source 
* commit '5289b91c885158094988a9a7b51b3139565eb639':
  Implement ndef formatting.
This commit is contained in:
Martijn Coenen
2010-12-07 22:35:01 -08:00
committed by Android Git Automerger
parent d9c7fde961 5289b91c88
commit 2f3ed7912e
3 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/nfc/INfcTag.aidl
View File

@@ -37,4 +37,5 @@ interface INfcTag
int write(int nativeHandle, in NdefMessage msg);
int makeReadOnly(int nativeHandle);
int getModeHint(int nativeHandle);
}
int formatNdef(int nativeHandle, in byte[] key);
}

4
core/java/android/nfc/Tag.java
View File

@@ -21,6 +21,7 @@ import android.nfc.technology.MifareClassic;
import android.nfc.technology.MifareUltralight;
import android.nfc.technology.NfcV;
import android.nfc.technology.Ndef;
import android.nfc.technology.NdefFormatable;
import android.nfc.technology.NfcA;
import android.nfc.technology.NfcB;
import android.nfc.technology.NfcF;
@@ -157,6 +158,9 @@ public class Tag implements Parcelable {
case TagTechnology.NDEF: {
return new Ndef(adapter, this, tech, extras);
}
case TagTechnology.NDEF_FORMATABLE: {
return new NdefFormatable(adapter, this, tech, extras);
}
case TagTechnology.NFC_F: {
return new NfcF(adapter, this, extras);
}

34
core/java/android/nfc/technology/NdefFormatable.java
View File

@@ -56,7 +56,37 @@ public final class NdefFormatable extends BasicTagTechnology {
* Formats a tag as NDEF, if possible. You may supply a first
* NdefMessage to be written on the tag.
*/
public void format(NdefMessage firstMessage) throws IOException {
throw new UnsupportedOperationException();
public void format(NdefMessage firstMessage) throws IOException, FormatException {
try {
byte[] DEFAULT_KEY = {(byte)0xFF,(byte)0xFF,(byte)0xFF,
(byte)0xFF,(byte)0xFF,(byte)0xFF};
int serviceHandle = mTag.getServiceHandle();
int errorCode = mTagService.formatNdef(serviceHandle, DEFAULT_KEY);
switch (errorCode) {
case ErrorCodes.SUCCESS:
break;
case ErrorCodes.ERROR_IO:
throw new IOException();
case ErrorCodes.ERROR_INVALID_PARAM:
throw new FormatException();
default:
// Should not happen
throw new IOException();
}
errorCode = mTagService.write(serviceHandle, firstMessage);
switch (errorCode) {
case ErrorCodes.SUCCESS:
break;
case ErrorCodes.ERROR_IO:
throw new IOException();
case ErrorCodes.ERROR_INVALID_PARAM:
throw new FormatException();
default:
// Should not happen
throw new IOException();
}
} catch (RemoteException e) {
attemptDeadServiceRecovery(e);
}
}
}