Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 03cb1f15: Merge change I249345ee into eclair-mr2

Browse Source 
Merge commit '03cb1f15ca73900f62c12694e05bb0b0e0b6669d' into eclair-mr2-plus-aosp

* commit '03cb1f15ca73900f62c12694e05bb0b0e0b6669d':
  Add AUTO_CONNECT priority for Headset profile.
This commit is contained in:
Jaikumar Ganesh
2009-12-01 17:06:59 -08:00
committed by Android Git Automerger
parent 079324bf5b 03cb1f15ca
commit 4b9e9c37d5
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/bluetooth/BluetoothHeadset.java
View File

@@ -100,9 +100,14 @@ public final class BluetoothHeadset {
/** Connection canceled before completetion. */
public static final int RESULT_CANCELED = 2;
/** Default priority for headsets that should be auto-connected */
public static final int PRIORITY_AUTO = 100;
/** Default priority for headsets that should not be auto-connected */
/** Default priority for headsets that for which we will accept
* inconing connections and auto-connect */
public static final int PRIORITY_AUTO_CONNECT = 1000;
/** Default priority for headsets that for which we will accept
* inconing connections but not auto-connect */
public static final int PRIORITY_ON = 100;
/** Default priority for headsets that should not be auto-connected
* and not allow incoming connections. */
public static final int PRIORITY_OFF = 0;
/** The voice dialer 'works' but the user experience is poor. The voice

3
core/java/android/server/BluetoothA2dpService.java
View File

@@ -328,9 +328,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
return true;
}
// Sink is being disconnected, downgrade priority from AUTO_CONNECT.
setSinkPriority(device, BluetoothA2dp.PRIORITY_ON);
// State is CONNECTING or CONNECTED or PLAYING
if (!disconnectSinkNative(path)) {
return false;