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

Commit 8149735c authored by Chienyuan's avatar Chienyuan
Browse files

Simplify logic for connect in HfpClientProfile 

* connect: remove connected device check logic.
  HeadsetClientStateMachine will check it.
* Remove member variable V and related checks.
* wrap if/else statement in curly brackets.
* add robotest for HfpClientProfile.

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=HfpClientProfileTest
Change-Id: Ie36efd6d0a9f8e6501a3690b026ea4bd39744b5c
(cherry picked from commit 2ecfa2abe6bee9318dcc5f0b4c3b3d3ec634f0e4)
parent f0bb83ba

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;
@@ -60,7 +59,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");

            mService = (BluetoothHeadsetClient) proxy;

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

            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
@@ -81,7 +80,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");

            mIsProfileReady=false;

        }

    }
@@ -115,7 +114,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,
@@ -124,23 +125,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);
@@ -158,19 +153,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);
@@ -216,7 +217,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
+91 −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.BluetoothAdapter;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothHeadsetClient;

import android.bluetooth.BluetoothProfile;



import com.android.settingslib.SettingsLibRobolectricTestRunner;

import com.android.settingslib.testutils.shadow.ShadowBluetoothAdapter;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.annotation.Config;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.shadow.api.Shadow;



@RunWith(SettingsLibRobolectricTestRunner.class)

@Config(shadows = {ShadowBluetoothAdapter.class})

public class HfpClientProfileTest {



    @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;

    private ShadowBluetoothAdapter mShadowBluetoothAdapter;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());

        mProfile = new HfpClientProfile(RuntimeEnvironment.application,

                mDeviceManager, mProfileManager);

        mServiceListener = mShadowBluetoothAdapter.getServiceListener();

        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);

    }

}