Commit 90a01e6b authored Jul 26, 2012 by Matthew Xie Committed by Android Git Automerger Jul 26, 2012

am ab455da3: Merge "handle NullPointerException in cases where a proxy call to...

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 'ab455da3':
  handle NullPointerException in cases where a proxy call to AdapterService is called after Adapter Service is stopped.

parents b113ca42 ab455da3

core/java/android/bluetooth/BluetoothDevice.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}