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

Commit f00a43a3 authored by timhypeng's avatar timhypeng
Browse files

Update the method name from isHfpDevice() to isConnectedHfpDevice() 

Bug: 110072747
Test: make -j50 RunSettingsRoboTests
Change-Id: I4f42a4d55a107c870c76761434f4e5999ac76904
parent 6fdf8c22

src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater 
                    isFilterMatched = cachedDevice.isA2dpDevice();

                    break;

                case BluetoothProfile.HEADSET:

                    isFilterMatched = cachedDevice.isHfpDevice();

                    isFilterMatched = cachedDevice.isConnectedHfpDevice();

                    break;

            }

            if (DBG) {

src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater { 
                    isFilterMatched = !cachedDevice.isA2dpDevice();

                    break;

                case BluetoothProfile.HEADSET:

                    isFilterMatched = !cachedDevice.isHfpDevice();

                    isFilterMatched = !cachedDevice.isConnectedHfpDevice();

                    break;

            }

            if (DBG) {

tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java

+4 −6
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ import com.android.settings.testutils.shadow.ShadowAudioManager; 
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;

import com.android.settings.testutils.shadow.ShadowCachedBluetoothDeviceManager;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

import com.android.settingslib.bluetooth.HeadsetProfile;

import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;



import org.junit.Before;

import org.junit.Test;
@@ -101,7 +99,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);

        mCachedDevices.add(mCachedBluetoothDevice);



        mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -114,7 +112,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);

        mCachedDevices.add(mCachedBluetoothDevice);



        mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -179,7 +177,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);



        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
@@ -192,7 +190,7 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);



        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);

tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java

+4 −4
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class ConnectedBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);

        mCachedDevices.add(mCachedBluetoothDevice);



        mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -110,7 +110,7 @@ public class ConnectedBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);

        mCachedDevices.add(mCachedBluetoothDevice);



        mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -175,7 +175,7 @@ public class ConnectedBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);



        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
@@ -188,7 +188,7 @@ public class ConnectedBluetoothDeviceUpdaterTest { 
        mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);

        when(mBluetoothDeviceUpdater.

                isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);



        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);