diff options
| author | Syed Ibrahim M <syedibra@broadcom.com> | 2012-06-19 10:14:25 -0700 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2012-07-26 18:11:23 -0700 |
| commit | 305f240dc12325af4fa267e7c4f52c680bb05280 (patch) | |
| tree | a47fe6a0c430faceea69541fabc60831c6cb41b7 /core/java | |
| parent | 33806e25b176efb11a5ee8b0f038bfda8f933f0d (diff) | |
| download | frameworks_base-305f240dc12325af4fa267e7c4f52c680bb05280.zip frameworks_base-305f240dc12325af4fa267e7c4f52c680bb05280.tar.gz frameworks_base-305f240dc12325af4fa267e7c4f52c680bb05280.tar.bz2 | |
handle NullPointerException in cases where a proxy
call to AdapterService is called after Adapter
Service is stopped.
Change-Id: I009787f03f9a013b9b06fcb7e3f6241c850f8cd2
Diffstat (limited to 'core/java')
| -rwxr-xr-x | core/java/android/bluetooth/BluetoothDevice.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 2504763..4cc22b4 100755 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -786,6 +786,12 @@ public final class BluetoothDevice implements Parcelable { try { return sService.getBondState(this); } catch (RemoteException e) {Log.e(TAG, "", e);} + catch (NullPointerException npe) { + // Handle case where bluetooth service proxy + // is already null. + Log.e(TAG, "NullPointerException for getBondState() of device ("+ + getAddress()+")", npe); + } return BOND_NONE; } |