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

Commit 8862bfb3 authored by Chienyuan's avatar Chienyuan
Browse files

Simplify logic for connect in MapClientProfile 

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

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=MapClientProfileTest
Change-Id: Ic3620c8910e5acbb14e33369ff437d434b514ddf
(cherry picked from commit a199c59436581b73eaf5dfc4f58f292f7f1fca25)
parent bf383ccf

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

+26 −20
Original line number Diff line number Diff line
@@ -32,11 +32,10 @@ import java.util.ArrayList; 
import java.util.List;



/**

 * MapClientProfile handles Bluetooth MAP profile.

 * MapClientProfile handles the Bluetooth MAP MCE role.

 */

public final class MapClientProfile implements LocalBluetoothProfile {

    private static final String TAG = "MapClientProfile";

    private static boolean V = false;



    private BluetoothMapClient mService;

    private boolean mIsProfileReady;
@@ -60,7 +59,7 @@ public final class MapClientProfile implements LocalBluetoothProfile { 
            implements BluetoothProfile.ServiceListener {



        public void onServiceConnected(int profile, BluetoothProfile proxy) {

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

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

            mService = (BluetoothMapClient) proxy;

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

            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
@@ -82,14 +81,14 @@ public final class MapClientProfile implements LocalBluetoothProfile { 
        }



        public void onServiceDisconnected(int profile) {

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

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

            mProfileManager.callServiceDisconnectedListeners();

            mIsProfileReady=false;

        }

    }



    public boolean isProfileReady() {

        if(V) Log.d(TAG,"isProfileReady(): "+ mIsProfileReady);

        Log.d(TAG, "isProfileReady(): "+ mIsProfileReady);

        return mIsProfileReady;

    }
@@ -115,18 +114,16 @@ public final class MapClientProfile implements LocalBluetoothProfile { 
    }



    public boolean connect(BluetoothDevice device) {

        if (mService == null) return false;

        List<BluetoothDevice> connectedDevices = getConnectedDevices();

        if (connectedDevices != null && connectedDevices.contains(device)) {

            // Connect to same device, Ignore it

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

            return true;

        if (mService == null) {

            return false;

        }

        return mService.connect(device);

    }



    public boolean disconnect(BluetoothDevice device) {

        if (mService == null) return false;

        if (mService == null) {

            return false;

        }

        // Downgrade priority as user is disconnecting.

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

            mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -135,23 +132,30 @@ public final class MapClientProfile implements LocalBluetoothProfile { 
    }



    public int getConnectionStatus(BluetoothDevice device) {

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



        if (mService == null) {

            return BluetoothProfile.STATE_DISCONNECTED;

        }

        return mService.getConnectionState(device);

    }



    public boolean isPreferred(BluetoothDevice device) {

        if (mService == null) return false;

        if (mService == null) {

            return false;

        }

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

    }



    public int getPreferred(BluetoothDevice device) {

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

        if (mService == null) {

            return BluetoothProfile.PRIORITY_OFF;

        }

        return mService.getPriority(device);

    }



    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);
@@ -162,7 +166,9 @@ public final class MapClientProfile 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,
@@ -200,7 +206,7 @@ public final class MapClientProfile implements LocalBluetoothProfile { 
    }



    protected void finalize() {

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

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

        if (mService != null) {

            try {

                BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.MAP_CLIENT,

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/MapClientProfileTest.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.BluetoothMapClient;

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 MapClientProfileTest {



    @Mock

    private CachedBluetoothDeviceManager mDeviceManager;

    @Mock

    private LocalBluetoothProfileManager mProfileManager;

    @Mock

    private BluetoothMapClient mService;

    @Mock

    private CachedBluetoothDevice mCachedBluetoothDevice;

    @Mock

    private BluetoothDevice mBluetoothDevice;

    private BluetoothProfile.ServiceListener mServiceListener;

    private MapClientProfile mProfile;

    private ShadowBluetoothAdapter mShadowBluetoothAdapter;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

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

        mProfile = new MapClientProfile(RuntimeEnvironment.application,

                mDeviceManager, mProfileManager);

        mServiceListener = mShadowBluetoothAdapter.getServiceListener();

        mServiceListener.onServiceConnected(BluetoothProfile.MAP_CLIENT, mService);

    }



    @Test

    public void connect_shouldConnectBluetoothMapClient() {

        mProfile.connect(mBluetoothDevice);

        verify(mService).connect(mBluetoothDevice);

    }



    @Test

    public void disconnect_shouldDisconnectBluetoothMapClient() {

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

    }

}
 
 No newline at end of file