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.h | |
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.h')
-rw-r--r-- | core/jni/android_nfc.h | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/core/jni/android_nfc.h b/core/jni/android_nfc.h new file mode 100644 index 0000000..df660f2 --- /dev/null +++ b/core/jni/android_nfc.h @@ -0,0 +1,54 @@ +/* + * 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. + */ + +/* + * Contains the bare minimum header so that framework NFC jni can link + * against NFC native library + */ + +#ifndef __ANDROID_NFC_H__ +#define __ANDROID_NFC_H__ + +extern "C" { + +typedef struct phFriNfc_NdefRecord { + uint8_t Flags; + uint8_t Tnf; + uint8_t TypeLength; + uint8_t *Type; + uint8_t IdLength; + uint8_t *Id; + uint32_t PayloadLength; + uint8_t *PayloadData; +} phFriNfc_NdefRecord_t; + +uint16_t phFriNfc_NdefRecord_GetRecords(uint8_t* pBuffer, + uint32_t BufferLength, + uint8_t* pRawRecords[ ], + uint8_t IsChunked[ ], + uint32_t* pNumberOfRawRecords + ); +uint16_t phFriNfc_NdefRecord_Parse(phFriNfc_NdefRecord_t* pRecord, + uint8_t* pRawRecord); + +uint16_t phFriNfc_NdefRecord_Generate(phFriNfc_NdefRecord_t* pRecord, + uint8_t* pBuffer, + uint32_t MaxBufferSize, + uint32_t* pBytesWritten + ); +} + +#endif |