am b54fd91d: Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb

* commit 'b54fd91d1b843b7742bf6396cefa6c63b14dc6df':
  Phone crash when old callback func is woken up when enabling BT.

core/java/android/server/BluetoothEventLoop.java

@@ -717,6 +717,8 @@ class BluetoothEventLoop {
 
     private void onDiscoverServicesResult(String deviceObjectPath, boolean result) {
         String address = mBluetoothService.getAddressFromObjectPath(deviceObjectPath);
+        if (address == null) return;
+
         // We don't parse the xml here, instead just query Bluez for the properties.
         if (result) {
             mBluetoothService.updateRemoteDevicePropertiesCache(address);