am 590b73bc: NFC API revision round 2. (6066da89) · Commits · e / os / android_frameworks_base

Android.mk

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -159,14 +159,6 @@ LOCAL_SRC_FILES += \
	core/java/com/android/internal/view/IInputMethodClient.aidl \		core/java/com/android/internal/view/IInputMethodClient.aidl \
	core/java/com/android/internal/view/IInputMethodManager.aidl \		core/java/com/android/internal/view/IInputMethodManager.aidl \
	core/java/com/android/internal/view/IInputMethodSession.aidl \		core/java/com/android/internal/view/IInputMethodSession.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/IGeocodeProvider.aidl \		location/java/android/location/IGeocodeProvider.aidl \
	location/java/android/location/IGpsStatusListener.aidl \		location/java/android/location/IGpsStatusListener.aidl \
	location/java/android/location/IGpsStatusProvider.aidl \		location/java/android/location/IGpsStatusProvider.aidl \
	@@ -249,6 +241,10 @@ aidl_files := \
	frameworks/base/core/java/android/content/res/Configuration.aidl \		frameworks/base/core/java/android/content/res/Configuration.aidl \
	frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \		frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \
	frameworks/base/core/java/android/net/Uri.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/Bundle.aidl \
	frameworks/base/core/java/android/os/DropBoxManager.aidl \		frameworks/base/core/java/android/os/DropBoxManager.aidl \
	frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \		frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \

CleanSpec.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -68,6 +68,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libreverb_inte
	$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libreverbtest_intermediates)		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libreverbtest_intermediates)
	$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/)		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/soundfx/)
	$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/os/storage/*)		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/os/storage/*)
			$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/trustedlogic)
			$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/com/trustedlogic)

	# ************************************************		# ************************************************
	# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

api/current.xml

+653 −0

Original line number	Original line	Diff line number	Diff line
	@@ -105046,6 +105046,33 @@
	</package>		</package>
	<package name="android.nfc"		<package name="android.nfc"
	>		>
			<class name="FormatException"
			extends="java.lang.Exception"
			abstract="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<constructor name="FormatException"
			type="android.nfc.FormatException"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</constructor>
			<constructor name="FormatException"
			type="android.nfc.FormatException"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="message" type="java.lang.String">
			</parameter>
			</constructor>
			</class>
	<class name="NdefMessage"		<class name="NdefMessage"
	extends="java.lang.Object"		extends="java.lang.Object"
	abstract="false"		abstract="false"
	@@ -105385,6 +105412,632 @@
	>		>
	</field>		</field>
	</class>		</class>
			<class name="NdefTag"
			extends="android.nfc.Tag"
			abstract="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<implements name="android.os.Parcelable">
			</implements>
			<method name="getNdefMessages"
			return="android.nfc.NdefMessage[]"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="getNdefMessages"
			return="android.nfc.NdefMessage[]"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="target" type="java.lang.String">
			</parameter>
			</method>
			<method name="getNdefTargets"
			return="java.lang.String[]"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<field name="CREATOR"
			type="android.os.Parcelable.Creator"
			transient="false"
			volatile="false"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_MIFARE_CLASSIC"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""type_mifare_classic""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_OTHER"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""other""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_TYPE_1"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""type_1""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_TYPE_2"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""type_2""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_TYPE_3"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""type_3""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_TYPE_4"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""type_4""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			</class>
			<class name="NdefTagConnection"
			extends="android.nfc.RawTagConnection"
			abstract="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<method name="getModeHint"
			return="int"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<exception name="IOException" type="java.io.IOException">
			</exception>
			</method>
			<method name="makeReadOnly"
			return="boolean"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<exception name="IOException" type="java.io.IOException">
			</exception>
			</method>
			<method name="readNdefMessages"
			return="android.nfc.NdefMessage[]"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<exception name="FormatException" type="android.nfc.FormatException">
			</exception>
			<exception name="IOException" type="java.io.IOException">
			</exception>
			</method>
			<method name="writeNdefMessage"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="message" type="android.nfc.NdefMessage">
			</parameter>
			<exception name="FormatException" type="android.nfc.FormatException">
			</exception>
			<exception name="IOException" type="java.io.IOException">
			</exception>
			</method>
			<field name="NDEF_MODE_READ_ONCE"
			type="int"
			transient="false"
			volatile="false"
			value="1"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="NDEF_MODE_READ_ONLY"
			type="int"
			transient="false"
			volatile="false"
			value="2"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="NDEF_MODE_UNKNOWN"
			type="int"
			transient="false"
			volatile="false"
			value="5"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="NDEF_MODE_WRITE_MANY"
			type="int"
			transient="false"
			volatile="false"
			value="4"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="NDEF_MODE_WRITE_ONCE"
			type="int"
			transient="false"
			volatile="false"
			value="3"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			</class>
			<class name="NfcAdapter"
			extends="java.lang.Object"
			abstract="false"
			static="false"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			<method name="createNdefTagConnection"
			return="android.nfc.NdefTagConnection"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="tag" type="android.nfc.NdefTag">
			</parameter>
			</method>
			<method name="createNdefTagConnection"
			return="android.nfc.NdefTagConnection"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="tag" type="android.nfc.NdefTag">
			</parameter>
			<parameter name="target" type="java.lang.String">
			</parameter>
			</method>
			<method name="createRawTagConnection"
			return="android.nfc.RawTagConnection"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="tag" type="android.nfc.Tag">
			</parameter>
			</method>
			<method name="createRawTagConnection"
			return="android.nfc.RawTagConnection"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="tag" type="android.nfc.Tag">
			</parameter>
			<parameter name="target" type="java.lang.String">
			</parameter>
			</method>
			<method name="getDefaultAdapter"
			return="android.nfc.NfcAdapter"
			abstract="false"
			native="false"
			synchronized="false"
			static="true"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="getLocalNdefMessage"
			return="android.nfc.NdefMessage"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="isTagDiscoveryEnabled"
			return="boolean"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="setLocalNdefMessage"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="message" type="android.nfc.NdefMessage">
			</parameter>
			</method>
			<field name="ACTION_NDEF_TAG_DISCOVERED"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""android.nfc.action.NDEF_TAG_DISCOVERED""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="ACTION_TAG_DISCOVERED"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""android.nfc.action.TAG_DISCOVERED""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="EXTRA_TAG"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""android.nfc.extra.TAG""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			</class>
			<class name="RawTagConnection"
			extends="java.lang.Object"
			abstract="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<method name="close"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="connect"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<exception name="IOException" type="java.io.IOException">
			</exception>
			</method>
			<method name="getTag"
			return="android.nfc.Tag"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="getTagTarget"
			return="java.lang.String"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="isConnected"
			return="boolean"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="transceive"
			return="byte[]"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="data" type="byte[]">
			</parameter>
			<exception name="IOException" type="java.io.IOException">
			</exception>
			</method>
			</class>
			<class name="Tag"
			extends="java.lang.Object"
			abstract="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<implements name="android.os.Parcelable">
			</implements>
			<method name="describeContents"
			return="int"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="getId"
			return="byte[]"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="getRawTargets"
			return="java.lang.String[]"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			</method>
			<method name="writeToParcel"
			return="void"
			abstract="false"
			native="false"
			synchronized="false"
			static="false"
			final="false"
			deprecated="not deprecated"
			visibility="public"
			>
			<parameter name="dest" type="android.os.Parcel">
			</parameter>
			<parameter name="flags" type="int">
			</parameter>
			</method>
			<field name="CREATOR"
			type="android.os.Parcelable.Creator"
			transient="false"
			volatile="false"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_ISO_14443_3A"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""iso14443_3a""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_ISO_14443_3B"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""iso14443_3b""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_ISO_14443_3B_PRIME"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""iso14443_3b""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_ISO_14443_4"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""iso14443_4""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_ISO_15693"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""iso15693""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_JIS_X_6319_4"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""jis_x_6319_4""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_OTHER"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""other""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			<field name="TARGET_TOPAZ"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""topaz""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
			</class>
	</package>		</package>
	<package name="android.opengl"		<package name="android.opengl"
	>		>

core/java/android/app/ContextImpl.java

+0 −21

Original line number	Original line	Diff line number	Diff line
	@@ -99,9 +99,6 @@ import android.view.inputmethod.InputMethodManager;
	import android.accounts.AccountManager;		import android.accounts.AccountManager;
	import android.accounts.IAccountManager;		import android.accounts.IAccountManager;
	import android.app.admin.DevicePolicyManager;		import android.app.admin.DevicePolicyManager;
	import com.trustedlogic.trustednfc.android.NfcManager;
	import com.trustedlogic.trustednfc.android.INfcManager;

	import com.android.internal.os.IDropBoxManagerService;		import com.android.internal.os.IDropBoxManagerService;

	import java.io.File;		import java.io.File;
	@@ -170,7 +167,6 @@ class ContextImpl extends Context {
	private static ThrottleManager sThrottleManager;		private static ThrottleManager sThrottleManager;
	private static WifiManager sWifiManager;		private static WifiManager sWifiManager;
	private static LocationManager sLocationManager;		private static LocationManager sLocationManager;
	private static NfcManager sNfcManager;
	private static final HashMap<String, SharedPreferencesImpl> sSharedPrefs =		private static final HashMap<String, SharedPreferencesImpl> sSharedPrefs =
	new HashMap<String, SharedPreferencesImpl>();		new HashMap<String, SharedPreferencesImpl>();

	@@ -969,8 +965,6 @@ class ContextImpl extends Context {
	return getClipboardManager();		return getClipboardManager();
	} else if (WALLPAPER_SERVICE.equals(name)) {		} else if (WALLPAPER_SERVICE.equals(name)) {
	return getWallpaperManager();		return getWallpaperManager();
	} else if (NFC_SERVICE.equals(name)) {
	return getNfcManager();
	} else if (DROPBOX_SERVICE.equals(name)) {		} else if (DROPBOX_SERVICE.equals(name)) {
	return getDropBoxManager();		return getDropBoxManager();
	} else if (DEVICE_POLICY_SERVICE.equals(name)) {		} else if (DEVICE_POLICY_SERVICE.equals(name)) {
	@@ -1206,21 +1200,6 @@ class ContextImpl extends Context {
	return mDownloadManager;		return mDownloadManager;
	}		}

	private NfcManager getNfcManager()
	{
	synchronized (sSync) {
	if (sNfcManager == null) {
	IBinder b = ServiceManager.getService(NFC_SERVICE);
	if (b == null) {
	return null;
	}
	INfcManager service = INfcManager.Stub.asInterface(b);
	sNfcManager = new NfcManager(service, mMainThread.getHandler());
	}
	}
	return sNfcManager;
	}

	@Override		@Override
	public int checkPermission(String permission, int pid, int uid) {		public int checkPermission(String permission, int pid, int uid) {
	if (permission == null) {		if (permission == null) {

core/java/com/trustedlogic/trustednfc/android/internal/ErrorCodes.java→core/java/android/nfc/ErrorCodes.java

+18 −29

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (C) 2010 The Android Open Source Project		* Copyright (C) 2010, The Android Open Source Project
	*		*
	* Licensed under the Apache License, Version 2.0 (the "License");		* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.		* you may not use this file except in compliance with the License.
	@@ -14,13 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	/**		package android.nfc;
	* File : ErrorCodes.java
	* Original-Author : Trusted Logic S.A. (Sylvain Fonteneau)
	* Created : 26-02-2010
	*/

	package com.trustedlogic.trustednfc.android.internal;

	/**		/**
	* This class defines all the error codes that can be returned by the service		* This class defines all the error codes that can be returned by the service
	@@ -83,9 +77,4 @@ public class ErrorCodes {

	public static final int ERROR_NO_SE_CONNECTED = -20;		public static final int ERROR_NO_SE_CONNECTED = -20;






	}		}
	No newline at end of file