Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e318c9a5 authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "Check null of address in onDeviceCreated" into jb-dev

parents e849230f 02c4b353

core/java/android/server/BluetoothEventLoop.java

+5 −1
Original line number Diff line number Diff line
@@ -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;

    }



    /**