am 8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread (978e41fc) · Commits · e / os / android_frameworks_base

core/java/android/nfc/technology/IsoDep.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -39,18 +39,18 @@ import java.io.IOException;
		*/
		public final class IsoDep extends BasicTagTechnology {
		/** @hide */
		public static final String EXTRA_ATTRIB = "attrib";
		public static final String EXTRA_HI_LAYER_RESP = "hiresp";
		/** @hide */
		public static final String EXTRA_HIST_BYTES = "histbytes";

		private byte[] mAttrib = null;
		private byte[] mHiLayerResponse = null;
		private byte[] mHistBytes = null;

		public IsoDep(NfcAdapter adapter, Tag tag, Bundle extras)
		throws RemoteException {
		super(adapter, tag, TagTechnology.ISO_DEP);
		if (extras != null) {
		mAttrib = extras.getByteArray(EXTRA_ATTRIB);
		mHiLayerResponse = extras.getByteArray(EXTRA_HI_LAYER_RESP);
		mHistBytes = extras.getByteArray(EXTRA_HIST_BYTES);
		}
		}
		@@ -63,5 +63,5 @@ public final class IsoDep extends BasicTagTechnology {
		/**
		* 3B only
		*/
		public byte[] getAttrib() { return mAttrib; }
		public byte[] getHiLayerResponse() { return mHiLayerResponse; }
		}

+20 −6

Original line number	Diff line number	Diff line
		@@ -37,20 +37,34 @@ import android.os.RemoteException;
		*/
		public final class NfcB extends BasicTagTechnology {
		/** @hide */
		public static final String EXTRA_ATQB = "atqb";
		public static final String EXTRA_APPDATA = "appdata";
		/** @hide */
		public static final String EXTRA_PROTINFO = "protinfo";

		private byte[] mAtqb;
		private byte[] mAppData;
		private byte[] mProtInfo;

		public NfcB(NfcAdapter adapter, Tag tag, Bundle extras)
		throws RemoteException {
		super(adapter, tag, TagTechnology.NFC_B);
		mAtqb = extras.getByteArray(EXTRA_ATQB);
		mAppData = extras.getByteArray(EXTRA_APPDATA);
		mProtInfo = extras.getByteArray(EXTRA_PROTINFO);
		}

		/**
		* Returns the Application Data bytes from the ATQB/SENSB_RES
		* bytes discovered at tag discovery.
		*/
		public byte[] getApplicationData() {
		return mAppData;
		}

		/**
		* Returns the ATQB/SENSB_RES bytes discovered at tag discovery.
		* Returns the Protocol Info bytes from the ATQB/SENSB_RES
		* bytes discovered at tag discovery.
		*/
		public byte[] getAtqb() {
		return mAtqb;
		public byte[] getProtocolInfo() {
		return mProtInfo;
		}

		}