summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-03-18 12:38:54 -0700
committerEric Laurent <elaurent@google.com>2010-03-18 18:18:48 -0700
commitc04cfa35968783f5af007db95680f0087201d9ea (patch)
tree8d4cd35639a00829ddb0249aa463749b9a1256ba /media
parent7942b33e8905bbc177ff3c92596404530c860bcd (diff)
downloadframeworks_base-c04cfa35968783f5af007db95680f0087201d9ea.zip
frameworks_base-c04cfa35968783f5af007db95680f0087201d9ea.tar.gz
frameworks_base-c04cfa35968783f5af007db95680f0087201d9ea.tar.bz2
Unhide AudioManager API to control bluetooth SCO audio connection.
Needed for issue 2416481 in order to allow unbundled applications to play and record audio to/from a bluetooth SCO headset while not in call. Change-Id: Ie1f96ded991e65da538c2c4a58bfa1e548d58a01
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/AudioManager.java18
1 files changed, 1 insertions, 17 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 3a3c66b..47a9004 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -693,8 +693,6 @@ public class AudioManager {
//====================================================================
// Bluetooth SCO control
/**
- * @hide
- * TODO unhide for SDK
* Sticky broadcast intent action indicating that the bluetoooth SCO audio
* connection state has changed. The intent contains on extra {@link EXTRA_SCO_AUDIO_STATE}
* indicating the new state which is either {@link #SCO_AUDIO_STATE_DISCONNECTED}
@@ -706,8 +704,6 @@ public class AudioManager {
public static final String ACTION_SCO_AUDIO_STATE_CHANGED =
"android.media.SCO_AUDIO_STATE_CHANGED";
/**
- * @hide
- * TODO unhide for SDK
* Extra for intent {@link #ACTION_SCO_AUDIO_STATE_CHANGED} containing the new
* bluetooth SCO connection state.
*/
@@ -715,22 +711,16 @@ public class AudioManager {
"android.media.extra.SCO_AUDIO_STATE";
/**
- * @hide
- * TODO unhide for SDK
* Value for extra {@link #EXTRA_SCO_AUDIO_STATE} indicating that the
* SCO audio channel is not established
*/
public static final int SCO_AUDIO_STATE_DISCONNECTED = 0;
/**
- * @hide
- * TODO unhide for SDK
* Value for extra {@link #EXTRA_SCO_AUDIO_STATE} indicating that the
* SCO audio channel is established
*/
public static final int SCO_AUDIO_STATE_CONNECTED = 1;
/**
- * @hide
- * TODO unhide for SDK
* Value for extra {@link #EXTRA_SCO_AUDIO_STATE} indicating that
* there was an error trying to obtain the state
*/
@@ -738,8 +728,6 @@ public class AudioManager {
/**
- * @hide
- * TODO unhide for SDK
* Indicates if current platform supports use of SCO for off call use cases.
* Application wanted to use bluetooth SCO audio when the phone is not in call
* must first call thsi method to make sure that the platform supports this
@@ -754,8 +742,6 @@ public class AudioManager {
}
/**
- * @hide
- * TODO unhide for SDK
* Start bluetooth SCO audio connection.
* <p>Requires Permission:
* {@link android.Manifest.permission#MODIFY_AUDIO_SETTINGS}.
@@ -772,7 +758,7 @@ public class AudioManager {
* down the bluetooth connection.
* <p>Even if a SCO connection is established, the following restrictions apply on audio
* output streams so that they can be routed to SCO headset:
- * - the stream type must be {@link #STREAM_VOICE_CALL} or {@link #STREAM_BLUETOOTH_SCO}
+ * - the stream type must be {@link #STREAM_VOICE_CALL}
* - the format must be mono
* - the sampling must be 16kHz or 8kHz
* <p>The following restrictions apply on input streams:
@@ -797,8 +783,6 @@ public class AudioManager {
}
/**
- * @hide
- * TODO unhide for SDK
* Stop bluetooth SCO audio connection.
* <p>Requires Permission:
* {@link android.Manifest.permission#MODIFY_AUDIO_SETTINGS}.