Merge "handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped." into jb-mr1-dev
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 @@
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;
}