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

Commit 8735efab authored by Leon Liao's avatar Leon Liao Committed by android-build-merger
Browse files

Merge "Rename method isConnectable()" am: e238a19a 

am: 78e8da5e

Change-Id: I05ddc13a985acd3fa02d4c12d5ca416be29492cc
parents 68601f7a 78e8da5e

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

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

                BluetoothProfile.A2DP);

    }

    }





    public boolean isConnectable() {

    public boolean accessProfileEnabled() {

        return true;

        return true;

    }

    }

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

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

                BluetoothProfile.A2DP_SINK);

    }

    }





    public boolean isConnectable() {

    public boolean accessProfileEnabled() {

        return true;

        return true;

    }

    }

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

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




        int preferredProfiles = 0;

        int preferredProfiles = 0;

        for (LocalBluetoothProfile profile : mProfiles) {

        for (LocalBluetoothProfile profile : mProfiles) {

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

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

                if (profile.isPreferred(mDevice)) {

                if (profile.isPreferred(mDevice)) {

                    ++preferredProfiles;

                    ++preferredProfiles;

                    connectInt(profile);

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

        List<LocalBluetoothProfile> connectableProfiles =

                new ArrayList<LocalBluetoothProfile>();

                new ArrayList<LocalBluetoothProfile>();

        for (LocalBluetoothProfile profile : mProfiles) {

        for (LocalBluetoothProfile profile : mProfiles) {

            if (profile.isConnectable()) {

            if (profile.accessProfileEnabled()) {

                connectableProfiles.add(profile);

                connectableProfiles.add(profile);

            }

            }

        }

        }

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

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

                BluetoothProfile.HEADSET);

    }

    }





    public boolean isConnectable() {

    public boolean accessProfileEnabled() {

        return true;

        return true;

    }

    }

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

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

                BluetoothProfile.HEARING_AID);

    }

    }





    public boolean isConnectable() {

    public boolean accessProfileEnabled() {

        return false;

        return false;

    }

    }