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

Commit 02c4b353 authored by Matthew Xie's avatar Matthew Xie
Browse files

Check null of address in onDeviceCreated 

address can be null that returned from getAddressFromObjectPath.
If it is null case, donot continue  call getRemoteDeviceProperties.
Otherwise it causes null pointer exception and crash the system.
Bug 6338780

Change-Id: Ib190342032ab2ad11c49f44fa6d4b2509a861514
parent d72ad2ac

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;

    }



    /**