diff options
| author | 2011-09-21 17:44:32 -0700 | |
|---|---|---|
| committer | 2011-09-21 17:44:32 -0700 | |
| commit | 90fb9aa93a350d5571a378923c2566f48e44ad3e (patch) | |
| tree | 09920b0b013d6d940227bf07e9de6ea1cc7d461e | |
| parent | 9c711282ad234e104c34eb4408d85fc1bb149ded (diff) | |
| parent | fd966a124f10448298aac79c4bb6cf8eb877277a (diff) | |
Merge "Make Bluetooth Health constant public." into ics-factoryrom
| -rw-r--r-- | api/14.txt | 1 | ||||
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothProfile.java | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/api/14.txt b/api/14.txt index 2fd2b66894ad..9f2a6dfc3855 100644 --- a/api/14.txt +++ b/api/14.txt @@ -4567,6 +4567,7 @@ package android.bluetooth { 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 diff --git a/api/current.txt b/api/current.txt index 2fd2b66894ad..9f2a6dfc3855 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4567,6 +4567,7 @@ package android.bluetooth { 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 diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java index 58b386838799..f7ccfbd35fba 100644 --- a/core/java/android/bluetooth/BluetoothProfile.java +++ b/core/java/android/bluetooth/BluetoothProfile.java @@ -66,7 +66,6 @@ public interface BluetoothProfile { /** * Health Profile - * @hide */ public static final int HEALTH = 3; |