Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9abcaa74 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am b41671b9: am e7075904: Merge "Fix build." into jb-mr1-dev 

* commit 'b41671b9':
  Fix build.
parents 03fbd24e b41671b9

core/java/android/nfc/Tag.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.nfc.tech.Ndef; 
import android.nfc.tech.NdefFormatable;

import android.nfc.tech.NdefFormatable;

import android.nfc.tech.NfcA;

import android.nfc.tech.NfcA;

import android.nfc.tech.NfcB;

import android.nfc.tech.NfcB;

import android.nfc.tech.NfcBarcode;

import android.nfc.tech.NfcF;

import android.nfc.tech.NfcF;

import android.nfc.tech.NfcV;

import android.nfc.tech.NfcV;

import android.nfc.tech.TagTechnology;

import android.nfc.tech.TagTechnology;
@@ -184,6 +185,9 @@ public final class Tag implements Parcelable { 
                case TagTechnology.NFC_V:

                case TagTechnology.NFC_V:

                    strings[i] = NfcV.class.getName();

                    strings[i] = NfcV.class.getName();

                    break;

                    break;

                case TagTechnology.NFC_BARCODE:

                    strings[i] = NfcBarcode.class.getName();

                    break;

                default:

                default:

                    throw new IllegalArgumentException("Unknown tech type " + techList[i]);

                    throw new IllegalArgumentException("Unknown tech type " + techList[i]);

            }

            }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ public final class NfcBarcode extends BasicTagTechnology { 
    /**

    /**

     * Returns the NFC Barcode tag type.

     * Returns the NFC Barcode tag type.

     *

     *

     * <p>Currently only one of {@link #TYPE_KOVIO} or {@link TYPE_UNKNOWN}.

     * <p>Currently only one of {@link #TYPE_KOVIO} or {@link #TYPE_UNKNOWN}.

     *

     *

     * <p>Does not cause any RF activity and does not block.

     * <p>Does not cause any RF activity and does not block.

     *

     *