diff options
| author | fredc <fredc@broadcom.com> | 2012-04-15 15:19:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-16 21:59:30 -0700 |
| commit | 9a0efb0ee8c63797280b3b9309782541134e9205 (patch) | |
| tree | ab3e010094c3e5b9b64dcbdae453684eb05191b9 /src/com/android/bluetooth/pan | |
| parent | 6654f5c903de510a70f9e72cd5ad7837b615d93f (diff) | |
| download | android_packages_apps_Bluetooth-9a0efb0ee8c63797280b3b9309782541134e9205.tar.gz android_packages_apps_Bluetooth-9a0efb0ee8c63797280b3b9309782541134e9205.tar.bz2 android_packages_apps_Bluetooth-9a0efb0ee8c63797280b3b9309782541134e9205.zip | |
adapter non persistent service. Fixed null exception when profile services connect/disconnect
Change-Id: Iefafd1115471256d3107f039897e2af16077cdae
Diffstat (limited to 'src/com/android/bluetooth/pan')
| -rw-r--r-- | src/com/android/bluetooth/pan/PanService.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/bluetooth/pan/PanService.java b/src/com/android/bluetooth/pan/PanService.java index 3f79df452..be130fded 100644 --- a/src/com/android/bluetooth/pan/PanService.java +++ b/src/com/android/bluetooth/pan/PanService.java @@ -56,7 +56,6 @@ public class PanService extends Service { private static final int BLUETOOTH_PREFIX_LENGTH = 24; private BluetoothAdapter mAdapter; - private IBluetooth mAdapterService; private HashMap<BluetoothDevice, BluetoothPanDevice> mPanDevices; private ArrayList<String> mBluetoothIfaceAddresses; private int mMaxPanDevices; @@ -119,9 +118,7 @@ public class PanService extends Service { private void start() { if (DBG) log("start"); - mPanDevices = new HashMap<BluetoothDevice, BluetoothPanDevice>(); - mAdapterService = IBluetooth.Stub.asInterface(ServiceManager.getService("bluetooth")); mBluetoothIfaceAddresses = new ArrayList<String>(); try { mMaxPanDevices = getResources().getInteger( @@ -405,11 +402,9 @@ public class PanService extends Service { if (DBG) Log.d(TAG, "Pan Device state : device: " + device + " State:" + prevState + "->" + state); - try { - mAdapterService.sendConnectionStateChange(device, BluetoothProfile.PAN, state, - prevState); - } catch (RemoteException e) { - Log.e(TAG, Log.getStackTraceString(new Throwable())); + AdapterService svc = AdapterService.getAdapterService(); + if (svc != null) { + svc.onProfileConnectionStateChanged(device, BluetoothProfile.PAN, state, prevState); } } |