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

Commit 822bc09d authored by Angela Wang's avatar Angela Wang Committed by Android (Google) Code Review
Browse files

Merge "Rename the misleading variable name in setEnabled()" into main

parents 7248f88a b65d018f

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

+4 −4
Original line number Diff line number Diff line
@@ -198,19 +198,19 @@ public class A2dpProfile implements LocalBluetoothProfile { 


    @Override

    public boolean setEnabled(BluetoothDevice device, boolean enabled) {

        boolean isEnabled = false;

        boolean isSuccessful = false;

        if (mService == null) {

            return false;

        }

        if (enabled) {

            if (mService.getConnectionPolicy(device) < CONNECTION_POLICY_ALLOWED) {

                isEnabled = mService.setConnectionPolicy(device, CONNECTION_POLICY_ALLOWED);

                isSuccessful = mService.setConnectionPolicy(device, CONNECTION_POLICY_ALLOWED);

            }

        } else {

            isEnabled = mService.setConnectionPolicy(device, CONNECTION_POLICY_FORBIDDEN);

            isSuccessful = mService.setConnectionPolicy(device, CONNECTION_POLICY_FORBIDDEN);

        }



        return isEnabled;

        return isSuccessful;

    }

    boolean isA2dpPlaying() {

        if (mService == null) return false;

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

+4 −4
Original line number Diff line number Diff line
@@ -140,19 +140,19 @@ final class A2dpSinkProfile implements LocalBluetoothProfile { 


    @Override

    public boolean setEnabled(BluetoothDevice device, boolean enabled) {

        boolean isEnabled = false;

        boolean isSuccessful = false;

        if (mService == null) {

            return false;

        }

        if (enabled) {

            if (mService.getConnectionPolicy(device) < CONNECTION_POLICY_ALLOWED) {

                isEnabled = mService.setConnectionPolicy(device, CONNECTION_POLICY_ALLOWED);

                isSuccessful = mService.setConnectionPolicy(device, CONNECTION_POLICY_ALLOWED);

            }

        } else {

            isEnabled = mService.setConnectionPolicy(device, CONNECTION_POLICY_FORBIDDEN);

            isSuccessful = mService.setConnectionPolicy(device, CONNECTION_POLICY_FORBIDDEN);

        }



        return isEnabled;

        return isSuccessful;

    }



    boolean isAudioPlaying() {

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

+4 −4
Original line number Diff line number Diff line
@@ -178,19 +178,19 @@ public class CsipSetCoordinatorProfile implements LocalBluetoothProfile { 


    @Override

    public boolean setEnabled(BluetoothDevice device, boolean enabled) {

        boolean isEnabled = false;

        boolean isSuccessful = false;

        if (mService == null || device == null) {

            return false;

        }

        if (enabled) {

            if (mService.getConnectionPolicy(device) < CONNECTION_POLICY_ALLOWED) {

                isEnabled = mService.setConnectionPolicy(device, CONNECTION_POLICY_ALLOWED);

                isSuccessful = mService.setConnectionPolicy(device, CONNECTION_POLICY_ALLOWED);

            }

        } else {

            isEnabled = mService.setConnectionPolicy(device, CONNECTION_POLICY_FORBIDDEN);

            isSuccessful = mService.setConnectionPolicy(device, CONNECTION_POLICY_FORBIDDEN);

        }



        return isEnabled;

        return isSuccessful;

    }



    @Override

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

+4 −4
Original line number Diff line number Diff line
@@ -258,19 +258,19 @@ public class HapClientProfile implements LocalBluetoothProfile { 


    @Override

    public boolean setEnabled(BluetoothDevice device, boolean enabled) {

        boolean isEnabled = false;

        boolean isSuccessful = false;

        if (mService == null || device == null) {

            return false;

        }

        if (enabled) {

            if (mService.getConnectionPolicy(device) < CONNECTION_POLICY_ALLOWED) {

                isEnabled = mService.setConnectionPolicy(device, CONNECTION_POLICY_ALLOWED);

                isSuccessful = mService.setConnectionPolicy(device, CONNECTION_POLICY_ALLOWED);

            }

        } else {

            isEnabled = mService.setConnectionPolicy(device, CONNECTION_POLICY_FORBIDDEN);

            isSuccessful = mService.setConnectionPolicy(device, CONNECTION_POLICY_FORBIDDEN);

        }



        return isEnabled;

        return isSuccessful;

    }



    @Override

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

+4 −4
Original line number Diff line number Diff line
@@ -165,19 +165,19 @@ public class HeadsetProfile implements LocalBluetoothProfile { 


    @Override

    public boolean setEnabled(BluetoothDevice device, boolean enabled) {

        boolean isEnabled = false;

        boolean isSuccessful = false;

        if (mService == null) {

            return false;

        }

        if (enabled) {

            if (mService.getConnectionPolicy(device) < CONNECTION_POLICY_ALLOWED) {

                isEnabled = mService.setConnectionPolicy(device, CONNECTION_POLICY_ALLOWED);

                isSuccessful = mService.setConnectionPolicy(device, CONNECTION_POLICY_ALLOWED);

            }

        } else {

            isEnabled = mService.setConnectionPolicy(device, CONNECTION_POLICY_FORBIDDEN);

            isSuccessful = mService.setConnectionPolicy(device, CONNECTION_POLICY_FORBIDDEN);

        }



        return isEnabled;

        return isSuccessful;

    }



    public List<BluetoothDevice> getConnectedDevices() {