diff options
| -rw-r--r-- | core/java/android/server/BluetoothEventLoop.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/server/BluetoothEventLoop.java b/core/java/android/server/BluetoothEventLoop.java index 9c887a1a5492..b758e7fa0886 100644 --- a/core/java/android/server/BluetoothEventLoop.java +++ b/core/java/android/server/BluetoothEventLoop.java @@ -268,6 +268,11 @@ class BluetoothEventLoop { */ private void onDeviceCreated(String deviceObjectPath) { String address = mBluetoothService.getAddressFromObjectPath(deviceObjectPath); + if (address == null) { + Log.e(TAG, "onDeviceCreated: device address null!" + " deviceObjectPath: " + + deviceObjectPath); + return; + } if (!mBluetoothService.isRemoteDeviceInCache(address)) { // Incoming connection, we haven't seen this device, add to cache. String[] properties = mBluetoothService.getRemoteDeviceProperties(address); @@ -275,7 +280,6 @@ class BluetoothEventLoop { addDevice(address, properties); } } - return; } /** |