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

Commit 07ade261 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Android (Google) Code Review
Browse files

Merge "Check nullness for disconnecting bluetooth device"

parents 7fd8e937 db74f3db

services/core/java/com/android/server/media/BluetoothRouteProvider.java

+10 −7
Original line number Diff line number Diff line
@@ -306,11 +306,13 @@ class BluetoothRouteProvider { 
                }

            } else if (state == BluetoothProfile.STATE_DISCONNECTING

                    || state == BluetoothProfile.STATE_DISCONNECTED) {

                if (btRoute != null) {

                    btRoute.connectedProfiles.delete(profile);

                    if (btRoute.connectedProfiles.size() == 0) {

                        mBluetoothRoutes.remove(device.getAddress());

                        if (mActiveDevice != null

                            && TextUtils.equals(mActiveDevice.getAddress(), device.getAddress())) {

                                && TextUtils.equals(mActiveDevice.getAddress(),

                                device.getAddress())) {

                            mActiveDevice = null;

                        }

                        notifyBluetoothRoutesUpdated();
@@ -319,3 +321,4 @@ class BluetoothRouteProvider { 
            }

        }

    }

}