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

Commit 447fbde7 authored by Chienyuan's avatar Chienyuan
Browse files

Simplify logic for connect in A2dpSinkProfile 

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

Bug: 111812003
Test: make -j42 RunSettingsLibRoboTests ROBOTEST_FILTER=A2dpSinkProfileTest
Change-Id: Ia0a118d73e5bb35ed3b2b75e67aeb98ae936981f
(cherry picked from commit b31a745fc0264a622ea9565f2d3da9c267f7f346)
parent f0bb83ba

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

+24 −21
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import java.util.List; 


final class A2dpSinkProfile implements LocalBluetoothProfile {

    private static final String TAG = "A2dpSinkProfile";

    private static boolean V = true;



    private BluetoothA2dpSink mService;

    private boolean mIsProfileReady;
@@ -56,7 +55,7 @@ final class A2dpSinkProfile 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");

            mService = (BluetoothA2dpSink) proxy;

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

            List<BluetoothDevice> deviceList = mService.getConnectedDevices();
@@ -75,7 +74,7 @@ final class A2dpSinkProfile implements LocalBluetoothProfile { 
        }



        public void onServiceDisconnected(int profile) {

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

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

            mIsProfileReady=false;

        }

    }
@@ -106,7 +105,9 @@ final class A2dpSinkProfile 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,
@@ -114,22 +115,16 @@ final class A2dpSinkProfile implements LocalBluetoothProfile { 
    }



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

    }



    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);
@@ -145,17 +140,23 @@ final class A2dpSinkProfile implements LocalBluetoothProfile { 
    }



    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);
@@ -166,7 +167,9 @@ final class A2dpSinkProfile implements LocalBluetoothProfile { 
    }



    boolean isA2dpPlaying() {

        if (mService == null) return false;

        if (mService == null) {

            return false;

        }

        List<BluetoothDevice> srcs = mService.getConnectedDevices();

        if (!srcs.isEmpty()) {

            if (mService.isA2dpPlaying(srcs.get(0))) {
@@ -208,7 +211,7 @@ final class A2dpSinkProfile implements LocalBluetoothProfile { 
    }



    protected void finalize() {

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

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

        if (mService != null) {

            try {

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

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

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



    @Mock

    private CachedBluetoothDeviceManager mDeviceManager;

    @Mock

    private LocalBluetoothProfileManager mProfileManager;

    @Mock

    private BluetoothA2dpSink mService;

    @Mock

    private CachedBluetoothDevice mCachedBluetoothDevice;

    @Mock

    private BluetoothDevice mBluetoothDevice;

    private BluetoothProfile.ServiceListener mServiceListener;

    private A2dpSinkProfile mProfile;

    private ShadowBluetoothAdapter mShadowBluetoothAdapter;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

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

        mProfile = new A2dpSinkProfile(RuntimeEnvironment.application,

                mDeviceManager, mProfileManager);

        mServiceListener = mShadowBluetoothAdapter.getServiceListener();

        mServiceListener.onServiceConnected(BluetoothProfile.A2DP_SINK, mService);

    }



    @Test

    public void connect_shouldConnectBluetoothA2dpSink() {

        mProfile.connect(mBluetoothDevice);

        verify(mService).connect(mBluetoothDevice);

    }



    @Test

    public void disconnect_shouldDisconnectBluetoothA2dpSink() {

        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