Merge branch 'gingerbread' into gingerbread-release (dfa583d4) · Commits · e / os / android_frameworks_base

api/current.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -100436,7 +100436,7 @@
		visibility="public"
		>
		</method>
		<method name="isTagDiscoveryEnabled"
		<method name="isEnabled"
		return="boolean"
		abstract="false"
		native="false"

+0 −3

Original line number	Diff line number	Diff line
		@@ -252,9 +252,6 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		public static final int FLAG_RESTORE_ANY_VERSION = 1<<17;

		/**
		* Value for {@link #flags}: Set to true if the application has been
		* installed using the forward lock option.
		*
		* Value for {@link #flags}: Set to true if the application is
		* currently installed on external/removable/unprotected storage. Such
		* applications may not be available if their storage is not currently

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ interface INfcTag
		String getType(int nativeHandle);
		byte[] getUid(int nativeHandle);
		boolean isNdef(int nativeHandle);
		boolean isPresent(int nativeHandle);
		byte[] transceive(int nativeHandle, in byte[] data);

		int getLastError(int nativeHandle);

+13 −4

Original line number	Diff line number	Diff line
		@@ -227,14 +227,17 @@ public final class NfcAdapter {
		}

		/**
		* Return true if this NFC Adapter is enabled to discover new tags.
		* Return true if this NFC Adapter has any features enabled.
		* <p>
		* If this method returns false, then applications should request the user
		* turn on NFC tag discovery in Settings.
		* <p>
		* If this method returns false, the NFC hardware is guaranteed not to
		* perform or respond to any NFC communication.
		*
		* @return true if this NFC Adapter is enabled to discover new tags
		*/
		public boolean isTagDiscoveryEnabled() {
		public boolean isEnabled() {
		try {
		return mService.isEnabled();
		} catch (RemoteException e) {
		@@ -244,12 +247,14 @@ public final class NfcAdapter {
		}

		/**
		* Enable NFC hardware.
		* <p>
		* NOTE: may block for ~second or more. Poor API. Avoid
		* calling from the UI thread.
		*
		* @hide
		*/
		public boolean enableTagDiscovery() {
		public boolean enable() {
		try {
		return mService.enable();
		} catch (RemoteException e) {
		@@ -259,12 +264,16 @@ public final class NfcAdapter {
		}

		/**
		* Disable NFC hardware.
		* No NFC features will work after this call, and the hardware
		* will not perform or respond to any NFC communication.
		* <p>
		* NOTE: may block for ~second or more. Poor API. Avoid
		* calling from the UI thread.
		*
		* @hide
		*/
		public boolean disableTagDiscovery() {
		public boolean disable() {
		try {
		return mService.disable();
		} catch (RemoteException e) {

+10 −4

Original line number	Diff line number	Diff line
		@@ -95,10 +95,16 @@ public class RawTagConnection {
		* returns true.
		*/
		public boolean isConnected() {
		// TODO(nxp): update mIsConnected when tag goes out of range -
		// but do not do an active prescence check in
		// isConnected()
		return mIsConnected;
		if (!mIsConnected) {
		return false;
		}

		try {
		return mTagService.isPresent(mTag.mNativeHandle);
		} catch (RemoteException e) {
		Log.e(TAG, "NFC service died", e);
		return false;
		}
		}

		/**