commit c092dd2a6bd8581b3c924faecfd0d440d5893e90
author Ben Komalo <benkomalo@google.com> Fri Jan 21 12:18:38 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 21 12:18:38 2011 -0800
tree ebf6ff0c29fdeef872fd5a9cef6792ea1a79bdb1
parent 89b3e169131e8552e91eebd745ec3cd704290761
parent 74c0ecd074be40f95485f65f588d23dda09b7b90

Merge "Allow creation of new contacts when picking." into gingerbread

src/com/android/apps/tag/TagViewer.java

diff --git a/src/com/android/apps/tag/TagViewer.java b/src/com/android/apps/tag/TagViewer.java
index d2c39ac..4b22ed5 100644
--- a/src/com/android/apps/tag/TagViewer.java
+++ b/src/com/android/apps/tag/TagViewer.java
@@ -39,9 +39,8 @@
 import android.nfc.NdefRecord;
 import android.nfc.NfcAdapter;
 import android.nfc.Tag;
-import android.nfc.technology.Ndef;
-import android.nfc.technology.NdefFormatable;
-import android.nfc.technology.TagTechnology;
+import android.nfc.tech.Ndef;
+import android.nfc.tech.NdefFormatable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Parcelable;
@@ -272,7 +271,6 @@
 
     private boolean writeTag(Tag tag, long id) {
         try {
-            NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
             Cursor cursor = getContentResolver().query(
                     ContentUris.withAppendedId(NdefMessages.CONTENT_URI, id),
                     new String[] { NdefMessages.BYTES }, null, null, null);
@@ -284,7 +282,7 @@
             cursor.close();
             NdefMessage msg = new NdefMessage(bytes);
 
-            Ndef ndef = (Ndef) adapter.getTechnology(tag, TagTechnology.NDEF);
+            Ndef ndef = Ndef.get(tag);
             if (ndef != null) {
                 ndef.connect();
                 if (!ndef.isWritable()) {
@@ -297,8 +295,7 @@
                         .show();
                 return true;
             } else {
-                NdefFormatable format = (NdefFormatable) adapter.getTechnology(tag,
-                        TagTechnology.NDEF_FORMATABLE);
+                NdefFormatable format = NdefFormatable.get(tag);
                 if (format != null) {
                     format.connect();
                     format.format(msg);