am e75104a4: am ed50c006: Merge "Add NfcBarcode technology API." into jb-mr1-dev (a385657b) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -13948,6 +13948,14 @@ package android.nfc.tech {
		method public byte[] transceive(byte[]) throws java.io.IOException;
		}

		public final class NfcBarcode extends android.nfc.tech.BasicTagTechnology {
		method public static android.nfc.tech.NfcBarcode get(android.nfc.Tag);
		method public byte[] getBarcode();
		method public int getType();
		field public static final int TYPE_KOVIO = 1; // 0x1
		field public static final int TYPE_UNKNOWN = -1; // 0xffffffff
		}

		public final class NfcF extends android.nfc.tech.BasicTagTechnology {
		method public static android.nfc.tech.NfcF get(android.nfc.Tag);
		method public byte[] getManufacturer();

core/java/android/nfc/tech/Ndef.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -140,8 +140,8 @@ public final class Ndef extends BasicTagTechnology {
		*
		* <p>Does not cause any RF activity and does not block.
		*
		* @param tag an MIFARE Classic compatible tag
		* @return MIFARE Classic object
		* @param tag an NDEF compatible tag
		* @return Ndef object
		*/
		public static Ndef get(Tag tag) {
		if (!tag.hasTech(TagTechnology.NDEF)) return null;

core/java/android/nfc/tech/NfcBarcode.java

0 → 100644

+102 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 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.
		*/

		package android.nfc.tech;

		import android.nfc.Tag;
		import android.os.Bundle;
		import android.os.RemoteException;

		/**
		* Provides access to tags containing just a barcode.
		*
		* <p>Acquire an {@link NfcBarcode} object using {@link #get}.
		*
		*/
		public final class NfcBarcode extends BasicTagTechnology {

		/** Kovio Tags */
		public static final int TYPE_KOVIO = 1;
		public static final int TYPE_UNKNOWN = -1;

		/** @hide */
		public static final String EXTRA_BARCODE_TYPE = "barcodetype";

		private int mType;

		/**
		* Get an instance of {@link NfcBarcode} for the given tag.
		*
		* <p>Returns null if {@link NfcBarcode} was not enumerated in {@link Tag#getTechList}.
		*
		* <p>Does not cause any RF activity and does not block.
		*
		* @param tag an NfcBarcode compatible tag
		* @return NfcBarcode object
		*/
		public static NfcBarcode get(Tag tag) {
		if (!tag.hasTech(TagTechnology.NFC_BARCODE)) return null;
		try {
		return new NfcBarcode(tag);
		} catch (RemoteException e) {
		return null;
		}
		}

		/**
		* Internal constructor, to be used by NfcAdapter
		* @hide
		*/
		public NfcBarcode(Tag tag) throws RemoteException {
		super(tag, TagTechnology.NFC_BARCODE);
		Bundle extras = tag.getTechExtras(TagTechnology.NFC_BARCODE);
		if (extras != null) {
		mType = extras.getInt(EXTRA_BARCODE_TYPE);
		} else {
		throw new NullPointerException("NfcBarcode tech extras are null.");
		}
		}

		/**
		* Returns the NFC Barcode tag type.
		*
		* <p>Currently only one of {@link #TYPE_KOVIO} or {@link TYPE_UNKNOWN}.
		*
		* <p>Does not cause any RF activity and does not block.
		*
		* @return the NFC Barcode tag type
		*/
		public int getType() {
		return mType;
		}

		/**
		* Returns the barcode of an NfcBarcode tag.
		*
		* <p>Does not cause any RF activity and does not block.
		*
		* @return a byte array containing the barcode
		*/
		public byte[] getBarcode() {
		switch (mType) {
		case TYPE_KOVIO:
		// For Kovio tags the barcode matches the ID
		return mTag.getId();
		default:
		return null;
		}
		}
		}

core/java/android/nfc/tech/TagTechnology.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,15 @@ public interface TagTechnology extends Closeable {
		*/
		public static final int MIFARE_ULTRALIGHT = 9;

		/**
		* This technology is an instance of {@link NfcBarcode}.
		* <p>Support for this technology type is optional. If a stack doesn't support this technology
		* type tags using it must still be discovered and present the lower level radio interface
		* technologies in use.
		* @hide
		*/
		public static final int NFC_BARCODE = 10;

		/**
		* Get the {@link Tag} object backing this {@link TagTechnology} object.
		* @return the {@link Tag} backing this {@link TagTechnology} object.