Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add missing callback for onServiceDisconnected()"

Browse Source
This commit is contained in:
Jason Hsu
2022-09-06 03:57:23 +00:00
committed by Android (Google) Code Review
parent 9552347b1a d1aa18633e
commit 54ae0e2abd
4 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
View File

@@ -81,12 +81,13 @@ public class A2dpProfile implements LocalBluetoothProfile {
device.onProfileStateChanged(A2dpProfile.this, BluetoothProfile.STATE_CONNECTED);
device.refresh();
}
mIsProfileReady=true;
mIsProfileReady = true;
mProfileManager.callServiceConnectedListeners();
}
public void onServiceDisconnected(int profile) {
mIsProfileReady=false;
mIsProfileReady = false;
mProfileManager.callServiceDisconnectedListeners();
}
}

5
packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java
View File

@@ -113,12 +113,13 @@ public class HearingAidProfile implements LocalBluetoothProfile {
// Check current list of CachedDevices to see if any are Hearing Aid devices.
mDeviceManager.updateHearingAidsDevices();
mIsProfileReady=true;
mIsProfileReady = true;
mProfileManager.callServiceConnectedListeners();
}
public void onServiceDisconnected(int profile) {
mIsProfileReady=false;
mIsProfileReady = false;
mProfileManager.callServiceDisconnectedListeners();
}
}

16
packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/A2dpProfileTest.java
View File

@@ -20,6 +20,7 @@ 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.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.bluetooth.BluetoothA2dp;
@@ -78,6 +79,21 @@ public class A2dpProfileTest {
.thenReturn(Arrays.asList(mDevice));
}
@Test
public void onServiceConnected_isProfileReady() {
assertThat(mProfile.isProfileReady()).isTrue();
verify(mProfileManager).callServiceConnectedListeners();
}
@Test
public void onServiceDisconnected_profileNotReady() {
mServiceListener.onServiceDisconnected(BluetoothProfile.A2DP);
assertThat(mProfile.isProfileReady()).isFalse();
verify(mProfileManager).callServiceDisconnectedListeners();
}
@Test
public void supportsHighQualityAudio() {
when(mBluetoothA2dp.isOptionalCodecsSupported(mDevice)).thenReturn(

18
packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/HearingAidProfileTest.java
View File

@@ -18,6 +18,7 @@ package com.android.settingslib.bluetooth;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.bluetooth.BluetoothAdapter;
@@ -66,7 +67,6 @@ public class HearingAidProfileTest {
mProfile = new HearingAidProfile(context, mDeviceManager, mProfileManager);
mServiceListener = mShadowBluetoothAdapter.getServiceListener();
mServiceListener.onServiceConnected(BluetoothProfile.HEADSET, mService);
}
@Test
@@ -74,4 +74,20 @@ public class HearingAidProfileTest {
assertThat(mProfile.setActiveDevice(null)).isTrue();
assertThat(mProfile.setActiveDevice(mBluetoothDevice)).isTrue();
}
@Test
public void onServiceConnected_isProfileReady() {
mServiceListener.onServiceConnected(BluetoothProfile.HEARING_AID, mService);
assertThat(mProfile.isProfileReady()).isTrue();
verify(mProfileManager).callServiceConnectedListeners();
}
@Test
public void onServiceDisconnected_profileNotReady() {
mServiceListener.onServiceDisconnected(BluetoothProfile.HEARING_AID);
assertThat(mProfile.isProfileReady()).isFalse();
verify(mProfileManager).callServiceDisconnectedListeners();
}
}