diff options
author | Nick Pelly <npelly@google.com> | 2010-10-13 17:25:24 -0700 |
---|---|---|
committer | Nick Pelly <npelly@google.com> | 2010-10-15 02:12:32 -0700 |
commit | bc21fdefdfbeba1754c6cd339c7dd8e8f1d6fd48 (patch) | |
tree | 8b58be37237ea58089f6541403fd3092ff64f6bc /core/jni/android_nfc_NdefRecord.cpp | |
parent | c1e7b2182594aa0463c4a738cc8e7eea6777ef50 (diff) | |
download | frameworks_base-bc21fdefdfbeba1754c6cd339c7dd8e8f1d6fd48.zip frameworks_base-bc21fdefdfbeba1754c6cd339c7dd8e8f1d6fd48.tar.gz frameworks_base-bc21fdefdfbeba1754c6cd339c7dd8e8f1d6fd48.tar.bz2 |
NFC: Move NFC service implementation out of system_server.
NFC service is now an application service in packages/apps/Nfc.
NFC service is registered through ServiceManager.addService(), and the proxy
object NfcAdapter obtains a handle to it through ServiceManager.getService().
**Important** Had to add new symbols AID_NFC / NFC_UID / android.uid.nfc and
modify service_manager.c, Process.java and PackageManagerService.java in order
to force the com.android.nfc process to take a fixed uid, so that it can use
ServiceManager.addService().
Most of the JNI has moved to packages/apps/Nfc/jni. However NdefRecord and
NdefMessage require some in-process native code, so android_com_NdefMessage.cpp
and android_com_NdefRecord.cpp stay in frameworks/base/core/jni. They link to
a very small library libnfc_ndef.so that implements NDEF message parsing. This
has been added to core.mk so all devices (even without NFC hardware) can work
with NDEF data.
Bug: 3041259
Bug: 3097445
Change-Id: If8f00ce8f2053acfc9319ca366d4a9c02bd396e6
Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'core/jni/android_nfc_NdefRecord.cpp')
-rw-r--r-- | core/jni/android_nfc_NdefRecord.cpp | 92 |
1 files changed, 92 insertions, 0 deletions
diff --git a/core/jni/android_nfc_NdefRecord.cpp b/core/jni/android_nfc_NdefRecord.cpp new file mode 100644 index 0000000..8ce1837 --- /dev/null +++ b/core/jni/android_nfc_NdefRecord.cpp @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define LOG_TAG "NdefRecord" + +#include "jni.h" +#include "JNIHelp.h" + +#include "android_nfc.h" + +#include <utils/Log.h> + +namespace android { + +static jbyteArray android_nfc_NdefRecord_generate( + JNIEnv *e, jobject o, jshort flags, jshort tnf, jbyteArray type, + jbyteArray id, jbyteArray payload) +{ + uint32_t status; + phFriNfc_NdefRecord_t record; + uint32_t buf_size; + uint32_t record_size; + uint8_t *buf = NULL; + jbyteArray result = NULL; + + /* Prepare NDEF record structure */ + record.Flags = (uint8_t)flags; + record.Tnf = (uint8_t)tnf; + record.TypeLength = (uint32_t)e->GetArrayLength(type); + record.Type = (uint8_t *)e->GetByteArrayElements(type, NULL); + record.IdLength = (uint32_t)e->GetArrayLength(id); + record.Id = (uint8_t *)e->GetByteArrayElements(id, NULL); + record.PayloadLength = (uint32_t)e->GetArrayLength(payload); + record.PayloadData = (uint8_t *)e->GetByteArrayElements(payload, NULL); + + buf_size = record.PayloadLength + record.IdLength + record.TypeLength + 8; + + buf = (uint8_t*)malloc(buf_size); + if (buf == NULL) + goto end; + + LOGD("phFriNfc_NdefRecord_Generate()"); + + status = phFriNfc_NdefRecord_Generate(&record, buf, buf_size, + &record_size); + + if (status) { + LOGE("phFriNfc_NdefRecord_Generate() returned 0x%04x", status); + goto end; + } + LOGD("phFriNfc_NdefRecord_Generate() returned 0x%04x", status); + + result = e->NewByteArray(record_size); + if (result == NULL) + goto end; + + e->SetByteArrayRegion(result, 0, record_size, (jbyte *)buf); + +end: + e->ReleaseByteArrayElements(type, (jbyte *)record.Type, JNI_ABORT); + e->ReleaseByteArrayElements(id, (jbyte *)record.Id, JNI_ABORT); + e->ReleaseByteArrayElements(payload, (jbyte *)record.PayloadData, JNI_ABORT); + + if(buf) + free(buf); + + return result; +} + +static JNINativeMethod gMethods[] = { + {"generate", "(SS[B[B[B)[B", (void *)android_nfc_NdefRecord_generate}, +}; + +int register_android_nfc_NdefRecord(JNIEnv *e) +{ + return jniRegisterNativeMethods(e, "android/nfc/NdefRecord", gMethods, NELEM(gMethods)); +} + +} // namespace android |