commit 90fb9aa93a350d5571a378923c2566f48e44ad3e
author Jaikumar Ganesh <jaikumar@google.com> Wed Sep 21 17:44:32 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 21 17:44:32 2011 -0700
tree 09920b0b013d6d940227bf07e9de6ea1cc7d461e
parent 9c711282ad234e104c34eb4408d85fc1bb149ded
parent fd966a124f10448298aac79c4bb6cf8eb877277a

Merge "Make Bluetooth Health constant public." into ics-factoryrom

api/14.txt

diff --git a/api/14.txt b/api/14.txt
index 2fd2b66..9f2a6df 100644
--- a/api/14.txt
+++ b/api/14.txt
@@ -4567,6 +4567,7 @@
     field public static final java.lang.String EXTRA_PREVIOUS_STATE = "android.bluetooth.profile.extra.PREVIOUS_STATE";
     field public static final java.lang.String EXTRA_STATE = "android.bluetooth.profile.extra.STATE";
     field public static final int HEADSET = 1; // 0x1
+    field public static final int HEALTH = 3; // 0x3
     field public static final int STATE_CONNECTED = 2; // 0x2
     field public static final int STATE_CONNECTING = 1; // 0x1
     field public static final int STATE_DISCONNECTED = 0; // 0x0

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 2fd2b66..9f2a6df 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4567,6 +4567,7 @@
     field public static final java.lang.String EXTRA_PREVIOUS_STATE = "android.bluetooth.profile.extra.PREVIOUS_STATE";
     field public static final java.lang.String EXTRA_STATE = "android.bluetooth.profile.extra.STATE";
     field public static final int HEADSET = 1; // 0x1
+    field public static final int HEALTH = 3; // 0x3
     field public static final int STATE_CONNECTED = 2; // 0x2
     field public static final int STATE_CONNECTING = 1; // 0x1
     field public static final int STATE_DISCONNECTED = 0; // 0x0

core/java/android/bluetooth/BluetoothProfile.java

diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java
index 58b3868..f7ccfbd 100644
--- a/core/java/android/bluetooth/BluetoothProfile.java
+++ b/core/java/android/bluetooth/BluetoothProfile.java
@@ -66,7 +66,6 @@
 
     /**
      * Health Profile
-     * @hide
      */
     public static final int HEALTH = 3;