From 081f58abb7ceb702fdb0b65ff0e0ff70dd265a30 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Wed, 30 Sep 2009 17:59:40 -0700 Subject: b/2148252 Fix emulator Change-Id: Ic2a16d4fac2a2a12a209c83ad2049829255cb31f --- core/java/android/bluetooth/BluetoothA2dp.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'core/java/android/bluetooth') 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. -- cgit v1.1