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

Commit 46495382 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Rename function checkifAllProfilesAreUnknown to isAllProfilesUnknown"

parents 8e163bd8 7568b012

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+2 −2
Original line number Diff line number Diff line
@@ -1427,7 +1427,7 @@ public class AdapterService extends Service { 
     * @return false if one of profile is enabled or disabled, true otherwise

     */

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)

    boolean checkifAllProfilesAreUnknown(BluetoothDevice device) {

    boolean isAllProfilesUnknown(BluetoothDevice device) {

        if (mA2dpService != null && mA2dpService.getConnectionPolicy(device)

                != BluetoothProfile.CONNECTION_POLICY_UNKNOWN) {

            return false;
@@ -5626,7 +5626,7 @@ public class AdapterService extends Service { 
        }



        // Checks if any profiles are enablde or disabled and if so, only connect enabled profiles

        if (!checkifAllProfilesAreUnknown(device)) {

        if (!isAllProfilesUnknown(device)) {

            return connectEnabledProfiles(device);

        }

android/app/src/com/android/bluetooth/btservice/RemoteDevices.java

+1 −1
Original line number Diff line number Diff line
@@ -1144,7 +1144,7 @@ final class RemoteDevices { 
                }

                resetBatteryLevel(device);

            }

            if (mAdapterService.checkifAllProfilesAreUnknown(device)) {

            if (mAdapterService.isAllProfilesUnknown(device)) {

                DeviceProperties deviceProp = getDeviceProperties(device);

                if (deviceProp != null) {

                    deviceProp.setBondingInitiatedLocally(false);