commit 840a02c3da40934bd3b4ab023d6d92f7161c6f4b
author Jeff Hamilton <jham@google.com> Thu Jul 14 09:53:08 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 14 09:53:08 2011 -0700
tree 427d4043c5dd13cd51386d4ea27f4fa800c7ae15
parent b39c07b14404eb8ab91fdbfa4560e503ab6cbe8d
parent 67671874dcba734fc78d39573aa68c0cbe8e2b24

Merge "unhide public apis"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 86339f2..9a62297 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11958,6 +11958,8 @@
   public final class NdefRecord implements android.os.Parcelable {
     ctor public NdefRecord(short, byte[], byte[], byte[]);
     ctor public NdefRecord(byte[]) throws android.nfc.FormatException;
+    method public static android.nfc.NdefRecord createUri(android.net.Uri);
+    method public static android.nfc.NdefRecord createUri(java.lang.String);
     method public int describeContents();
     method public byte[] getId();
     method public byte[] getPayload();

core/java/android/nfc/NdefRecord.java

diff --git a/core/java/android/nfc/NdefRecord.java b/core/java/android/nfc/NdefRecord.java
index 0eb8cd8..b668f30 100644
--- a/core/java/android/nfc/NdefRecord.java
+++ b/core/java/android/nfc/NdefRecord.java
@@ -334,8 +334,6 @@
 
     /**
      * Creates an NDEF record of well known type URI.
-     * TODO: Make a public API
-     * @hide
      */
     public static NdefRecord createUri(Uri uri) {
         return createUri(uri.toString());
@@ -343,8 +341,6 @@
 
     /**
      * Creates an NDEF record of well known type URI.
-     * TODO: Make a public API
-     * @hide
      */
     public static NdefRecord createUri(String uriString) {
         byte prefix = 0x0;