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

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

Merge "Simplify logic for connect in HfpClientProfile"

parents eff45f36 b6e4b8ab

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

+20 −19
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import java.util.List; 
 */

final class HfpClientProfile implements LocalBluetoothProfile {

    private static final String TAG = "HfpClientProfile";

    private static boolean V = false;



    private BluetoothHeadsetClient mService;

    private boolean mIsProfileReady;
@@ -61,7 +60,7 @@ final class HfpClientProfile implements LocalBluetoothProfile { 


        @Override

        public void onServiceConnected(int profile, BluetoothProfile proxy) {

            if (V) Log.d(TAG,"Bluetooth service connected");

            Log.d(TAG, "Bluetooth service connected, profile:" + profile);

            mService = (BluetoothHeadsetClient) proxy;

            // We just bound to the service, so refresh the UI for any connected HFP devices.

            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
@@ -82,7 +81,7 @@ final class HfpClientProfile implements LocalBluetoothProfile { 


        @Override

        public void onServiceDisconnected(int profile) {

            if (V) Log.d(TAG,"Bluetooth service disconnected");

            Log.d(TAG, "Bluetooth service disconnected, profile:" + profile);

            mIsProfileReady=false;

        }

    }
@@ -118,7 +117,9 @@ final class HfpClientProfile implements LocalBluetoothProfile { 
    }



    public List<BluetoothDevice> getConnectedDevices() {

        if (mService == null) return new ArrayList<BluetoothDevice>(0);

        if (mService == null) {

            return new ArrayList<BluetoothDevice>(0);

        }

        return mService.getDevicesMatchingConnectionStates(

              new int[] {BluetoothProfile.STATE_CONNECTED,

                         BluetoothProfile.STATE_CONNECTING,
@@ -127,23 +128,17 @@ final class HfpClientProfile implements LocalBluetoothProfile { 


    @Override

    public boolean connect(BluetoothDevice device) {

        if (mService == null) return false;

        List<BluetoothDevice> srcs = getConnectedDevices();

        if (srcs != null) {

            for (BluetoothDevice src : srcs) {

                if (src.equals(device)) {

                    // Connect to same device, Ignore it

                    Log.d(TAG,"Ignoring Connect");

                    return true;

                }

            }

        if (mService == null) {

            return false;

        }

        return mService.connect(device);

    }



    @Override

    public boolean disconnect(BluetoothDevice device) {

        if (mService == null) return false;

        if (mService == null) {

            return false;

        }

        // Downgrade priority as user is disconnecting the headset.

        if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON){

            mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -161,19 +156,25 @@ final class HfpClientProfile implements LocalBluetoothProfile { 


    @Override

    public boolean isPreferred(BluetoothDevice device) {

        if (mService == null) return false;

        if (mService == null) {

            return false;

        }

        return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;

    }



    @Override

    public int getPreferred(BluetoothDevice device) {

        if (mService == null) return BluetoothProfile.PRIORITY_OFF;

        if (mService == null) {

            return BluetoothProfile.PRIORITY_OFF;

        }

        return mService.getPriority(device);

    }



    @Override

    public void setPreferred(BluetoothDevice device, boolean preferred) {

        if (mService == null) return;

        if (mService == null) {

            return;

        }

        if (preferred) {

            if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {

                mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -219,7 +220,7 @@ final class HfpClientProfile implements LocalBluetoothProfile { 
    }



    protected void finalize() {

        if (V) Log.d(TAG, "finalize()");

        Log.d(TAG, "finalize()");

        if (mService != null) {

            try {

                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HfpClientProfileTest.java

0 → 100644
+93 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settingslib.bluetooth;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.verify;



import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHeadsetClient;

import android.bluetooth.BluetoothProfile;

import android.content.Context;



import com.android.settingslib.SettingsLibRobolectricTestRunner;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RuntimeEnvironment;



@RunWith(SettingsLibRobolectricTestRunner.class)

public class HfpClientProfileTest {



    @Mock

    private LocalBluetoothAdapter mAdapter;

    @Mock

    private CachedBluetoothDeviceManager mDeviceManager;

    @Mock

    private LocalBluetoothProfileManager mProfileManager;

    @Mock

    private BluetoothHeadsetClient mService;

    @Mock

    private CachedBluetoothDevice mCachedBluetoothDevice;

    @Mock

    private BluetoothDevice mBluetoothDevice;

    private BluetoothProfile.ServiceListener mServiceListener;

    private HfpClientProfile mProfile;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        doAnswer((invocation) -> {

            mServiceListener = (BluetoothProfile.ServiceListener) invocation.getArguments()[1];

            return null;

        }).when(mAdapter).getProfileProxy(any(Context.class),

                any(BluetoothProfile.ServiceListener.class), eq(BluetoothProfile.HEADSET_CLIENT));



        mProfile = new HfpClientProfile(RuntimeEnvironment.application, mAdapter,

                mDeviceManager, mProfileManager);

        mServiceListener.onServiceConnected(BluetoothProfile.HEADSET_CLIENT, mService);

    }



    @Test

    public void connect_shouldConnectBluetoothHeadsetClient() {

        mProfile.connect(mBluetoothDevice);

        verify(mService).connect(mBluetoothDevice);

    }



    @Test

    public void disconnect_shouldDisconnectBluetoothHeadsetClient() {

        mProfile.disconnect(mBluetoothDevice);

        verify(mService).disconnect(mBluetoothDevice);

    }



    @Test

    public void getConnectionStatus_shouldReturnConnectionState() {

        when(mService.getConnectionState(mBluetoothDevice)).

                thenReturn(BluetoothProfile.STATE_CONNECTED);

        assertThat(mProfile.getConnectionStatus(mBluetoothDevice)).

                isEqualTo(BluetoothProfile.STATE_CONNECTED);

    }

}