Merge "Simplify logic for connect in MapClientProfile" am: 0ac2a840a0 (f9c56d0a) · Commits · e / os / android_frameworks_base

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;
		@@ -61,7 +60,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();
		@@ -83,14 +82,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;
		}

		@@ -118,18 +117,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);
		@@ -138,23 +135,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);
		@@ -165,7 +169,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,
		@@ -203,7 +209,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

+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.BluetoothMapClient;
		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 MapClientProfileTest {

		@Mock
		private LocalBluetoothAdapter mAdapter;
		@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;

		@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.MAP_CLIENT));

		mProfile = new MapClientProfile(RuntimeEnvironment.application, mAdapter,
		mDeviceManager, mProfileManager);
		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