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

Commit 8afa3de0 authored by Leon Liao's avatar Leon Liao Committed by android-build-merger
Browse files

Merge "Rename method isConnectable()" am: e238a19a am: 78e8da5e 

am: 8735efab

Change-Id: Ib8a4674ab16d60b8dc458c8eb97d0b24a0c48123
parents 641eb200 8735efab

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

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public class A2dpProfile implements LocalBluetoothProfile { 
                BluetoothProfile.A2DP);

    }



    public boolean isConnectable() {

    public boolean accessProfileEnabled() {

        return true;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ final class A2dpSinkProfile implements LocalBluetoothProfile { 
                BluetoothProfile.A2DP_SINK);

    }



    public boolean isConnectable() {

    public boolean accessProfileEnabled() {

        return true;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 


        int preferredProfiles = 0;

        for (LocalBluetoothProfile profile : mProfiles) {

            if (connectAllProfiles ? profile.isConnectable() : profile.isAutoConnectable()) {

            if (connectAllProfiles ? profile.accessProfileEnabled() : profile.isAutoConnectable()) {

                if (profile.isPreferred(mDevice)) {

                    ++preferredProfiles;

                    connectInt(profile);
@@ -661,7 +661,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> 
        List<LocalBluetoothProfile> connectableProfiles =

                new ArrayList<LocalBluetoothProfile>();

        for (LocalBluetoothProfile profile : mProfiles) {

            if (profile.isConnectable()) {

            if (profile.accessProfileEnabled()) {

                connectableProfiles.add(profile);

            }

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class HeadsetProfile implements LocalBluetoothProfile { 
                BluetoothProfile.HEADSET);

    }



    public boolean isConnectable() {

    public boolean accessProfileEnabled() {

        return true;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class HearingAidProfile implements LocalBluetoothProfile { 
                new HearingAidServiceListener(), BluetoothProfile.HEARING_AID);

    }



    public boolean isConnectable() {

    public boolean accessProfileEnabled() {

        return false;

    }