diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-04-08 10:01:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-08 10:01:50 -0700 |
| commit | d1a95f975b03371a937da87735359c286a6de7f3 (patch) | |
| tree | f3be39d3cb7fe5422f4eeb94a69e5f850575844d | |
| parent | 3fe36fe589809b732db12054428166adb069f53b (diff) | |
| parent | 4aae54cf29c562a6c59ee47732745a224fa2882d (diff) | |
| download | frameworks_base-d1a95f975b03371a937da87735359c286a6de7f3.zip frameworks_base-d1a95f975b03371a937da87735359c286a6de7f3.tar.gz frameworks_base-d1a95f975b03371a937da87735359c286a6de7f3.tar.bz2 | |
Merge "Don't allow connection to profiles in TURNING_OFF state." into froyo
| -rw-r--r-- | core/java/android/server/BluetoothA2dpService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/server/BluetoothA2dpService.java b/core/java/android/server/BluetoothA2dpService.java index 096ad39..08cd2f0 100644 --- a/core/java/android/server/BluetoothA2dpService.java +++ b/core/java/android/server/BluetoothA2dpService.java @@ -313,6 +313,8 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { "Need BLUETOOTH_ADMIN permission"); if (DBG) log("connectSink(" + device + ")"); + if (!mBluetoothService.isEnabled()) return false; + // ignore if there are any active sinks if (lookupSinksMatchingStates(new int[] { BluetoothA2dp.STATE_CONNECTING, |