diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-01 10:52:01 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-01 10:52:01 -0400 |
| commit | 5a463a693cae501f3e65936ea96e1ca1bae5fc3f (patch) | |
| tree | 37a64e456e62bcf507b0ddc1d7ca09a674d370dc /core/java/android/bluetooth | |
| parent | bbed0d68c815446400193bdc8b16fbf73e1ee664 (diff) | |
| parent | 081f58abb7ceb702fdb0b65ff0e0ff70dd265a30 (diff) | |
| download | frameworks_base-5a463a693cae501f3e65936ea96e1ca1bae5fc3f.zip frameworks_base-5a463a693cae501f3e65936ea96e1ca1bae5fc3f.tar.gz frameworks_base-5a463a693cae501f3e65936ea96e1ca1bae5fc3f.tar.bz2 | |
Merge change Ic2a16d4f into eclair
* changes:
b/2148252 Fix emulator
Diffstat (limited to 'core/java/android/bluetooth')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothA2dp.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/java/android/bluetooth/BluetoothA2dp.java b/core/java/android/bluetooth/BluetoothA2dp.java index 7c4c9c1..e8a69d8 100644 --- a/core/java/android/bluetooth/BluetoothA2dp.java +++ b/core/java/android/bluetooth/BluetoothA2dp.java @@ -93,10 +93,15 @@ public final class BluetoothA2dp { mContext = c; IBinder b = ServiceManager.getService(BluetoothA2dpService.BLUETOOTH_A2DP_SERVICE); - if (b == null) { - throw new RuntimeException("Bluetooth A2DP service not available!"); + if (b != null) { + mService = IBluetoothA2dp.Stub.asInterface(b); + } else { + Log.w(TAG, "Bluetooth A2DP service not available!"); + + // Instead of throwing an exception which prevents people from going + // into Wireless settings in the emulator. Let it crash later when it is actually used. + mService = null; } - mService = IBluetoothA2dp.Stub.asInterface(b); } /** Initiate a connection to an A2DP sink. |