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

Commit f51adf34 authored by Jessica Wagantall's avatar Jessica Wagantall
Browse files

Merge tag 'android-6.0.1_r10' into HEAD 

Ticket: CYNGNOS-1404
Android 6.0.1 release 10
parents a7881ec1 48b716a9

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+6 −1
Original line number Diff line number Diff line
@@ -834,7 +834,12 @@ public final class CachedBluetoothDevice implements Comparable<CachedBluetoothDe 
            // The pairing dialog now warns of phone-book access for paired devices.

            // No separate prompt is displayed after pairing.

            if (getPhonebookPermissionChoice() == CachedBluetoothDevice.ACCESS_UNKNOWN) {

                if (mDevice.getBluetoothClass().getDeviceClass()

                        == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {

                    setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);

                } else {

                    setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);

                }

            }

        }

    }