am ab455da3: Merge "handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped." into jb-mr1-dev

* commit 'ab455da3640d462114d2fe58d9c7f816a6663852':
  handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped.
This commit is contained in:
Matthew Xie
2012-07-26 20:41:08 -07:00
committed by Android Git Automerger

View File

@@ -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;
}