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

Commit c065348e authored by Jaikumar Ganesh's avatar Jaikumar Ganesh
Browse files

Show an error message when the remote side cancels the authentication 

and show OPP device list correctly.

Dr No: Eastham
Bug: 2174874
parent d1a04291

src/com/android/settings/bluetooth/BluetoothSettings.java

+2 −4
Original line number Diff line number Diff line
@@ -323,12 +323,10 @@ public class BluetoothSettings extends PreferenceActivity 


        switch(mFilterType) {

        case BluetoothDevicePicker.FILTER_TYPE_TRANSFER:

            if (uuids != null) {

            if (uuids != null)

                if (BluetoothUuid.containsAnyUuid(uuids,

                        LocalBluetoothProfileManager.OPP_PROFILE_UUIDS))  return true;

            } else {

            if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP)) return true;

            }

            break;

        case BluetoothDevicePicker.FILTER_TYPE_AUDIO:

            if (uuids != null) {

src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ public class CachedBluetoothDeviceManager { 
        case BluetoothDevice.UNBOND_REASON_DISCOVERY_IN_PROGRESS:

        case BluetoothDevice.UNBOND_REASON_AUTH_TIMEOUT:

        case BluetoothDevice.UNBOND_REASON_REPEATED_ATTEMPTS:

        case BluetoothDevice.UNBOND_REASON_REMOTE_AUTH_CANCELED:

            errorMsg = R.string.bluetooth_pairing_error_message;

            mLocalManager.showError(device, R.string.bluetooth_error_title, errorMsg);

            break;