From 1bf3c4bba2ef2f240154fd9a0e8d3ca20c992cc5 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Tue, 30 Aug 2011 12:10:26 -0400
Subject: [PATCH] Make Serial Manager APIs public

Change-Id: I9b96ff288a4757c4c4465a6a5ea3b4ed9c432e06
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 api/current.txt                               | 14 ++++++++++++++
 core/java/android/content/Context.java        |  2 --
 core/java/android/hardware/SerialManager.java |  2 +-
 core/java/android/hardware/SerialPort.java    |  2 +-
 core/res/AndroidManifest.xml                  |  3 +--
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index c8cebced3a9aa..b2cd4871dbb6f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -94,6 +94,7 @@ package android {
     field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS";
     field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";
     field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";
+    field public static final java.lang.String SERIAL_PORT = "android.permission.SERIAL_PORT";
     field public static final java.lang.String SET_ACTIVITY_WATCHER = "android.permission.SET_ACTIVITY_WATCHER";
     field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";
     field public static final java.lang.String SET_ALWAYS_FINISH = "android.permission.SET_ALWAYS_FINISH";
@@ -5064,6 +5065,7 @@ package android.content {
     field public static final java.lang.String POWER_SERVICE = "power";
     field public static final java.lang.String SEARCH_SERVICE = "search";
     field public static final java.lang.String SENSOR_SERVICE = "sensor";
+    field public static final java.lang.String SERIAL_SERVICE = "serial";
     field public static final java.lang.String STORAGE_SERVICE = "storage";
     field public static final java.lang.String TELEPHONY_SERVICE = "phone";
     field public static final java.lang.String TEXT_SERVICES_MANAGER_SERVICE = "textservices";
@@ -9549,6 +9551,18 @@ package android.hardware {
     field public static final float STANDARD_GRAVITY = 9.80665f;
   }
 
+  public class SerialManager {
+    method public java.lang.String[] getSerialPorts();
+    method public android.hardware.SerialPort openSerialPort(java.lang.String, int) throws java.io.IOException;
+  }
+
+  public class SerialPort {
+    method public void close() throws java.io.IOException;
+    method public java.lang.String getName();
+    method public int read(java.nio.ByteBuffer) throws java.io.IOException;
+    method public void write(java.nio.ByteBuffer, int) throws java.io.IOException;
+  }
+
 }
 
 package android.hardware.usb {
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index d104344e0389e..ca2e7748fcbbd 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1785,8 +1785,6 @@ public abstract class Context {
      *
      * @see #getSystemService
      * @see android.harware.SerialManager
-     *
-     * @hide
      */
     public static final String SERIAL_SERVICE = "serial";
 
diff --git a/core/java/android/hardware/SerialManager.java b/core/java/android/hardware/SerialManager.java
index c5e1c2bcb9de1..cc4555c69b2e1 100644
--- a/core/java/android/hardware/SerialManager.java
+++ b/core/java/android/hardware/SerialManager.java
@@ -29,7 +29,7 @@ import java.io.IOException;
 import java.util.HashMap;
 
 /**
- * @hide
+ * This class provides access to serial ports
  */
 public class SerialManager {
     private static final String TAG = "SerialManager";
diff --git a/core/java/android/hardware/SerialPort.java b/core/java/android/hardware/SerialPort.java
index 0889790fa4b59..5aee0f69cf90a 100644
--- a/core/java/android/hardware/SerialPort.java
+++ b/core/java/android/hardware/SerialPort.java
@@ -29,7 +29,7 @@ import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
 /**
- * @hide
+ * This class provides support for reading and writing data to serial ports
  */
 public class SerialPort {
 
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 2d053d077142b..47b06e4c087ed 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1454,8 +1454,7 @@
         android:description="@string/permdesc_bindPackageVerifier"
         android:protectionLevel="signature" />
 
-    <!-- Allows applications to access serial ports via the SerialManager.
-         @hide -->
+    <!-- Allows applications to access serial ports via the SerialManager. -->
     <permission android:name="android.permission.SERIAL_PORT"
         android:label="@string/permlab_serialPort"
         android:description="@string/permdesc_serialPort"