commit f36c6db108364dea89b1e3c27c0b15103e560d87
author Nick Pelly <npelly@google.com> Thu Oct 14 19:16:35 2010 -0700
committer Nick Pelly <npelly@google.com> Thu Oct 14 19:16:35 2010 -0700
tree 0325956dc33396bde5868fffa5753ec47e5be212
parent 639017920f925ee88de06f7ffabc2cb5d97a272b

NFC API revision round 2.

- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>

Conflicts:

	Android.mk
	CleanSpec.mk
	core/java/android/app/ContextImpl.java

Android.mk

diff --git a/Android.mk b/Android.mk
index 78d9b7b..febd02d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -118,6 +118,14 @@
 	core/java/android/net/IConnectivityManager.aidl \
 	core/java/android/net/INetworkManagementEventObserver.aidl \
 	core/java/android/net/IThrottleManager.aidl \
+	core/java/android/nfc/ILlcpConnectionlessSocket.aidl \
+	core/java/android/nfc/ILlcpServiceSocket.aidl \
+	core/java/android/nfc/ILlcpSocket.aidl \
+	core/java/android/nfc/INdefTag.aidl \
+	core/java/android/nfc/INfcAdapter.aidl \
+	core/java/android/nfc/INfcTag.aidl \
+	core/java/android/nfc/IP2pInitiator.aidl \
+	core/java/android/nfc/IP2pTarget.aidl \
 	core/java/android/os/IHardwareService.aidl \
 	core/java/android/os/IMessenger.aidl \
 	core/java/android/os/INetworkManagementService.aidl \
@@ -159,14 +167,6 @@
 	core/java/com/android/internal/view/IInputMethodManager.aidl \
 	core/java/com/android/internal/view/IInputMethodSession.aidl \
 	core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \
-	core/java/com/trustedlogic/trustednfc/android/ILlcpConnectionlessSocket.aidl \
-	core/java/com/trustedlogic/trustednfc/android/ILlcpServiceSocket.aidl \
-	core/java/com/trustedlogic/trustednfc/android/ILlcpSocket.aidl \
-	core/java/com/trustedlogic/trustednfc/android/INdefTag.aidl \
-	core/java/com/trustedlogic/trustednfc/android/INfcManager.aidl \
-	core/java/com/trustedlogic/trustednfc/android/INfcTag.aidl \
-	core/java/com/trustedlogic/trustednfc/android/IP2pInitiator.aidl \
-	core/java/com/trustedlogic/trustednfc/android/IP2pTarget.aidl \
 	location/java/android/location/ICountryDetector.aidl \
 	location/java/android/location/ICountryListener.aidl \
 	location/java/android/location/IGeocodeProvider.aidl \
@@ -251,6 +251,10 @@
 	frameworks/base/core/java/android/content/res/Configuration.aidl \
 	frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \
 	frameworks/base/core/java/android/net/Uri.aidl \
+	frameworks/base/core/java/android/nfc/NdefMessage.aidl \
+	frameworks/base/core/java/android/nfc/NdefRecord.aidl \
+	frameworks/base/core/java/android/nfc/Tag.aidl \
+	frameworks/base/core/java/android/nfc/NdefTag.aidl \
 	frameworks/base/core/java/android/os/Bundle.aidl \
 	frameworks/base/core/java/android/os/DropBoxManager.aidl \
 	frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \