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

Commit 4e552b60 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am 013b0e53: Merge change I143ea844 into eclair 

Merge commit '013b0e53' into eclair-mr2

* commit '013b0e53':
  Add BMW and Audi to Auto Pairing black list.
parents c5dc6872 013b0e53

core/java/android/server/BluetoothService.java

+3 −2
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ public class BluetoothService extends IBluetooth.Stub { 
        // disabled.

        private final ArrayList<String> mAutoPairingNameBlacklist =

                new ArrayList<String>(Arrays.asList(

                        "Motorola IHF1000", "i.TechBlueBAND", "X5 Stereo v1.3"));

                        "Motorola IHF1000", "i.TechBlueBAND", "X5 Stereo v1.3", "BMW", "Audi"));



        // If this is an outgoing connection, store the address.

        // There can be only 1 pending outgoing connection at a time,
@@ -586,7 +586,8 @@ public class BluetoothService extends IBluetooth.Stub { 
            String name = getRemoteName(address);

            if (name != null) {

                for (String blacklistName : mAutoPairingNameBlacklist) {

                    if (name.equals(blacklistName)) return true;

                    if (name.equals(blacklistName) ||

                            name.startsWith(blacklistName)) return true;

                }

            }

            return false;