drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added missing implementation for NdefRecord.

Browse Source 
Implemented constructor using a byte array to parse.
Added missing exception in method declaration, leading to update api/current.xml

Change-Id: I2660484aef1225e90c2f32a572041a2c3aecf288
This commit is contained in:
Sylvain Fonteneau
2010-10-17 15:32:33 -07:00
committed by Nick Pelly
parent 453c6d449b
commit dd7341f775
3 changed files with 98 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.xml
View File

@ -99913,6 +99913,8 @@
>
<parameter name="data" type="byte[]">
</parameter>
<exception name="FormatException" type="android.nfc.FormatException">
</exception>
</constructor>
<method name="describeContents"
return="int"

14
core/java/android/nfc/NdefRecord.java
View File

@ -200,8 +200,17 @@ public class NdefRecord implements Parcelable {
*
* @throws FormatException if the data is not a valid NDEF record
*/
public NdefRecord(byte[] data) {
throw new UnsupportedOperationException();
public NdefRecord(byte[] data) throws FormatException {
/* Prevent compiler to complain about unassigned final fields */
mFlags = 0;
mTnf = 0;
mType = null;
mId = null;
mPayload = null;
/* Perform actual parsing */
if (parseNdefRecord(data) == -1) {
throw new FormatException("Error while parsing NDEF record");
}
}
/**
@ -280,5 +289,6 @@ public class NdefRecord implements Parcelable {
}
};
private native int parseNdefRecord(byte[] data);
private native byte[] generate(short flags, short tnf, byte[] type, byte[] id, byte[] data);
}

84
core/jni/android_nfc_NdefRecord.cpp
View File

@ -80,8 +80,92 @@ end:
return result;
}
static jint android_nfc_NdefRecord_parseNdefRecord(JNIEnv *e, jobject o,
jbyteArray array)
{
uint16_t status;
jbyte *raw_record;
jsize raw_record_size;
jint ret = -1;
phFriNfc_NdefRecord_t record;
jfieldID mType, mId, mPayload, mTnf;
jbyteArray type = NULL;
jbyteArray id = NULL;
jbyteArray payload = NULL;
jclass record_cls = e->GetObjectClass(o);
raw_record_size = e->GetArrayLength(array);
raw_record = e->GetByteArrayElements(array, NULL);
if (raw_record == NULL) {
goto clean_and_return;
}
LOGD("phFriNfc_NdefRecord_Parse()");
status = phFriNfc_NdefRecord_Parse(&record, (uint8_t *)raw_record);
if (status) {
LOGE("phFriNfc_NdefRecord_Parse() returned 0x%04x", status);
goto clean_and_return;
}
LOGD("phFriNfc_NdefRecord_Parse() returned 0x%04x", status);
/* Set TNF field */
mTnf = e->GetFieldID(record_cls, "mTnf", "S");
e->SetShortField(o, mTnf, record.Tnf);
/* Set type field */
mType = e->GetFieldID(record_cls, "mType", "[B");
type = e->NewByteArray(record.TypeLength);
if (type == NULL) {
goto clean_and_return;
}
e->SetByteArrayRegion(type, 0, record.TypeLength,
(jbyte *)record.Type);
e->SetObjectField(o, mType, type);
/* Set id field */
mId = e->GetFieldID(record_cls, "mId", "[B");
id = e->NewByteArray(record.IdLength);
if (id == NULL) {
goto clean_and_return;
}
e->SetByteArrayRegion(id, 0, record.IdLength,
(jbyte *)record.Id);
e->SetObjectField(o, mId, id);
/* Set payload field */
mPayload = e->GetFieldID(record_cls, "mPayload", "[B");
payload = e->NewByteArray(record.PayloadLength);
if (payload == NULL) {
goto clean_and_return;
}
e->SetByteArrayRegion(payload, 0, record.PayloadLength,
(jbyte *)record.PayloadData);
e->SetObjectField(o, mPayload, payload);
ret = 0;
clean_and_return:
if (type != NULL) {
e->DeleteLocalRef(type);
}
if (id != NULL) {
e->DeleteLocalRef(id);
}
if (payload != NULL) {
e->DeleteLocalRef(payload);
}
if (raw_record != NULL) {
e->ReleaseByteArrayElements(array, raw_record, JNI_ABORT);
}
return ret;
}
static JNINativeMethod gMethods[] = {
{"generate", "(SS[B[B[B)[B", (void *)android_nfc_NdefRecord_generate},
{"parseNdefRecord", "([B)I", (void *)android_nfc_NdefRecord_parseNdefRecord},
};
int register_android_nfc_NdefRecord(JNIEnv *e)